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

14541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KDSBrowne
251066045c make mute button return null if not in Audio 2017-03-13 08:55:16 -07:00
Oswaldo Acauan
090890aacd Move critical css to inline instead o external file 2017-03-13 14:38:32 +00:00
gcampes
ed4f1cf5c2 Fix issues based on PR comments 2017-03-13 08:48:00 -03:00
Ghazi Triki
c882ddf9e6 Enable viewers to get an invitation link to their last breakout room. 2017-03-12 11:10:00 +01:00
Richard Alam
73b16db384 - deserialize metadata.xml 2017-03-11 09:35:06 -08:00
Richard Alam
f45acfaf53 - deserialize playback from metadata.xml 2017-03-11 15:04:01 +00:00
Richard Alam
80a0c9f386 - start implementing recording metadata reader 2017-03-10 22:01:56 +00:00
Oswaldo Acauan
2129979112 Fix error screen 2017-03-10 20:47:23 +00:00
Richard Alam
6f6ca61077 - store breakout metadata and breakout rooms into redis 2017-03-10 19:40:33 +00:00
Richard Alam
4e59521268 - store breakout metadata and breakout rooms in events.xml only if they are present. 2017-03-10 19:39:20 +00:00
Richard Alam
90b5350260 - add sample metadata.xml 2017-03-10 19:38:35 +00:00
Oswaldo Acauan
9c84105319 Add missing packages 2017-03-10 19:18:23 +00:00
Oswaldo Acauan
d6780c3013 Refactor Authentication flow 2017-03-10 18:33:46 +00:00
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
perroned
dcdd4d0756 Cleans up html5 2017-03-06 20:30:07 +00: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
perroned
03b854e6b1 Update media service for new name 2017-03-06 19:34:30 +00:00
perroned
dab5adb5be Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2 
Conflicts:
	bigbluebutton-html5/imports/ui/components/media/container.jsx
	bigbluebutton-html5/server/main.js
 2017-03-06 19:21:40 +00: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