Commit Graph

19056 Commits

Author SHA1 Message Date
Gabriel Carvalho de Campes
436e7df7d4 removes unused css, removes unneeded code 2017-10-27 11:19:24 -02:00
Anton Georgiev
1efe354031 work on default pod race condition and controlling current pres 2017-10-26 17:54:21 -04:00
Richard Alam
51b9634bcd - cahpterBreakLength config option 2017-10-26 14:14:00 -07:00
Richard Alam
c14a946041 - generate recording path in akka-apps for audio 2017-10-26 14:07:22 -07:00
Ghazi Triki
c1abb17107 Check PPTX file and mark it as invalid if all slides are hidden. 2017-10-26 21:29:04 +01:00
Fred Dixon
4569e2d25e Merge pull request #4575 from capilkey/fix-fit-to-width-extremes
Relax presentation resize bounds to accommodate fit-to-width
2017-10-26 15:00:48 -04:00
Gabriel Carvalho de Campes
9bb0248957 fix logout issue on meeting end 2017-10-26 16:45:03 -02:00
Gabriel Carvalho de Campes
cf73251feb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-26 16:26:19 -02:00
Chad Pilkey
18a97923c6 relax presentation resize bounds to accomodate fit-to-width 2017-10-26 13:20:43 -04:00
Gabriel Carvalho de Campes
81f35bac4f Fix concerns from review 2017-10-26 15:14:56 -02:00
Chad Pilkey
590e6ecec0 Merge pull request #4573 from capilkey/fix-poll-btn-exception
Fix exception when the PollingModule is commented out
2017-10-26 12:52:44 -04:00
Chad Pilkey
41c1adb717 fix exception when the PollModule is commented out 2017-10-26 12:46:11 -04:00
KDSBrowne
ec0daac263 add return to presenterAssigned handler 2017-10-26 08:13:43 -07:00
Ghazi Triki
870fb7de06 Exported shared notes window have a human readable time stamp. 2017-10-26 12:34:24 +01:00
Richard Alam
436b4bcc1b Merge pull request #4570 from ritzalam/add-user-on-reconnect
- add user into user's list when auto-reconnected to bbb-apps
2017-10-25 17:59:47 -04:00
Richard Alam
1fc7362b2b - add user into user's list when auto-reconnected to bbb-apps 2017-10-25 14:58:09 -07:00
Ghazi Triki
7e4017ad17 Remove code that was moved to locale change. 2017-10-25 20:28:42 +01:00
Richard Alam
8a30f417bf Merge branch 'riadvice-2.0-gui-fix' into v2.0.x-release 2017-10-25 12:20:37 -07:00
Richard Alam
1d79d39bba Merge branch '2.0-gui-fix' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-gui-fix 2017-10-25 12:11:23 -07:00
KDSBrowne
fa4c96491c remove meteor import 2017-10-25 12:05:29 -07:00
KDSBrowne
34313c6eaa replace strings with constants 2017-10-25 12:00:31 -07:00
Ghazi Triki
d1a76be4b0 Improve HTTPS needed for webcam. 2017-10-25 19:41:20 +01:00
Richard Alam
aafcae9d79 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat 2017-10-25 11:36:45 -07:00
Richard Alam
e433b90322 Merge pull request #4569 from ritzalam/do-not-publish-doc
- do not publish doc and src when building jar
2017-10-25 14:24:15 -04:00
Richard Alam
10aa48fc07 - do not publish doc and src when building jar 2017-10-25 11:23:33 -07:00
Richard Alam
852353a491 - stop, start voice recording when chapter break occurs 2017-10-25 11:18:27 -07:00
Ghazi Triki
7fb1ef867d Change alert labels when locale is changed. 2017-10-25 19:10:30 +01:00
KDSBrowne
092839228b make changeRole handle any role 2017-10-25 10:29:03 -07:00
Ghazi Triki
f091d0d318 Code cleanup. 2017-10-25 18:17:41 +01:00
Ghazi Triki
900955e6b2 Make alert buttons larger. 2017-10-25 17:53:36 +01:00
Richard Alam
8497b9049d Merge branch 'master' into implement-multi-chat 2017-10-25 07:33:26 -07:00
Richard Alam
f9818a067d Merge branch 'antobinary-pods_vol4' 2017-10-25 07:32:07 -07:00
Richard Alam
42f35b9549 Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4 2017-10-25 07:22:30 -07:00
Ghazi Triki
3f51c54744 Improve screen sharing switch display button style. 2017-10-25 08:06:06 +01:00
Richard Alam
f2709d7294 - stop start recording of webcam 2017-10-24 18:31:09 -07:00
Richard Alam
7d08504bc8 - trace received message 2017-10-24 14:48:06 -07:00
Richard Alam
5b51d137a4 - fix NPE 2017-10-24 14:37:37 -07:00
Fred Dixon
12e7a7f0d5 Merge pull request #4562 from ritzalam/update-locales-oct-24-2017
Update locales oct 24 2017
2017-10-24 17:15:57 -04:00
Richard Alam
3ef3ff9682 - wire up pubsub message handler 2017-10-24 14:14:51 -07:00
Anton Georgiev
ff1aac2698 hardcode podId for first pod (for default.pdf) 2017-10-24 16:54:55 -04:00
Richard Alam
c03c75b022 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat 2017-10-24 13:25:24 -07:00
Richard Alam
dd2150e9d0 Merge pull request #4560 from riadvice/user-manage-gui
[Flash 2.1] - Guest management and approval GUI
2017-10-24 16:25:06 -04:00
Richard Alam
8939902143 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat 2017-10-24 13:24:38 -07:00
Richard Alam
cbdd70fff6 - update locales 2017-10-24 13:21:28 -07:00
Richard Alam
af3273b427 Merge pull request #4561 from ritzalam/add-voice-users
Fix a couple of issue
2017-10-24 16:15:30 -04:00
Richard Alam
e02189b922 - fix https://github.com/bigbluebutton/bigbluebutton/issues/4541 2017-10-24 13:08:47 -07:00
Richard Alam
3e15405966 - show voice only users in get meeting api response 2017-10-24 12:59:09 -07:00
Ghazi Triki
16e5e4e304 Updated PendingGuestsWindow to display guests and authenticated users. 2017-10-24 20:53:16 +01:00
Anton Georgiev
8e06408a33 set current presenter in pod 2017-10-24 15:49:57 -04:00
Richard Alam
fa6a1be518 - received redis pubsub messsages 2017-10-24 12:20:14 -07:00