Richard Alam
|
7637cedd4b
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-12-21 12:48:20 -08:00 |
|
Richard Alam
|
fb214b1370
|
Merge pull request #4862 from ritzalam/change-ejected-msg
Change ejected msg
|
2017-12-21 11:13:35 -08:00 |
|
Richard Alam
|
4d75664ca2
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into change-ejected-msg
|
2017-12-21 11:12:15 -08:00 |
|
Richard Alam
|
d13b01def7
|
- change all kick works to remove
|
2017-12-21 11:11:32 -08:00 |
|
Richard Alam
|
d1ddbd091b
|
Merge pull request #4861 from ritzalam/set-mute-on-start
- implement muteOnstart by passing on create API or using bigbluebut…
|
2017-12-21 10:56:41 -08:00 |
|
Richard Alam
|
78afb91562
|
- implement muteOnstart by passing on create API or using bigbluebutton.properties in bbb-web instead of setting it in config.xml
|
2017-12-21 10:40:44 -08:00 |
|
Richard Alam
|
1ad81ba992
|
Merge branch 'riadvice-ui-updates'
|
2017-12-20 14:48:32 -08:00 |
|
Richard Alam
|
bc5df11915
|
Merge pull request #4857 from ritzalam/custom-copyright
- allow to pass custom copyright text using create API
|
2017-12-20 14:30:44 -08:00 |
|
Richard Alam
|
d09abe92e4
|
- allow to pass custom copyright text using create API
|
2017-12-20 14:28:01 -08:00 |
|
Ghazi Triki
|
00b67cb284
|
Update presenters list when locale changes.
|
2017-12-20 22:40:17 +01:00 |
|
Ghazi Triki
|
e8683436a9
|
UI updates for presentation pods list.
|
2017-12-20 22:34:41 +01:00 |
|
Richard Alam
|
00140f0cca
|
Merge pull request #4852 from ritzalam/all-custom-log
- allow passing of custom param (logo) to override default logo
|
2017-12-20 13:32:11 -08:00 |
|
Richard Alam
|
b8af2fd5ee
|
Merge branch 'riadvice-fix-mute-meeting' into v2.0.x-release
|
2017-12-20 13:31:24 -08:00 |
|
Richard Alam
|
64a9cbfea1
|
- users come in as always unmuted, so no need to check muted flag
|
2017-12-20 13:30:35 -08:00 |
|
Richard Alam
|
f5502a1a2a
|
- allow passing of custom param (logo) to override default logo
|
2017-12-20 11:06:00 -08:00 |
|
Ghazi Triki
|
276e9e2f5f
|
Fix put meeting and at muted status.
|
2017-12-20 17:32:10 +01:00 |
|
Richard Alam
|
58d8e70303
|
Merge pull request #4844 from ritzalam/fix-logouttimer-and-mod-only-msg
- hardcode logoutTimer to zero as we don't use this feature in the r…
|
2017-12-20 07:37:12 -08:00 |
|
Richard Alam
|
0bfe54a5af
|
Merge pull request #4843 from ritzalam/fix-issue-4660
- fix issue https://github.com/bigbluebutton/bigbluebutton/issues/4660
|
2017-12-20 07:37:02 -08:00 |
|
Richard Alam
|
ca853a837f
|
Merge pull request #4848 from ritzalam/fix-chat-auto-reconnect
Fix chat auto reconnect
|
2017-12-20 07:27:33 -08:00 |
|
Fred Dixon
|
59eef1767f
|
Merge pull request #4849 from capilkey/2.1-fix-minor-issues
Fixes for some spacing issues in the client
|
2017-12-19 21:58:30 -05:00 |
|
Chad Pilkey
|
31c07f16e8
|
increase the number of layouts visible in the combo box
|
2017-12-19 17:52:33 -05:00 |
|
Chad Pilkey
|
7ca0b6beea
|
improve spacing in the client
|
2017-12-19 17:52:07 -05:00 |
|
Richard Alam
|
e2a1cc786f
|
Merge branch 'master' into fix-chat-auto-reconnect
|
2017-12-19 13:19:55 -08:00 |
|
Richard Alam
|
efeef13f61
|
- avoie duplicating welcome and moderator only messages especially during auto-reconnect
|
2017-12-19 13:18:37 -08:00 |
|
Chad Pilkey
|
911c2b84fe
|
Merge pull request #4845 from capilkey/fix-presentationpod-reconnect
Change presentation pod reconnect to get all pods
|
2017-12-18 20:30:54 -05:00 |
|
Chad Pilkey
|
af96e27b71
|
clear all presentation pods on reconnect for safety
|
2017-12-18 18:49:41 -05:00 |
|
Chad Pilkey
|
5bb13dedbf
|
change presentation pod reconnect to get all pods
|
2017-12-18 17:07:08 -05:00 |
|
Richard Alam
|
8223a08029
|
- hardcode logoutTimer to zero as we don't use this feature in the release
- substitute keyworks in moderatorOnlyMessage
|
2017-12-18 12:52:33 -08:00 |
|
Richard Alam
|
ffc448f948
|
- fix issue https://github.com/bigbluebutton/bigbluebutton/issues/4660
|
2017-12-18 12:16:15 -08:00 |
|
Richard Alam
|
874f2d09bf
|
Merge pull request #4840 from ritzalam/synch-with-v2.0
Synch with v2.0
|
2017-12-18 11:33:14 -05:00 |
|
Richard Alam
|
e48400995b
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-12-18 08:29:46 -08:00 |
|
Richard Alam
|
7ea7991705
|
Merge branch 'ritzalam-fix-chat-auto-reconnect'
|
2017-12-18 08:27:49 -08:00 |
|
Richard Alam
|
2c2de4049d
|
- reload chat messages on reconnect
|
2017-12-16 13:20:14 -08:00 |
|
Richard Alam
|
1482f09d72
|
Merge pull request #4838 from ritzalam/fix-auto-reconnect-rejoin-issue
Fix auto reconnect rejoin issue
|
2017-12-15 22:27:44 -05:00 |
|
Richard Alam
|
d91410a4dc
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-auto-reconnect-rejoin-issue
|
2017-12-15 19:22:29 -08:00 |
|
Richard Alam
|
fd9906844f
|
- auto join user on reconnect
|
2017-12-15 19:17:08 -08:00 |
|
Richard Alam
|
72fd493c23
|
- add reason on why client is disconnected
|
2017-12-15 19:16:37 -08:00 |
|
Richard Alam
|
f5b9dfd644
|
Merge pull request #4837 from capilkey/2.1-checkpresenter-podmsghandlers
Add a check for currentPresenter in pod message handlers
|
2017-12-15 19:55:22 -05:00 |
|
Richard Alam
|
058fff1e00
|
Merge branch '2.1-checkpresenter-podmsghandlers' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-checkpresenter-podmsghandlers
|
2017-12-15 16:50:34 -08:00 |
|
Chad Pilkey
|
32375f1c66
|
add check for currentPresenter in pod message handlers
|
2017-12-15 19:47:06 -05:00 |
|
Richard Alam
|
52e5587a7a
|
Merge pull request #4836 from ritzalam/fix-client-logout-timer
- make client logout timer configurable in bigbluebutton.properties
|
2017-12-15 19:39:10 -05:00 |
|
Richard Alam
|
1be175cde4
|
Merge pull request #4835 from capilkey/fix-locale-initialization
Fix locale initialization
|
2017-12-15 18:01:12 -05:00 |
|
Richard Alam
|
beed7a1058
|
- make client logout timer configurable in bigbluebutton.properties
|
2017-12-15 14:59:00 -08:00 |
|
Chad Pilkey
|
2d72bba4c4
|
extend timeout before pushing focus to Flash
|
2017-12-15 17:34:59 -05:00 |
|
Chad Pilkey
|
dfa2a1925c
|
fix locale initialization when preferred locale isn't available
|
2017-12-15 17:34:23 -05:00 |
|
Richard Alam
|
5dc046f3ce
|
Merge pull request #4834 from ritzalam/update-download-window
Update file download window with pres download change event
|
2017-12-15 16:06:26 -05:00 |
|
Richard Alam
|
ea34a1cfa7
|
- list for presentation download changed message in the file download window
|
2017-12-15 13:04:10 -08:00 |
|
Anton Georgiev
|
d6aa4ed44d
|
Merge pull request #4733 from oswaldoacauan/fix-4700
Improvements on Presentation Management
|
2017-12-15 19:03:54 -02:00 |
|
Anton Georgiev
|
b2aa8d4571
|
Merge pull request #4816 from jfsiebel/hide-audio-labels
Hide audio labels
|
2017-12-15 18:42:58 -02:00 |
|
Richard Alam
|
063a829096
|
Merge branch 'riadvice-presentation-download'
|
2017-12-15 12:37:39 -08:00 |
|