BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,645 Commits 13 Branches 260 Tags 1.1 GiB
c8acfbf65a
Commit Graph

12645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
0e3e902e5a Merge pull request #2876 from OZhurbenko/modal-improvements 
Data Handling and Modal Improvements
 2015-11-05 13:01:23 -05:00
Fred Dixon
fbe775acb6 Merge pull request #2877 from capilkey/fix-firefox-candidates 
Fix Firefox candidates
 2015-11-04 20:01:47 -05:00
Chad Pilkey
42236569a5 update sip.js to include a ice candidate timeout 2015-11-04 16:44:55 -08:00
Chad Pilkey
03d2a376ad added in a 30s total timeout on iceGathering 2015-11-04 16:44:15 -08:00
Oleksandr Zhurbenko
a6e38c69f1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into modal-improvements 
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-11-04 15:47:14 -08:00
Oleksandr Zhurbenko
12a00553d2 Getting rid of duplicating code 2015-11-04 15:34:54 -08:00
Oleksandr Zhurbenko
cb610535bb Modal window changes: removed cancel buttons and a save button, added 'Close' instead, fixed centering problem 2015-11-04 15:33:29 -08:00
Richard Alam
857bf26ed0 Merge pull request #2875 from capilkey/fix-2871 
Fix for issue 2871
 2015-11-04 16:48:02 -05:00
Chad Pilkey
f2d997c0bf changed retrived annotation from DrawObject to Object 2015-11-04 13:25:28 -08:00
Anton Georgiev
1ef29a034b push the redis messages in a FIFO queue to avoid race cond 2015-11-04 20:57:56 +00:00
Anton Georgiev
6cec8d0c81 change the default font on mobile to 16 2015-11-04 20:54:42 +00:00
Fred Dixon
110c0d4dd1 Merge pull request #2874 from ffdixon/update-bigbluebutton-cron 
Added commands to clean out FreeSWITCH logs after a number of days
 2015-11-03 18:02:56 -05:00
Fred Dixon
e21e4667a5 Added commands to clean out FreeSWITCH logs after a number of days 2015-11-03 18:00:23 -05:00
Anton Georgiev
c4d7d70dce fix placement of welcome message issue 2015-11-03 22:19:17 +00:00
Richard Alam
6c50443112 Merge pull request #2873 from antobinary/audio-fix 
html5client:improve logs to detect correct sequence of events and detect race condition
 2015-11-03 16:44:18 -05:00
Anton Georgiev
7f07e686dd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-11-03 21:08:16 +00:00
Anton Georgiev
9e56192e4b improve logs to detect correct sequence of events and detect race cond 2015-11-03 21:07:56 +00:00
Oleksandr Zhurbenko
2b96e6f723 Added spinning bar which is displayed while the data is loading 2015-11-03 12:04:02 -08:00
Oleksandr Zhurbenko
a97eba6d8b Making sure that the data is downloaded before starting rendering the client 2015-11-03 12:03:05 -08:00
Richard Alam
03a7110a92 Merge pull request #2869 from gthacoder/meteor-client 
HTML5 client: UI fixes and code refactoring.
 2015-11-02 14:40:41 -05:00
Richard Alam
ca7b38f081 Merge pull request #2870 from antobinary/audio-fix 
html5client: clear Flash users from Mongo even if they are about to reconnect
 2015-11-02 14:40:23 -05:00
Anton Georgiev
c5207e3110 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-11-02 19:37:41 +00:00
Anton Georgiev
2ca161124e do not store flash client users while reconnecting 2015-11-02 19:37:23 +00:00
Maxim Khlobystov
f4f4a119d9 Got rid of some old unused code related to the raise hand functionality. 2015-11-01 16:08:12 -08:00
Maxim Khlobystov
50e3000b85 Made Raise Hand button invisible in full screen mode. 2015-11-01 15:55:22 -08:00
Maxim Khlobystov
50c74ce5ee Corrected the position of Full Screen button and the size of Raise Hand button to align them together on mobile devices. 2015-11-01 15:49:25 -08:00
Maxim Khlobystov
1c93dfa588 Replaced the FAB trigger's icon with a raised hand + did some code refactoring for the sliding menu and FAB. 2015-11-01 15:34:49 -08:00
Maxim Khlobystov
a23dc18c78 Fixed the issue with unselectable text in Chrome. 2015-10-31 21:20:38 -07:00
Richard Alam
96ec836a9e Merge pull request #2868 from antobinary/audio-fix 
html5client: use upsert to avoid race cond
 2015-10-30 17:34:32 -04:00
Anton Georgiev
39f90d2f8b cleaning up 2015-10-30 21:30:58 +00:00
Anton Georgiev
47cee3138f use UPSERT for chat messages too 2015-10-30 21:27:56 +00:00
Anton Georgiev
a4dd3d63e4 use UPSERT for meetings and users 2015-10-30 20:23:41 +00:00
Anton Georgiev
67b4ab69fb it was trying to reuse username from cache 2015-10-29 22:10:33 +00:00
Richard Alam
e9db96e10d Merge pull request #2862 from antobinary/audio-fix 
html5client:work on fixing the userlist discrepancies (extra users)
 2015-10-29 17:26:45 -04:00
Anton Georgiev
d490dc9ef4 work on fixing the userlist discrepancies (extra users) 2015-10-29 21:23:03 +00:00
Richard Alam
4395432632 Merge pull request #2859 from antobinary/audio-fix 
html5client: user join and lock settings changes
 2015-10-28 12:56:08 -04:00
Anton Georgiev
4b53c3d874 omit users with authToken undef; improve logs 2015-10-28 16:12:40 +00:00
Anton Georgiev
e89c37f8ae lock settings - missed these 2015-10-28 16:00:55 +00:00
Richard Alam
d59aa415cd Merge pull request #2858 from antobinary/audio-fix 
html5client: lock settings fixes
 2015-10-27 17:14:10 -04:00
Anton Georgiev
940dd4b9b2 hide joinAudio with mic icon if permissions prohibit mic 2015-10-27 20:58:41 +00:00
Anton Georgiev
1a7d91dcf2 adapt to the restructured lock settings message format 2015-10-27 20:34:03 +00:00
Fred Dixon
f89fc562a2 Merge pull request #2857 from antobinary/audio-fix 
html5client: leave listenOnly audio when exiting (via redis)
 2015-10-27 11:42:52 -04:00
RafaFP
60bc3b1a95 Moved all icons present in the sharednotes local folder to the CSS folder and associated them to styles. 
All icons were moved and the references to used icons were updated to reflect this change.

The copying of the icons was removed from the sharednotes SWF build step.

refs #1839
 2015-10-27 13:54:43 +00:00
Anton Georgiev
7d624edbb8 leave global audio when exiting 2015-10-26 22:54:49 +00:00
Anton Georgiev
f54fcd9035 improve redis log 2015-10-26 22:53:34 +00:00
RafaFP
c11cea7635 Merge remote-tracking branch 'mconf/mconf-live0.7.3' into fix-1822 
refs #1822

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-10-26 20:09:00 +00:00
RafaFP
370a1a6b51 Changed the ChatToolbar position and changed the text in the buttons to icons. 
The toolbar will no longer stand in front of the last messages alowing for the user to copy them.

The buttons are now smaller and cause lesser disturbance on the chat when the user rolls the mouse over.

refs #1822
 2015-10-26 19:39:02 +00:00
Pedro Beschorner Marin
15acb57b17 We need to update the registered user's list when role and waitingForAcceptance change because reconnection doesn't trigger a userLeaving msg anymore 2015-10-26 10:57:12 -02:00
Pedro Beschorner Marin
3a2d6e52b8 Bugfix-#1838: Checking for user's role missmatch between API join response and server join meeting reply 2015-10-25 23:08:28 -02:00
Oleksandr Zhurbenko
2f9a990663 Moving options' template to modal 2015-10-23 16:29:24 -07:00