Richard Alam
|
84b12dfa94
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-10-27 07:51:17 -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 |
|
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 |
|
Chad Pilkey
|
18a97923c6
|
relax presentation resize bounds to accomodate fit-to-width
|
2017-10-26 13:20:43 -04: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 |
|
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 |
|
Ghazi Triki
|
d1a76be4b0
|
Improve HTTPS needed for webcam.
|
2017-10-25 19:41:20 +01: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 |
|
Ghazi Triki
|
7fb1ef867d
|
Change alert labels when locale is changed.
|
2017-10-25 19:10:30 +01: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
|
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 |
|
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 |
|
Anton Georgiev
|
ff1aac2698
|
hardcode podId for first pod (for default.pdf)
|
2017-10-24 16:54:55 -04: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
|
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 |
|
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 |
|
Anton Georgiev
|
9f2b364710
|
Merge pull request #4553 from OZhurbenko/fix-settings-cancel
[HTML5] - Fix for Settings not being closed
|
2017-10-24 16:58:40 -02:00 |
|
Ghazi Triki
|
e8b52f31e1
|
Improve GuestSettingsWindow implementation.
|
2017-10-24 17:40:03 +01:00 |
|
Joao Siebel
|
8a534f14b1
|
fix allowedToMuteAudio and allowedToUnmuteAudio logic and created action
|
2017-10-24 13:35:47 -02:00 |
|
Ghazi Triki
|
b36bf8f4c1
|
Rename GuestWindow to PendingGuestsWindow and change the users VBox to a List.
|
2017-10-24 15:56:56 +01:00 |
|
Oswaldo Acauan
|
e76459be65
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3
|
2017-10-24 11:11:18 -02:00 |
|
Anton Georgiev
|
25da1672cd
|
Merge pull request #4513 from oswaldoacauan/toast-notifications
[HTML5] Toast notifications
|
2017-10-24 11:05:48 -02:00 |
|
Oswaldo Acauan
|
fda223e81d
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3
|
2017-10-24 11:01:58 -02:00 |
|
Oswaldo Acauan
|
3bd0d349f8
|
Add handler to log all uncaught client exceptions
|
2017-10-24 10:59:23 -02:00 |
|
Oswaldo Acauan
|
45d604c63d
|
Refactor logger from client to server
|
2017-10-24 10:58:46 -02:00 |
|
Tainan Felipe
|
8e2f29e667
|
changed assign of the function
|
2017-10-24 08:52:44 -02:00 |
|
Oswaldo Acauan
|
28c19ec82d
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications
|
2017-10-24 07:57:52 -02:00 |
|
Oleksandr Zhurbenko
|
a2c635d094
|
Fixed a bug with Settings not being closed when click Cancel
|
2017-10-23 16:19:02 -07:00 |
|
Oleksandr Zhurbenko
|
6049223e3a
|
Fixed a typo
|
2017-10-23 16:16:54 -07:00 |
|