Commit Graph

18732 Commits

Author SHA1 Message Date
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor
[HTML5] Refactor Audio
2017-10-31 15:39:37 -02:00
Gabriel Carvalho de Campes
2cca0c1724 change device selector key generation 2017-10-31 15:34:06 -02:00
Gabriel Carvalho de Campes
fde5d56d87 change ask permissions timing, small code fixes 2017-10-31 08:53:06 -02:00
Richard Alam
376b42d58f
Merge pull request #4610 from ritzalam/sign-new-jars
Signing new jars
2017-10-30 23:14:27 -04:00
Richard Alam
116d8793cf - new signed jars expiring on 2019-5-22 2017-10-30 20:11:46 -07:00
Richard Alam
a1a0c4526c
Merge pull request #4594 from riadvice/2x-client-theme
Fix toolbar background color option
2017-10-29 12:21:05 -04:00
Ghazi Triki
ac7ae1d382 Fix toolbar background color option. 2017-10-29 16:43:26 +01:00
Fred Dixon
ec87a575f7
Update bigbluebutton.properties
Revert serverURL to previous value
2017-10-29 11:12:25 -04:00
Fred Dixon
2266919e3b
Merge pull request #4588 from ffdixon/v2.0.x-release
Remove old reference to libreoffice.service
2017-10-28 09:50:06 -04:00
Fred Dixon
1f43daeab0 Remove old reference to libreoffice.service 2017-10-28 09:48:20 -04:00
Anton Georgiev
f5d65b8983
Merge pull request #4577 from Gcampes/kick-user-meeting-end
Remove user on meeting end
2017-10-27 21:19:20 -02:00
Anton Georgiev
a210f2476a Merge pull request #4572 from KDSBrowne/z07-change-role-refactor
Change Role refactor
2017-10-27 13:22:41 -02:00
KDSBrowne
4899b88f27 change condition in changeRole logger message 2017-10-27 08:10:53 -07:00
Richard Alam
2aec000df6 Merge branch 'riadvice-2.0-gui-fix' into v2.0.x-release 2017-10-27 07:49:47 -07:00
Richard Alam
ef4034bd61 Merge branch '2.0-gui-fix' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-gui-fix 2017-10-27 07:47:04 -07:00
Richard Alam
5b958fc0ad Merge branch 'riadvice-pptx-hidden-slides' into v2.0.x-release 2017-10-27 07:45:30 -07:00
Richard Alam
26238e9d61 Merge branch 'pptx-hidden-slides' of https://github.com/riadvice/bigbluebutton into riadvice-pptx-hidden-slides 2017-10-27 07:41:35 -07:00
Anton Georgiev
970205f92d Merge pull request #4556 from jfsiebel/fix-user-list-mute-unmute-logic
fix allowedToMuteAudio and allowedToUnmuteAudio logic and created action
2017-10-27 12:01:14 -02:00
Gabriel Carvalho de Campes
144705ce9b change func call to a variable 2017-10-27 11:44:42 -02:00
Gabriel Carvalho de Campes
436e7df7d4 removes unused css, removes unneeded code 2017-10-27 11:19:24 -02: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
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
Ghazi Triki
3f51c54744 Improve screen sharing switch display button style. 2017-10-25 08:06:06 +01: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
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
Anton Georgiev
f7ba155f97 Merge pull request #4524 from oswaldoacauan/patch-3
[HTML5] Fix logClient method name
2017-10-24 17:04:38 -02:00
Anton Georgiev
967be17440 Merge pull request #4521 from Tainan404/fix-presenter-modal-bug
[HTML5] Fix presentation upload modal  bug
2017-10-24 17:02:47 -02:00