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

14440 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghazi Triki
5fbfca8e70 Disable kicking user out in breakout rooms. 2017-03-10 09:56:54 +01:00
Richard Alam
71bcd779b7 - process breakout rooms in events.xml and metadata.xml 2017-03-09 23:01:15 +00:00
Chad Pilkey
cd52836689 Merge pull request #3721 from capilkey/1.1-accessibility-fixes-2 
More accessibility fixes for 1.1
 2017-03-09 16:44:19 -05:00
Richard Alam
adffa8d673 - build getMeetings and getMeetingInfo responses using freemarker 2017-03-09 20:32:14 +00:00
Oswaldo Acauan
be7f36e00c Refactor the i18n server code 2017-03-09 19:50:21 +00:00
gcampes
985b9d6939 Change icon names to the new ones 2017-03-09 13:49:28 -03:00
gcampes
b422ab10e9 Merge conflicts 2017-03-09 11:42:31 -03:00
gcampes
417b2e4500 Fix issues based on PR comments 2017-03-09 11:34:33 -03:00
Chad Pilkey
0235dd5adb fix plus and minus shortcut modifier in key table 2017-03-08 19:26:02 -05:00
Chad Pilkey
65b89074e6 more accessibity fixes for 1.1 2017-03-08 16:15:40 -05:00
Fred Dixon
997037c11a Merge pull request #3719 from mikhailnov/patch-1 
old firefox CLI call not working on newer versions, updated to a newe…
 2017-03-08 14:30:06 -05:00
mikhailnov
675b4bbaeb old firefox CLI call not working on newer versions, updated to a newer one 2017-03-08 22:15:23 +03:00
Fred Dixon
b474aaf776 Merge pull request #3718 from ffdixon/remove-capture-video 
removed 'capture video' from bbb-conf --check
 2017-03-08 13:39:54 -05:00
Fred Dixon
2281ca083a removed 'capture video' from bbb-conf --check 2017-03-08 12:39:12 -06:00
Oswaldo Acauan
5f495f35a0 Change how we load shared files from flash 2017-03-08 13:49:44 +00:00
Anton Georgiev
9600910319 Merge pull request #3700 from OZhurbenko/icons-update 
HTML5 - Updated Icons
 2017-03-07 16:51:12 -05:00
Richard Alam
217b70bce2 Merge pull request #3711 from ritzalam/synchronize-create-meeting 
Synchronize create meeting
 2017-03-07 13:41:11 -05:00
Anton Georgiev
5f67dc1432 Merge pull request #3714 from oswaldoacauan/fix-user-api 
[HTML] Fix bugs related to the Users API
 2017-03-07 13:25:14 -05:00
Oswaldo Acauan
dc2cc13c70 Fix wrong error message 2017-03-07 17:37:25 +00:00
Oswaldo Acauan
3f946fb6a6 Fix wrong collection imports 2017-03-07 17:32:24 +00:00
Oswaldo Acauan
3c6ccf6cec Skip updating user validated flag if its already valid 2017-03-07 17:18:02 +00:00
Oleksandr Zhurbenko
ccef7e9562 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update 2017-03-06 12:44:19 -08:00
Fred Dixon
55525672f2 Update bbbResources.properties 2017-03-06 15:30:00 -05:00
Richard Alam
1a2bd4d74d - add delay to processing of presentation to make sure that meeting has already been 
created. This makes sure that the meeting is able to handle the presentation
   processing events.
 2017-03-06 20:05:26 +00:00
Fred Dixon
ffce4157bd Merge pull request #3710 from ffdixon/updates-for-1-1 
Minor updates for release -- bumped the API version
 2017-03-06 14:58:51 -05:00
Fred Dixon
c28c78a405 Minor updates for release -- bumped the API version 2017-03-06 13:57:54 -06:00
Richard Alam
3ec0167812 - synchronize create meeting to prevent race condition where 2 meetings 
with different voice bridge gets created.
 2017-03-06 19:20:23 +00:00
Anton Georgiev
71b995ecdf Merge pull request #3699 from OZhurbenko/meteor-update 
HTML5 - Meteor 1.4.3.1
 2017-03-06 14:18:18 -05:00
Anton Georgiev
8536329a59 Merge pull request #3704 from JaeeunCho/slide-arrow-button 
HTML5 - changed the location of slide's arrow buttons
 2017-03-06 13:57:32 -05:00
JaeeunCho
3fb3d614fa HTML5 - changed comment and moved into block 2017-03-06 09:25:35 -08:00
JaeeunCho
317ad3ada2 Merge remote-tracking branch 'upstream/master' into close 2017-03-06 09:23:37 -08:00
Richard Alam
b50dab633b Merge pull request #3708 from ritzalam/change-line-endings 
- change line endings of file by running dos2unix
 2017-03-06 10:48:47 -05:00
Richard Alam
d83fc6466a - change line endings of file by running dos2unix 2017-03-06 15:43:41 +00:00
Fred Dixon
b8c2548ed9 Merge pull request #3707 from ffdixon/update-cron 
Remove *.meta files from saved red5 streams
 2017-03-04 21:31:59 -05:00
Fred Dixon
18e1f3539a Updated cron.daily to remove *.meta files from /usr/share/red5/webapps/video/streams 2017-03-04 20:30:11 -06:00
Fred Dixon
c0c58b5507 Update BigBlueButton.html 
Modified "You need Flash Installed" message.
 2017-03-04 10:02:39 -05:00
Fred Dixon
55c3e901d3 Merge pull request #3706 from capilkey/screenshare-tunnel-warning 
Add a warning to screenshare publish when tunneling
 2017-03-03 20:04:50 -05:00
Chad Pilkey
9721d03274 add a warning to screenshare publish when tunneling 2017-03-03 19:17:03 -05:00
JaeeunCho
e2964d2c8f HTML5 - changed the location of slide's arrow buttons 2017-03-03 09:55:11 -08:00
Chad Pilkey
ae2b891d8f Merge pull request #3638 from riadvice/client-language-auto-detect-improve 
Improve ResourceUtil.as class
 2017-03-03 12:18:08 -05:00
JaeeunCho
3355ad5d82 HTML5 - did lint code and chaged it 2017-03-02 13:42:39 -08:00
Fred Dixon
ad8e86f1cf Merge pull request #3702 from ffdixon/fix-bbb-conf-lti 
Fixed reference to lti.properties
 2017-03-02 16:19:08 -05:00
Fred Dixon
2f528b5d74 Fixed reference to lti.properties 2017-03-02 15:17:40 -06:00
JaeeunCho
a67ef17930 HTML5 - changed code for session 2017-03-02 12:33:49 -08:00
JaeeunCho
a485873bf2 Merge remote-tracking branch 'upstream/master' into close 2017-03-02 12:32:29 -08:00
Oleksandr Zhurbenko
bba1d52716 Adjusted history package version to work with the latest react-router 2017-03-02 11:06:51 -08:00
Oleksandr Zhurbenko
6bafa381d6 Updated npm packages to the latest 2017-03-02 10:59:44 -08:00
Oleksandr Zhurbenko
7b3bc48be4 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into icons-update 2017-03-02 10:11:59 -08:00
Anton Georgiev
e67b2a733e Merge pull request #3686 from oswaldoacauan/fix-reply-messages-remove 
[HTML5] Fix presentations/shapes reply messages
 2017-03-02 11:44:26 -05:00
Anton Georgiev
c92baed843 Merge pull request #3685 from OZhurbenko/whiteboard-restructuring 
HTML5 Whiteboard Restructuring
 2017-03-02 11:37:18 -05:00