Chad Pilkey
|
15a495f931
|
changed the layout module to use custom names instead of the class name
|
2017-10-27 18:30:23 -04:00 |
|
Chad Pilkey
|
00c5a31ffb
|
condense the layout tools down to one button
|
2017-10-27 11:47:12 -04: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
|
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 |
|
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 |
|
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 |
|
Ghazi Triki
|
e8b52f31e1
|
Improve GuestSettingsWindow implementation.
|
2017-10-24 17:40:03 +01:00 |
|
Ghazi Triki
|
b36bf8f4c1
|
Rename GuestWindow to PendingGuestsWindow and change the users VBox to a List.
|
2017-10-24 15:56:56 +01:00 |
|
Ghazi Triki
|
525fd7b294
|
Move guest settings button from the top bar to the user settings menu.
|
2017-10-23 23:05:08 +01:00 |
|
Ghazi Triki
|
6d09be933c
|
Improve guest management settings window.
|
2017-10-23 22:38:39 +01:00 |
|
Anton Georgiev
|
31ce060896
|
added podId to SlideView to isolate events
|
2017-10-23 16:30:25 -04:00 |
|
Richard Alam
|
70654a5e63
|
Merge branch 'antobinary-pods_vol4'
|
2017-10-23 07:57:48 -07:00 |
|
Richard Alam
|
66349664bb
|
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
|
2017-10-23 07:47:27 -07:00 |
|
Richard Alam
|
66f9b89206
|
Merge branch 'riadvice-no-locale-version'
|
2017-10-23 07:46:42 -07:00 |
|
Anton Georgiev
|
6f8abff77c
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4
|
2017-10-21 08:50:25 -04:00 |
|
Anton Georgiev
|
6b19800836
|
update presenter group on add/remove
|
2017-10-21 08:19:52 -04:00 |
|
Anton Georgiev
|
325a6ef8f2
|
show presenter group in pod dropdown
|
2017-10-21 08:03:52 -04:00 |
|
Ghazi Triki
|
e1d534e856
|
Revert changes to build.xml
|
2017-10-20 22:05:30 +01:00 |
|
Ghazi Triki
|
d1772901f9
|
Remove locale version check feature.
|
2017-10-20 22:03:33 +01:00 |
|
Anton Georgiev
|
030567368a
|
add/remove user from presenter groups
|
2017-10-20 17:01:57 -04:00 |
|
Richard Alam
|
4f49512987
|
Merge pull request #4545 from riadvice/flex-4-16-fp23-docs
[Flash 2.1] - Update Flex SDK docs for 2.1
|
2017-10-20 13:40:43 -04:00 |
|
Ghazi Triki
|
78f9fd841a
|
Update Flex SDK docs for 2.1
|
2017-10-20 16:53:42 +01:00 |
|
Richard Alam
|
45b9ae04fd
|
Merge pull request #4544 from ritzalam/implement-multi-chat
- update fsesl lib jar version
|
2017-10-20 11:37:34 -04:00 |
|
Richard Alam
|
1968756f73
|
- update fsesl lib jar version
|
2017-10-20 08:35:50 -07:00 |
|
Richard Alam
|
8eab96b1cc
|
Merge branch 'ritzalam-remove-reconnect-handler'
|
2017-10-20 08:21:32 -07:00 |
|
Richard Alam
|
afb217fe70
|
Merge branch 'remove-reconnect-handler' of https://github.com/ritzalam/bigbluebutton into ritzalam-remove-reconnect-handler
|
2017-10-20 08:11:49 -07:00 |
|
Richard Alam
|
ec35eed07c
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton
|
2017-10-20 08:10:43 -07:00 |
|
Richard Alam
|
24def2ce7e
|
Merge branch 'riadvice-config-options-clean' into v2.0.x-release
|
2017-10-20 08:05:24 -07:00 |
|
Richard Alam
|
bf5d5de34e
|
Merge branch 'config-options-clean' of https://github.com/riadvice/bigbluebutton into riadvice-config-options-clean
|
2017-10-20 07:58:22 -07:00 |
|
Richard Alam
|
bd68aa3128
|
Merge pull request #4543 from ritzalam/remove-auto-join-voice-on-reconnect
Remove auto-join voice handler on auto-reconnect
|
2017-10-20 10:56:49 -04:00 |
|
Richard Alam
|
333dba585b
|
- remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
the meeting is being records, the audio conference fails to record.
|
2017-10-20 07:38:50 -07:00 |
|
Ghazi Triki
|
bd1e8a0f08
|
Remove trailing spaces in config.xml.template
|
2017-10-20 15:37:38 +01:00 |
|
Richard Alam
|
97f14ddfac
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into v2.0.x-release
|
2017-10-20 07:36:39 -07:00 |
|
Richard Alam
|
fb58a5f0ca
|
Merge branch 'riadvice-breakout-audio-rejoin' into v2.0.x-release
|
2017-10-20 07:36:14 -07:00 |
|
Anton Georgiev
|
e0db8b1d3e
|
Merge pull request #4533 from jfsiebel/fix-update-voice-user-function-name
Fix function name in updateVoiceUser
|
2017-10-20 12:30:25 -02:00 |
|
Ghazi Triki
|
f3ba3e5ac9
|
Clean ununsed options properties and classes.
|
2017-10-20 11:17:19 +01:00 |
|
Richard Alam
|
543d34765b
|
Merge pull request #4540 from ritzalam/update-with-20
Update with latest 2.0
|
2017-10-19 21:22:02 -04:00 |
|
Richard Alam
|
cfec9de678
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into update-with-20
|
2017-10-19 18:20:25 -07:00 |
|
Richard Alam
|
154d3d6081
|
Merge branch 'antobinary-pods_vol4'
|
2017-10-19 18:01:15 -07:00 |
|
Richard Alam
|
11f0bdf0ac
|
Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4
|
2017-10-19 17:46:35 -07:00 |
|
Richard Alam
|
e01692c40b
|
- send voice conf started and destroyed message
|
2017-10-19 17:18:50 -07:00 |
|
Richard Alam
|
a3530cad91
|
- remove for now as sometimes when reconnect occurs while there is only one user in the voice conference and
the meeting is being records, the audio conference fails to record.
|
2017-10-19 12:59:14 -07:00 |
|
Anton Georgiev
|
04cef71384
|
re-enable next/prev/goto slide
|
2017-10-19 14:47:59 -04:00 |
|
Ghazi Triki
|
b447d18b04
|
Invalidate 'breakoutEjectFromAudio' state if the join audio button is pressed.
|
2017-10-19 15:59:01 +01:00 |
|
Ghazi Triki
|
ec48b1ec2d
|
Display join audio window if back from breakout room.
|
2017-10-19 15:51:58 +01:00 |
|
Richard Alam
|
1abba9391d
|
Merge branch 'riadvice-2x-client-theme' into v2.0.x-release
|
2017-10-19 07:17:30 -07:00 |
|