BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,595 Commits 13 Branches 260 Tags 1.1 GiB
af21f695ee
Commit Graph

7315 Commits

Author SHA1 Message Date
Richard Alam
d58f1ec5e7 Merge branch '2.0-updates' of https://github.com/riadvice/bigbluebutton into riadvice-2.0-updates 2018-02-01 07:40:27 -08:00
Fred Dixon
feff36a352
Merge pull request #5076 from riadvice/remove-spark 
Replace remnant spark labels by mx label and text
 2018-02-01 09:03:29 -05:00
Ghazi Triki
26aa84c4cc Replace remnant spark labels by mx label and text. 2018-02-01 11:17:34 +01:00
Ghazi Triki
47cd5309b0 Show "Viewers Locked" when webcamsOnlyForModerator is on. 2018-02-01 10:26:09 +01:00
Fred Dixon
7617828770
Merge pull request #5064 from riadvice/microphone-highlight 
Highlight microphone icon in users list when microphone is locked
 2018-01-31 20:03:53 -05:00
Richard Alam
06faa8a448 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-31 14:38:43 -08:00
Richard Alam
40b3c6aff8
Merge pull request #5069 from ritzalam/backport-rtmps-support-to-2.0 
Backport rtmps support to 2.0
 2018-01-31 16:43:36 -05:00
Ghazi Triki
e407060486 Fully rely on binding to display chat messages. 2018-01-31 21:40:18 +01:00
Richard Alam
6485110a72 - clean up logging 2018-01-31 08:38:54 -08:00
Richard Alam
c4085c4482 - use proper video context url 2018-01-30 13:17:23 -08:00
Richard Alam
0bc3a06837 - backpot rtmp support 2018-01-30 12:54:20 -08:00
Ghazi Triki
017e324496 Highlight microphone icon in users list when microphone is locked. 2018-01-30 18:30:57 +01:00
Richard Alam
f88f6c3d64 - determine voice connection type 2018-01-30 08:31:20 -08:00
Richard Alam
77a477b5cc - port test connection 2018-01-30 08:16:24 -08:00
Richard Alam
b0e5d61dee - determine port test connection type 2018-01-30 08:16:08 -08:00
Richard Alam
3f467cb579 - remove port test server url 2018-01-30 08:09:10 -08:00
Richard Alam
418d2184a4 - add protocol for bwmon and port test 2018-01-30 07:47:29 -08:00
Richard Alam
e388173f1f - bw mon determine connection type 2018-01-30 07:45:17 -08:00
Richard Alam
a3f3760d49 - add bw mon options and some string constants 2018-01-30 07:43:33 -08:00
Ghazi Triki
018e23d149 Add a new graphic callout for chrome permissions on windows. 2018-01-30 11:45:19 +01:00
Ghazi Triki
83f8d4d393 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.0-updates 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/util/QueryStringParameters.as
 2018-01-30 07:13:54 +01:00
Richard Alam
962b520d6a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-29 12:53:20 -08:00
Richard Alam
1354b065be Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master 2018-01-29 12:36:41 -08:00
Richard Alam
b0ce2ac0c1
Merge pull request #5057 from ritzalam/log-network-change-event 
- add more logging when screenshare auto-reconnects
 2018-01-29 10:35:45 -05:00
Richard Alam
e2416dc665 - add more logging when screenshare auto-reconnects 2018-01-29 07:34:41 -08:00
Ghazi Triki
4e46ad806a Acoid null params array in QueryStringParameters. 2018-01-29 14:23:19 +01:00
Ghazi Triki
718d260c9b Do not display user feedback window in breakout rooms. 2018-01-29 07:59:57 +01:00
Ghazi Triki
4c039507e0 Keep only one green color in color pickers. 2018-01-29 07:58:14 +01:00
Fred Dixon
036a23cfb1 Updated copyright date 2018-01-28 13:33:18 -05:00
Fred Dixon
189c05001e Adjusting the wording in Lock Settings dialog 2018-01-28 13:06:58 -05:00
Fred Dixon
728c71c327 Minor tweek in wording for Polling dialog 2018-01-28 12:17:16 -05:00
Richard Alam
7d1d0b55f8
Merge pull request #5026 from ritzalam/require-auth-token-on-red5-connect 
Require auth token on red5 connect
 2018-01-26 17:22:07 -05:00
Richard Alam
4bb9f22a12 - log flash network change event to figure out if that is the one causing reconnects 2018-01-26 13:24:56 -08:00
Richard Alam
b05237b075 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master 2018-01-26 12:51:39 -08:00
Richard Alam
0985750ae6
Merge pull request #5038 from riadvice/2.0-ui-fixes 
Use a separate label for LoadingBar
 2018-01-26 12:02:37 -05:00
Ghazi Triki
2fc30ec310 Use a separate label for LoadingBar. 2018-01-26 17:06:00 +01:00
Ghazi Triki
5cdf27120e Update ChatMessageRenderer style. 2018-01-26 10:31:59 +01:00
Richard Alam
2297ca50b9 - validate auth token for bbb-voice 2018-01-24 13:58:16 -08:00
Richard Alam
1e60930bc5 - track port test connection and exclude from validating with akka-apps 2018-01-24 08:16:00 -08:00
Ghazi Triki
635fad2dcf Improve moderator icon display in ChatMessageRenderer. 2018-01-23 19:58:18 +01:00
Richard Alam
8a13c69942 - handle no microphone properly. Should not go to echo test if no mic. 2018-01-23 09:01:35 -08:00
Richard Alam
e3c54fc27c - fix merge exceptions 2018-01-23 09:01:14 -08:00
Ghazi Triki
a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
#	bigbluebutton-client/branding/default/style/css/V2Theme.css
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
#	bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
#	bigbluebutton-client/locale/en_US/bbbResources.properties
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
#	bigbluebutton-html5/private/config/development/server/log.yaml
 2018-01-23 12:27:42 +01:00
Richard Alam
aef4030750 - authorize connection using token 2018-01-22 14:05:48 -08:00
Richard Alam
a22fca4931 - update locales to jan 22, 2018 2018-01-22 07:45:09 -08:00
Ghazi Triki
bbed266239 Update lock settings title width. 2018-01-22 15:30:12 +01:00
Ghazi Triki
e2f5fad58d Update flash client German localisation file. 2018-01-21 15:57:45 +01:00
Ghazi Triki
4238b12453 Switch lock settings "disable webcams" and "webcam only for moderators" states, only one of them can be enabled at the same time. 2018-01-21 08:46:24 +01:00
Ghazi Triki
ff7cf434b1 Improve camera control and display when webcamsOnlyForModerator is enabled. 2018-01-20 21:11:23 +01:00
Ghazi Triki
307f12448a Add new hint box to LockSettings and update style. 2018-01-20 18:33:02 +01:00
Ghazi Triki
5227217e85 Fix the regex that checks the Flash stream id by adding the option "-recorded" to the pattern, making sure recorded streams are matched too. 2018-01-20 09:34:11 +01:00
Richard Alam
6ea49e05aa - add protocol for bwmon and port test 2018-01-19 14:30:49 -08:00
Richard Alam
11d226db2a - clean up logging 2018-01-19 13:07:48 -08:00
Richard Alam
e789d1440d - determine screenshare connection type 2018-01-19 12:16:47 -08:00
Richard Alam
9d660bb4b5 - determine video connection type 2018-01-19 08:47:21 -08:00
Richard Alam
ff85a724bb - determine bbb-apps connection type 2018-01-19 08:46:34 -08:00
Richard Alam
0fc8df84c2 - determine voice connection type 2018-01-19 08:45:27 -08:00
Richard Alam
3ea109aa25 - port test connection 2018-01-19 08:45:01 -08:00
Richard Alam
6402966fb5 - determine port test connection type 2018-01-19 08:44:10 -08:00
Richard Alam
b20828a8cd - bw mon determine connection type 2018-01-19 08:38:55 -08:00
Richard Alam
802f945b2a - add bw mon options and some string constants 2018-01-19 08:35:39 -08:00
Ghazi Triki
171db3e0ee Display moderator icon next to his name in chat messages. 2018-01-17 22:02:26 +01:00
Ghazi Triki
5647597227 - Remove SessionTokenUtil and put its code in QueryStringParameters. 
- Minor improvements to string check.
 2018-01-17 20:17:32 +01:00
Fred Dixon
6c36f8dc00 Tweeked feedback dialog 2018-01-17 12:42:17 -06:00
Fred Dixon
346d127cf0
Merge pull request #4973 from riadvice/logout-feedback 
Implemented "user rating feedback on logout" feature
 2018-01-16 15:56:49 -05:00
Ghazi Triki
cf92e1aeef Implemented "user rating feedback on logout" feature. 2018-01-16 20:37:05 +01:00
Anton Georgiev
1e25a6d4e1
Merge pull request #4955 from prlanzarin/video-upstream-errors 
WebRTC media updates
 2018-01-15 14:40:53 -02:00
Ghazi Triki
e89aadb3a6 Disable webcam button in media column for all users when webcamsOnlyForModerator is on. 2018-01-15 12:33:24 +01:00
prlanzarin
acc9650370 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-upstream-errors 2018-01-12 21:39:24 +00:00
prlanzarin
8594ce169d Merge remote-tracking branch 'mconftec/fixes-lucas' into video-upstream-errors 2018-01-12 20:02:45 +00:00
Richard Alam
d60a2a2782
Merge pull request #4945 from riadvice/moderator-message-ui 
Show moderator message header in bold
 2018-01-12 07:35:27 -08:00
Richard Alam
f960b2fccc
Merge pull request #4951 from capilkey/update-air-2.1 
Update AIR client with 2.1 presentation code
 2018-01-12 07:35:05 -08:00
Ghazi Triki
3ffbc3a12c Delay showing configramtion buttons in WebRTCEchoTest under firefox browser. 2018-01-12 15:17:26 +01:00
Chad Pilkey
628569c08a remove unneeded presentation code from the Flash client 2018-01-11 17:31:15 -05:00
Ghazi Triki
4bc7279c1c Fix ScreenshareViewWindow scroll-bars in original video size mode. 2018-01-11 21:34:09 +01:00
Ghazi Triki
d4fda31d00 Show moderator message header in bold. 2018-01-11 17:55:03 +01:00
Ghazi Triki
526b2b12fb Fix alpha value for ScreenshareViewWindow change display button. 2018-01-11 14:38:21 +01:00
Richard Alam
e2530eddf4
Merge pull request #4942 from ritzalam/investigate-rtmps 
- try to make rtmps work in client
 2018-01-10 14:06:37 -08:00
Richard Alam
d4a5b91bc4
Merge pull request #4940 from capilkey/update-air-2.1 
Update AIR for 2.1
 2018-01-10 14:06:20 -08:00
Richard Alam
dde5eb76f1 - trye to make rtmps work in client 2018-01-10 13:04:05 -08:00
Chad Pilkey
2717ef39da removed unneeded properties from chat messages 2018-01-10 15:06:43 -05:00
Ghazi Triki
8f47e7b7de Remove webcamsOnlyForModerator from enter API response. 2018-01-09 18:14:58 +01:00
Ghazi Triki
ed1467550f Automatically subscribe/unsubcribe to video streams when webcamsOnlyForModerator value changes. 2018-01-09 17:01:17 +01:00
Ghazi Triki
55f4e7cb7c Revert webcamsOnlyForModerator feature in VideoEventMapDelegate. 2018-01-08 20:59:45 +01:00
Richard Alam
45f5a76da6 - display all users in the presentation dropdown 2018-01-08 10:42:01 -08:00
Ghazi Triki
d1c765e614 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into webcams-only-for-moderator-on-off 2018-01-08 19:33:23 +01:00
Richard Alam
02736382f6
Merge pull request #4868 from riadvice/2.0-ui-fixes 
Fix toolbar components alignment and localisation update
 2018-01-08 10:19:55 -08:00
Richard Alam
9b64e3d2a3
Merge pull request #4916 from riadvice/alphabetise-private-chat-users 
Sort private chat users alphabetically.
 2018-01-08 10:19:24 -08:00
Richard Alam
b93a95ca8e
Merge pull request #4896 from prlanzarin/flash-webcam-fix 
Ghost flash webcams fix
 2018-01-08 10:18:52 -08:00
Ghazi Triki
a7354c5be7 Sort private chat users alphabetically. 2018-01-08 16:58:17 +01:00
Ghazi Triki
36f02e8528 Request webcamsOnlyForModerator value at user enter success. 2018-01-07 22:24:54 +01:00
Ghazi Triki
8129f67879 Add missing class SetWebcamsOnlyForModeratorEvent. 2018-01-07 16:46:16 +01:00
Ghazi Triki
38ab186b53 Change webcamsOnlyForModerator property and handle saving it in server and client. 2018-01-07 16:45:24 +01:00
Richard Alam
fb7a38eb52 - remove presenter group 2018-01-05 12:59:40 -08:00
Augusto Bennemann
67cb4b073b Error notifications for video and screenshare 2018-01-05 17:16:46 +00:00
prlanzarin
7f06664711 Refactored the flash webcam pattern checking 2018-01-04 20:25:22 +00:00
prlanzarin
dfb5170e5d Finished filtering out HTML5 and Flash webcams using stream name patterns 2018-01-04 16:24:50 +00:00
Richard Alam
34cd45ef82 - pre-populate presenter dropdown 2018-01-03 13:57:55 -08:00
Richard Alam
f5d2f854af - try to figure out how to remove presenter group 2018-01-03 12:28:32 -08:00
Ghazi Triki
cc2f2708e3 Add a new configuration option privateChateEnabled for breakout rooms. 2017-12-29 15:51:35 +01:00
Ghazi Triki
2147f8e454 Disable private chat in breakout rooms. 2017-12-29 09:44:30 +01:00
Ghazi Triki
c922841020 Fix toolbar components alignment and localisation update. 2017-12-25 15:31:26 +01:00
prlanzarin
02a46387e0 Filter out html5 cameras from flash client 2017-12-22 19:25:25 +00:00
prlanzarin
3f8e7c308c Revert "Added checking for HTML5 webcams" 
This reverts commit 51b62ed30d.
 2017-12-22 18:30:40 +00:00
Anton Georgiev
61c12298e2
Merge pull request #4661 from prlanzarin/bbb-webrtc-sfu 
Add support for WebRTC screensharing into Flash/HTML5 and WebRTC video into HTML5
 2017-12-22 14:43:38 -02:00
Richard Alam
d43527d8aa Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-21 13:36:27 -08:00
Richard Alam
763c2c51c0 - remove trace log 2017-12-21 13:12:58 -08:00
Richard Alam
becf60b389 Merge branch 'breakout-room-closing-warning' of https://github.com/capilkey/bigbluebutton into capilkey-breakout-room-closing-warning 2017-12-21 12:52:50 -08:00
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
Chad Pilkey
5b367f6101 add a minute warning when breakout rooms are going to close 2017-12-21 15:13:52 -05: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
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
prlanzarin
51b62ed30d Added checking for HTML5 webcams 
This should prevent blank webcams on the flash client
 2017-12-21 17:38:39 +00:00
prlanzarin
3a72afa350 Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection 2017-12-21 17:37:07 +00: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
f5502a1a2a - allow passing of custom param (logo) to override default logo 2017-12-20 11:06:00 -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
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
2c2de4049d - reload chat messages on reconnect 2017-12-16 13:20:14 -08:00
Richard Alam
1be175cde4
Merge pull request #4835 from capilkey/fix-locale-initialization 
Fix locale initialization
 2017-12-15 18:01:12 -05: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
ea34a1cfa7 - list for presentation download changed message in the file download window 2017-12-15 13:04:10 -08:00
Richard Alam
f4d4bc8370 - refresh presentation list 2017-12-15 12:36:37 -08:00
Richard Alam
6c3b2b1374 Merge branch 'presentation-download' of github.com:riadvice/bigbluebutton into presentation-download 2017-12-15 12:28:09 -08:00
Ghazi Triki
986b9598ef Localised allow/disallow presentation dowload label and tooltip. 2017-12-15 21:26:06 +01:00
Richard Alam
f826aae0fc Merge branch 'presentation-download' of github.com:riadvice/bigbluebutton into presentation-download 2017-12-15 11:54:59 -08:00
Ghazi Triki
ef7a3137a7 - Download the current slide with annotation should always be available. 
- Disable toggle file downloadable on and off.
 2017-12-15 20:52:34 +01:00
Richard Alam
b03f9fbeea Merge branch 'master' into presentation-download 2017-12-15 11:23:29 -08:00
Richard Alam
3dc2cc95a0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into presentation-download 2017-12-15 11:11:18 -08:00
Richard Alam
0dc922e7df - handle message from server for presenation download change event 2017-12-15 11:07:09 -08:00
Chad Pilkey
7f657c5b38 decouple the WhiteboardCanvas from the PresentationModule 2017-12-15 13:10:01 -05:00
Chad Pilkey
9318ccbeb4 add a forgotten break for IsMeetingMutedRespMsg case 2017-12-15 12:45:47 -05:00
Chad Pilkey
8ecbf50ca4 remove old 1.1 message handling in users MessageReceiver 2017-12-15 12:43:38 -05:00
Richard Alam
31a80be511 - handle presentation download change in client 2017-12-15 08:50:59 -08:00
Ghazi Triki
89814bd613 Implement new feature: set presentation downloadable on and off. Work in progress. 2017-12-15 16:08:56 +01:00
Chad Pilkey
ead04e3470 fix exceptions on reconnect 2017-12-14 16:08:52 -05:00
Richard Alam
e0d0971070 Merge branch '2.1-whiteboard-improvements' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-whiteboard-improvements 2017-12-13 10:16:43 -08:00
Chad Pilkey
cf25541a98 fix cursor for presenter 2017-12-13 12:13:30 -05:00
Chad Pilkey
37f544be93 change whiteboard collection from ArrayCollection to Hashmap for quicker lookup 2017-12-13 02:19:38 -05:00
Chad Pilkey
61a14a0079 completely clear the annotation and cursor holders on whiteboard switch 2017-12-13 02:19:09 -05:00
Chad Pilkey
ccc7e5b0a4 remove third green from whiteboard toolbar colours 2017-12-13 02:15:47 -05:00
Chad Pilkey
1551dcae15 move multiuser to be per-whiteboard 2017-12-13 02:14:43 -05:00
Richard Alam
67c233dd0d - show poll button only in main presentation pod 2017-12-12 12:02:12 -08:00
Richard Alam
3e3e661856
Merge pull request #4799 from ritzalam/eject-duplicate-user 
Eject duplicate user
 2017-12-12 10:55:51 -05:00
Richard Alam
0f77ec4211
Merge pull request #4795 from ritzalam/avoid-duplicating-chat-messages 
- avoid duplicating chat system messages
 2017-12-11 17:12:15 -05:00
Richard Alam
e1a7946640
Merge pull request #4790 from ritzalam/promote-demote-user 
- promote to moderator only authenticated users
 2017-12-11 17:11:57 -05:00
Richard Alam
7f51071f9e - display specific eject reason to user 2017-12-11 14:03:14 -08:00
Ghazi Triki
d8cbbfe682 Created new layouts for presentations : 2x1, 2x2, 3x3 2017-12-11 21:51:57 +01:00
Richard Alam
5d448544d2 - avoid duplicating chat system messages 2017-12-11 09:07:43 -08:00
Richard Alam
dda21b4a5e
Merge pull request #4793 from capilkey/disabled-moderator-unmute 
Fix meeting mute and disable unmute of others
 2017-12-11 11:00:41 -05:00
Chad Pilkey
860fd2a5df fix meeting mute and disable unmute of others 2017-12-11 00:00:32 -05:00
Richard Alam
b35e750f86 - promote to moderator only authenticated users 2017-12-09 19:10:14 -08:00
Richard Alam
595bf37579 Merge branch 'synch-with-v2.0' into guest-and-authenticated-guest 2017-12-08 14:35:12 -08:00
Richard Alam
728750b3d4 - fic sending of chat message 2017-12-08 14:31:07 -08:00
Richard Alam
85f8873910 - change some locale strings 2017-12-08 14:14:52 -08:00
Richard Alam
4c6b953abc - split authenticated guests from regular guests 2017-12-08 13:21:22 -08:00
Richard Alam
2574a18e7f Merge branch 'synch-with-v2.0' into guest-and-authenticated-guest 2017-12-08 12:04:56 -08:00
Richard Alam
b74a57aaaf Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into guest-and-authenticated-guest 2017-12-08 11:32:46 -08:00
Richard Alam
715a0177fd Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-12-08 11:26:09 -08:00
Richard Alam
f1e7e7021e
Merge pull request #4781 from capilkey/check-chat-message-parse-fail 
Check for failed chat message parse
 2017-12-08 11:26:35 -05:00
Richard Alam
3c90c4b7c4
Merge pull request #4761 from capilkey/fix-webcam-shortcut-lock 
Block webcam popup opening when locked
 2017-12-08 11:26:03 -05:00
Richard Alam
6bd2440cbf
Merge pull request #4760 from capilkey/chrome-microphone-access-warning 
Add a warning about microphone access for chrome on HTTP
 2017-12-08 11:25:28 -05:00
Ghazi Triki
5e47e47e7f Fix presentation download. 2017-12-08 11:49:45 +01:00
Ghazi Triki
dac267d2e9 Export poll result as bitmap into PDF. 2017-12-07 21:21:45 +01:00
Chad Pilkey
6b2fc25084 check for failed chat message parse 2017-12-07 12:12:48 -08:00
Richard Alam
68e452df6c - add guest and authenticated info in client so we can display them separately 2017-12-07 10:47:07 -08:00
Chad Pilkey
d5793f86c2 (2.0 only) block zoom slider change processing when not presenter 2017-12-07 10:00:33 -08:00
Chad Pilkey
4ce4204536 added poll record events, removed unused HidePoll message 2017-12-07 07:58:42 -08:00
Richard Alam
e227d59a47
Merge pull request #4774 from capilkey/block-slider-change-event 
Updates to the PresentationWindow to fix bugs
 2017-12-06 21:14:29 -05:00
Chad Pilkey
4db637ffe1 re-order PresentationWindow instantiation so it can start up correctly 2017-12-06 21:10:55 -05:00
Chad Pilkey
5e2969f488 increase the number of shown rows in presentation pod dropdown 2017-12-06 20:07:28 -05:00
Chad Pilkey
0159dd39dc block slider change event handling when not presenter 2017-12-06 19:09:08 -05:00
Ghazi Triki
351d18a988 Prefix each presentation pod title with its sequence number. 2017-12-06 20:38:08 +01:00
Richard Alam
c07e53fb90 Merge branch 'ui-fixes' of https://github.com/riadvice/bigbluebutton into riadvice-ui-fixes 2017-12-05 17:43:29 -08:00
Richard Alam
17202ad1df Merge branch 'show-auth-users' of https://github.com/ritzalam/bigbluebutton into ritzalam-show-auth-users 2017-12-05 17:33:36 -08:00
Richard Alam
3f7b7d1544 - show list of authenticated and guest users waiting for approval 2017-12-05 17:00:21 -08:00
Chad Pilkey
174f24a184 block webcam popup opening when locked 2017-12-05 12:16:32 -08:00
Chad Pilkey
5c1a656f6d add a microphone warning for chrome on http 2017-12-05 11:47:37 -08:00
Ghazi Triki
27c65f145d Code improvements and cleanup. 2017-12-05 19:44:17 +01:00
Ghazi Triki
84f77a5e4c Fix PopUpButtonSkin to follow component life-cycle guidelines. 2017-12-05 18:35:25 +01:00
Ghazi Triki
73b901bb38 Use Canavas as item render to follow guidelines. 2017-12-04 20:04:11 +01:00
Ghazi Triki
aeabaa6999 Delete unused podItemTitle style. 2017-12-04 19:21:52 +01:00
Ghazi Triki
9b3415e9a6 Update PresentationPodControlItemRenderer to mxml renderer. 2017-12-04 17:06:23 +01:00
Anton Georgiev
196d77bcf5
Merge pull request #4748 from ritzalam/assign-pod-presenter 
- when a presenter on a pod leaves, assign another presenter into th…
 2017-12-04 14:00:52 -02:00
Ghazi Triki
96f12da2a4 Use ComboBox2 in ScreensharePublishWindow and ShortcutHelpWindow. 2017-12-03 20:14:00 +01:00
Ghazi Triki
9869b55ec0 Created a new ComboBox2 with a new behaviour that prevents its popup from closing when its MDIWindow parent is focused. 2017-12-03 20:07:42 +01:00
Richard Alam
4ced34d9d1 - remove button to approve only guests or authenticated users 2017-12-01 13:04:33 -08:00
Richard Alam
12e47d1bd6 Merge branch 'fix-default-locale-selector' of https://github.com/capilkey/bigbluebutton into capilkey-fix-default-locale-selector 2017-11-30 13:41:47 -08:00
Ghazi Triki
1285a4e203 Fix PresentationWindow title. 2017-11-30 11:16:32 +01:00
Chad Pilkey
6cd27d49e5 avoid null exceptions 2017-11-29 18:26:44 -05:00
Chad Pilkey
e4c33baf86 fix language state intialization 2017-11-29 18:19:43 -05:00
Ghazi Triki
8201d54088 Update and fix displaying private and group chats. 2017-11-28 09:58:28 +01:00
Ghazi Triki
eacafb6c87 Delete user from private chat list when he leaves the conference. 2017-11-27 18:24:12 +01:00
prlanzarin
b7c4115ba3 Moved kurento browser scripts to /client/lib and removed bower packaging from the HTML5 client 2017-11-27 16:22:48 +00:00
Richard Alam
8a782ff163 Merge branch 'flex-improve' of https://github.com/riadvice/bigbluebutton into riadvice-flex-improve 2017-11-27 08:05:56 -08:00
Ghazi Triki
bdadfa9410 UI and style improvements. 2017-11-27 16:55:52 +01:00
Ghazi Triki
664e47b40b Code cleanup. 2017-11-26 16:25:04 +01:00
Ghazi Triki
8a7f31f502 Improve bigbluebutton-client/resources/prod/BigBlueButton CSS styles for "altFlash" div. 2017-11-25 18:33:30 +01:00
Ghazi Triki
57f5719e22 Fix guest tooltips. 2017-11-25 18:32:03 +01:00
Chad Pilkey
26ac1b7813 stop viewers from trying to init lock settings 2017-11-24 19:05:43 -05:00
Chad Pilkey
ec87fce8b4 fix startup race condition in LayoutManager on client load 2017-11-24 19:05:25 -05:00
Chad Pilkey
01efd0dbf4 stop viewers from opening new public chat pods 2017-11-24 19:04:31 -05:00
prlanzarin
fdca5356c3 Finished making bbb-webrtc-sfu answer in single path 
Started standardizing video and screenshare RPC messages

Video now uses redis message routing
 2017-11-24 18:59:40 +00:00
Ghazi Triki
6afa2898ba Fix WaitingWindow popup unlock. 2017-11-24 19:23:51 +01:00
Richard Alam
fe7e568708
Merge pull request #4720 from capilkey/fix-layoutname-fallback 
Fix layout name fallback
 2017-11-23 16:51:25 -05:00
Richard Alam
94de542226
Merge pull request #4721 from ritzalam/private-chat-name 
Display name of user when doing private chat
 2017-11-23 16:50:56 -05:00
Richard Alam
682bc6cd97 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2017-11-23 13:50:29 -08:00
Richard Alam
caaf082e2e Merge branch 'guest-options' of https://github.com/riadvice/bigbluebutton into riadvice-guest-options 2017-11-23 13:45:07 -08:00
Ghazi Triki
a8ba5904c6 Improve guest box padding. 2017-11-23 22:39:30 +01:00
Richard Alam
dcb933a986 - fix display of private chat name 2017-11-23 13:36:43 -08:00
Ghazi Triki
de500c3dbd Add a new button to display pending guests. 2017-11-23 22:30:05 +01:00
Chad Pilkey
df910730c8 fix layout name fallback 2017-11-23 15:44:42 -05:00
Richard Alam
81aa832448
Merge pull request #4716 from ritzalam/synch-with-v2.0 
Synch with v2.0
 2017-11-23 14:15:33 -05:00
Anton Georgiev
116f91d6c8 exclude pres pod dropdown from layout for viewer 2017-11-23 13:53:06 -05:00
Anton Georgiev
2b4950296e handle promoted/demoted moderator in pres pods 2017-11-23 11:35:51 -05:00
Anton Georgiev
85605a803d display pres pod dropdown to moderators only 2017-11-23 10:59:31 -05:00
Ghazi Triki
7b0d7d23d9 Display notification for incoming private messages. 2017-11-22 19:16:09 +01:00
Richard Alam
80212aa218 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-11-22 08:04:29 -08:00
Richard Alam
ec9b0d038a Merge branch 'meeting-name-display' of https://github.com/riadvice/bigbluebutton into riadvice-meeting-name-display 2017-11-22 07:52:09 -08:00
Ghazi Triki
1bfeec88bc Fix meeting label width. 2017-11-21 17:45:01 +01:00
Richard Alam
59b5e376ec
Merge pull request #4707 from ritzalam/synch-with-v2.0 
Synch with v2.0
 2017-11-21 11:24:50 -05:00
Richard Alam
e77b3c1e04 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-11-21 08:10:29 -08:00
Richard Alam
bdba583efa Merge branch 'chat-tabs' of https://github.com/riadvice/bigbluebutton into riadvice-chat-tabs 2017-11-21 07:45:23 -08:00
Ghazi Triki
0204564eda Update font color. 2017-11-21 16:36:31 +01:00
Ghazi Triki
97a738d1af Use a Text component for long ProgresBar label. 2017-11-21 16:24:22 +01:00
Ghazi Triki
830263e436 Open group chat after closing it. 2017-11-21 08:52:00 +01:00
Ghazi Triki
a90e3ec325 Fix record confirmation popup position. 2017-11-20 22:16:24 +01:00
Ghazi Triki
7bb517082d Open existing group chat when selecting it from the list. 2017-11-20 19:43:37 +01:00
Ghazi Triki
04f46b9eb5 Correctly send MDIWindowEvent.CLOSE event to ChatEventMapDelegate when a public chat window is closed. 2017-11-20 18:28:46 +01:00
Richard Alam
764bc5a00c Merge branch 'fix-private-chat-issues' of https://github.com/ritzalam/bigbluebutton into ritzalam-fix-private-chat-issues 2017-11-20 08:51:50 -08:00
Richard Alam
e13a68377c Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-11-20 08:42:46 -08:00
Richard Alam
8f9606e270 Merge branch 'pass-mute-param' of https://github.com/ritzalam/bigbluebutton into ritzalam-pass-mute-param 2017-11-20 08:04:18 -08:00
Richard Alam
f600af5145 Merge branch 'cleanup-guest-ui' of https://github.com/ritzalam/bigbluebutton into ritzalam-cleanup-guest-ui 2017-11-20 07:41:10 -08:00
Richard Alam
1466636d17 Merge branch '2.1-presentation-cleanup' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-presentation-cleanup 2017-11-20 07:24:21 -08:00
Chad Pilkey
3235f8423c clean up of akka-app presentpod code (removed ownerId and other redundant date) 2017-11-19 14:34:19 -05:00
Chad Pilkey
86e89cfd43 remove ownerId and prevPresenterId from PresentationModule 2017-11-17 19:29:03 -05:00
prlanzarin
248dc7fa08 Fixed HTML5 video API import 
Added chrome extension ID to HTML5 screenshare call
 2017-11-17 18:55:59 +00:00
Richard Alam
49b08fabc1 - disable private chat input box if other user leaves 2017-11-17 10:46:53 -08:00
Richard Alam
6ff5d0db42 - pass mute param on message so we don't rely on toggling mute/unmute state for users 2017-11-17 08:46:18 -08:00
Richard Alam
5a406551de - remove authenicated users list for approval as we only deal with guests 2017-11-16 12:14:36 -08:00
Ghazi Triki
f3ee06fc5b Update group chats list. 2017-11-16 21:12:18 +01:00
Ghazi Triki
11438c3e74 Center FileUploadWindow differently. 2017-11-16 19:21:39 +01:00
Richard Alam
90b49bb12e Revert "Delay centering popups as FileUploadWindow cannot be directly centered." 
This reverts commit acddb48545.
 2017-11-16 08:21:18 -08:00
Chad Pilkey
3377196b5a only take presentation pod presenter on create if user is mod 2017-11-15 18:09:47 -05:00
Chad Pilkey
8edfe1037f initialize whiteboard canvas with current presenter id 2017-11-15 18:07:48 -05:00
Ghazi Triki
7124d8b12f Show group chat in options tab. 2017-11-15 21:51:46 +01:00
Ghazi Triki
929be96030 Rename ChatBox to ChatTab. 2017-11-15 20:59:24 +01:00
Ghazi Triki
2f07c4a67a Move create group chat button to chat options tab. 2017-11-15 20:32:42 +01:00
Ghazi Triki
acddb48545 Delay centering popups as FileUploadWindow cannot be directly centered. 2017-11-15 18:01:15 +01:00
Richard Alam
16f58a95ee - pass podId on constructor instead of passing every time the method is called. 2017-11-14 14:42:56 -08:00
Richard Alam
d61129927e Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-11-14 13:55:18 -08:00
Richard Alam
a5269c8eda Merge branch 'center-popups' of https://github.com/riadvice/bigbluebutton into riadvice-center-popups 2017-11-14 11:49:01 -08:00
Anton Georgiev
3c0371c911
Merge pull request #4666 from riadvice/layout-naming-fallback 
Fall back to the layout name if a translation could not be found
 2017-11-14 15:20:20 -02:00
Anton Georgiev
d95dc9c22c
Merge pull request #4665 from riadvice/private-chat 
Display red dot in chat tab
 2017-11-14 14:53:05 -02:00
Ghazi Triki
669594298e Fall back to the layout name if a translation could not be found. 2017-11-14 09:40:20 +01:00
Ghazi Triki
04e259a16e Fix highlightedTabStyle style. 2017-11-13 22:47:48 +01:00
Richard Alam
f411f24c92 - clear main public chat box when clear chat button is clicked. 2017-11-13 11:17:50 -08:00
Richard Alam
f22cab9ac7 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues 2017-11-13 08:54:19 -08:00
Richard Alam
b2aae3ab3c - clear public chat (incomplete) 
TODO: client doesn't clear yet
 2017-11-13 05:56:14 -08:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu 
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
 2017-11-11 03:41:37 +00:00
Anton Georgiev
62ccb317e6
Merge pull request #4658 from antobinary/pods_vol4 
Force currentPodPresenter value
 2017-11-10 17:46:18 -02:00
Anton Georgiev
87051ecc92 force currentPodPresenter value 2017-11-10 14:41:58 -05:00
Anton Georgiev
6cee63a79c do not display guest notification for self 2017-11-10 12:31:07 -05:00
Anton Georgiev
490f717502 show guests waiting to late joining moderator 2017-11-10 12:06:41 -05:00
Anton Georgiev
4523c65535
Merge pull request #4654 from ritzalam/fix-chat-issues 
- save and copy main public chat messages
 2017-11-10 13:07:23 -02:00
Richard Alam
038ac70f3e - save and copy main public chat messages 2017-11-10 05:40:31 -08:00
Anton Georgiev
97c5d89cb8 allow moderator to add self to presenter group 2017-11-09 17:58:20 -05:00
Anton Georgiev
056c33a11e Merge branch 'multi-pod-improve' of github.com:riadvice/bigbluebutton into pods_vol4 2017-11-09 17:31:02 -05:00
Anton Georgiev
08dc7f117d
Merge pull request #4651 from ritzalam/fix-chat-issues 
Fix chat issues
 2017-11-09 20:13:45 -02:00
Richard Alam
c50dab1b81 - try forcing to switch focus to private chat 2017-11-09 13:59:20 -08:00
Richard Alam
943fbbb086 - open private chat window if closed and new message is received 2017-11-09 13:24:28 -08:00
Anton Georgiev
7b940bd96f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into guest-work 2017-11-09 15:45:40 -05:00
Anton Georgiev
e387c824c4 make guest-wait url relative to avoid issues with http/https 2017-11-09 15:44:38 -05:00
Chad Pilkey
46e0253f17 Merge remote-tracking branch 'upstream/master' into implement-rights-management 2017-11-09 14:36:25 -05:00
Ghazi Triki
08eda408cd Add a new UnselectableItemsComboBox component for PresentationWindow. 2017-11-09 20:25:09 +01:00
Anton Georgiev
84df0dfdd4
Merge pull request #4646 from ritzalam/fix-chat-issues 
Fix chat issues
 2017-11-09 13:46:31 -02:00
Richard Alam
3673f563e4 - add focus on chat box todo list 2017-11-09 04:45:51 -08:00
Richard Alam
4acb15cb66 - remove box mapper on chat box closed event 2017-11-09 04:06:08 -08:00
Richard Alam
d684efe2f3 - do not open new chat box if already chatting with user 2017-11-08 19:43:05 -08:00
Chad Pilkey
d1ebaa249b Merge remote-tracking branch 'upstream/master' into implement-rights-management 2017-11-08 19:47:50 -05:00
Chad Pilkey
c615d36cd8 fix two null exceptions in the Flash client 2017-11-08 18:49:25 -05:00
Anton Georgiev
eb3f8aec5b close PendingGuestsWindow only from parent 2017-11-08 18:41:51 -05:00
Anton Georgiev
0d915a0c56 handle PendingGuestWindow when there are 1+ guests waiting 2017-11-08 18:10:24 -05:00
Fred Dixon
3d5ffed888
Merge pull request #4640 from riadvice/fix-presentation-context-menu 
Fix presentation context menu when switching locale
 2017-11-08 08:11:07 -05:00
Anton Georgiev
af578111bc
Merge pull request #4632 from ritzalam/guest-manager-remember 
- set guest policy when remember choice is checked
 2017-11-07 19:05:54 -02:00
Ghazi Triki
cc6718007a Center popups and alerts when the application is resized. 2017-11-07 17:57:35 +01:00
Ghazi Triki
6b9389d487 Fix presentation context menu actions add when switching locale as viewer. 2017-11-07 17:18:11 +01:00
Anton Georgiev
1d38e9498a Merge branch 'guest-manager-remember' of github.com:ritzalam/bigbluebutton into guest-work 2017-11-07 10:21:07 -05:00
Richard Alam
60d030d436 - track chat box closing 2017-11-07 04:31:01 -08:00
Fred Dixon
2249fb51f1
Merge pull request #4637 from capilkey/fix-presentation-stutter 
Improvements to the page move events
 2017-11-06 17:24:46 -05:00
Chad Pilkey
0b7ee4d694 improvements to the page move events 2017-11-06 16:36:20 -05:00
prlanzarin
ddb2902834 Small refactoring on kurento-extension 
Proper HTML5 screenshare viewer handling

Changed Firefox screensharing constraints to pick windows and limited max resolution to HD
 2017-11-06 14:27:12 +00:00
Ghazi Triki
ca1fad923e Make logout happen when using a wrong session token. 2017-11-06 15:26:17 +01:00
Richard Alam
42b96e370d - propagate guest policy change to bbb-web 2017-11-05 20:21:42 -08:00
Richard Alam
a9f160ce99 - set guest policy when remember choice is checked 2017-11-05 16:49:10 -08:00
Richard Alam
a6b5311f04 - add comment to open private chats in main public chat window 2017-11-05 16:02:39 -08:00
Richard Alam
fb5723af1e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into fix-chat-issues 2017-11-05 15:46:06 -08:00
Richard Alam
54d5eb1101 Merge branch 'external-swf-modules' of https://github.com/riadvice/bigbluebutton into riadvice-external-swf-modules 2017-11-05 13:53:18 -08:00
Ghazi Triki
fc9eab9992 Correctly load MainToolbar configuration. 2017-11-05 16:05:53 +01:00
Ghazi Triki
da3a604d2a Compile the master locale within the main application to avoid loading it when the application is launched, in that case we only load the preferred locale if needed. 2017-11-05 15:36:02 +01:00
Ghazi Triki
356dcf277e Move all logout and close events handlers from MainApplicationShell to new LogoutManager. 2017-11-05 10:15:25 +01:00
Richard Alam
8e350724f4 - cleanup 2017-11-03 14:58:00 -07:00
Anton Georgiev
7d10ac1a98
Merge pull request #4630 from antobinary/pods_vol4 
Presentation Pods - handle zoom, move and remove; cleanup
 2017-11-03 18:29:11 -02:00
Anton Georgiev
9cd8491d70 pass podId when removing/clearing presentation 2017-11-03 16:24:55 -04:00
Anton Georgiev
411307af3f handle zoom and move event in presentation pods 2017-11-03 15:35:59 -04:00
Chad Pilkey
6fcf97eaf6
Merge pull request #4629 from capilkey/drop-mic-on-call-end 
Attempt to release mic when not needed for webrtc
 2017-11-03 14:54:19 -04:00
Anton Georgiev
2b1d88a358
Merge pull request #4628 from antobinary/pods_vol4 
Presentation Pods - handle polling (only on default presentation pod)
 2017-11-03 15:09:58 -02:00
Chad Pilkey
04f268a259
Merge pull request #4627 from capilkey/drop-mic-on-call-end 
Release the saved WebRTC microphone when call ends
 2017-11-03 12:49:17 -04:00
Chad Pilkey
22c160008e attempt to release mic when not needed for webrtc 2017-11-03 12:47:26 -04:00
Anton Georgiev
ed725e1a97 remove user from presenter group on user leave 2017-11-03 11:43:06 -04:00
Anton Georgiev
e5b335b7b5 show poll related buttons only on the default pres pod 2017-11-03 11:32:57 -04:00
Ghazi Triki
7b99ac1f06 Improve origin URL setting by adding it to flashvars instead of of calling js from flash client. 2017-11-03 16:19:57 +01:00
Anton Georgiev
a3d91b9ddb adjust permissions for RemovePresentationPodPubMsg 2017-11-03 10:57:46 -04:00
Anton Georgiev
6ce6b73e6a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4 2017-11-03 10:08:10 -04:00
Ghazi Triki
e1e162b38f Take into consideration more CDN assets for the Flex client: 
- Added new option `localesDirectory` to language tag.
- Added `localesConfig` to language tag, removed domain guessing and make `locale.xml` external.
- Change the application initialisation order: load config.xml, then locale, then add MainApplicationShell to BigBlueButtonMainContainer if all is correctly processed.
- Added a new event LocaleChangeEvent.LOCALE_INIT.
- Added `videoProfilesConfig` property to VideoconfModule configuration.
- Fix skin name condition in SkinningService.
- Added new Options class: LayoutModuleOptions.
 2017-11-03 10:43:15 +01:00
Anton Georgiev
f1d3f31f3f reuse DEFAULT_PRESENTATION_POD as a const 2017-11-02 16:54:42 -04:00
Richard Alam
4e8f2abbb3 - pass token on video connect 2017-11-01 14:55:48 -07:00
Anton Georgiev
d6a7e04715 avoid null items in presenter pod dropdown 2017-11-01 11:18:57 -04:00
Anton Georgiev
9818fca29e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4 2017-11-01 09:56:58 -04:00
Anton Georgiev
81d643bcde handle pod presenter change on whiteboard toolbar and text toolbar 2017-11-01 07:05:20 -04:00
Anton Georgiev
28f1809a70 independent control of presenter for modules Present and Whiteboard 2017-10-31 18:49:25 -04:00
Richard Alam
72a1745c65 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-10-31 14:58:36 -07:00
Richard Alam
9ef812707c - open guest window when new guest joins 2017-10-31 14:31:12 -07:00
Anton Georgiev
8450921362 separate cursor events depending on whiteboardId (pod) 2017-10-31 15:55:59 -04:00
Richard Alam
e665f2ac6e
Merge pull request #4616 from ritzalam/implement-multi-chat 
- setup polling of guest while waiting for approval from moderator
 2017-10-31 15:55:21 -04:00
Richard Alam
3056622283 - setup polling of guest while waiting for approval from moderator 2017-10-31 12:50:54 -07:00
Chad Pilkey
db44e24b9d
Merge pull request #4609 from capilkey/load-swf-cdn 
Allow loading SWFs from a CDN
 2017-10-31 13:46:07 -04:00
Anton Georgiev
0b7424d147
Merge pull request #4615 from antobinary/pods_vol4 
Presentation Pods -  Handle default presentation pod missing ownerId
 2017-10-31 15:42:08 -02:00
Chad Pilkey
052eed88d0 allow loading SWFs from a CDN 2017-10-30 17:28:32 -04:00
Richard Alam
0036b5734d - create guest lobby html page 2017-10-30 14:21:09 -07:00
Anton Georgiev
8a87b9d6d2 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pods_vol4 2017-10-30 16:06:47 -04:00
Anton Georgiev
fcdb479581 Handle default presentation pod missing ownerId 
request new pod from client side, and when handling it, just populate the ownerId of the existing pod
 2017-10-30 16:04:43 -04:00
Richard Alam
e313647655 - fix presentation window name for sample multi pod layout 2017-10-30 12:08:56 -07:00
Richard Alam
974c1d7780 - sample default layou for chat 2017-10-30 10:00:31 -07:00
Richard Alam
19a692e6bf - check if pod has been initialized before accesing the presentation page to prevent an exception. 2017-10-30 07:55:37 -07:00
Richard Alam
528c401110 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat 2017-10-29 14:30:18 -07:00
Richard Alam
6c1ce36cd9
Merge pull request #4597 from capilkey/close-chat-pods 
[2.1] Close all ChatWindows when module is stopped
 2017-10-29 16:11:24 -04:00
Richard Alam
4c99626c84
Merge pull request #4596 from capilkey/add-presentwin-to-layout 
Add proper window identification to PresentationWindows
 2017-10-29 16:11:11 -04:00
Richard Alam
b128ba3fea
Merge pull request #4593 from antobinary/pods_vol4 
Improvements to Presentation Pods
 2017-10-29 16:11:00 -04:00
Chad Pilkey
596d8d1e01 close all ChatWindows when module is stopped 2017-10-29 15:57:12 -04:00
Chad Pilkey
f471bb7380 add proper window identification to PresentationWindows 2017-10-29 15:53:54 -04:00
Anton Georgiev
ebdaedd3ae work on remove presentation from pod. WIP 2017-10-29 13:12:27 -04:00
Richard Alam
976b8cb687 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into implement-multi-chat 2017-10-29 09:13:07 -07:00
Anton Georgiev
d888af2583 cleanup; moved assignments after constructor 2017-10-29 11:53:16 -04:00
Ghazi Triki
ac7ae1d382 Fix toolbar background color option. 2017-10-29 16:43:26 +01:00
Anton Georgiev
2b25a6ff24 pass podId to showPresentation 2017-10-29 11:41:34 -04:00
Anton Georgiev
d4e91dee4a do not allow closing of DEFAULT_PRESENTATION_POD 2017-10-29 10:42:03 -04:00
Anton Georgiev
bbba00f083 make podId param in PresenterCommands event 2017-10-29 10:41:23 -04:00
Richard Alam
5be0dec165 Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4 2017-10-28 17:32:29 -07:00
Richard Alam
fb90502a92 - sample layout.xml 2017-10-28 17:31:22 -07:00
Anton Georgiev
ef95a29dde add podId to zoom event 2017-10-28 20:09:49 -04:00
Anton Georgiev
8dddd206c3 send presenter group to late joiner 2017-10-28 20:08:54 -04:00
Richard Alam
c47569ae6c - add logs 2017-10-28 16:02:05 -07:00
Richard Alam
1c304bb26c Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4 2017-10-28 15:54:17 -07:00
Richard Alam
515ff2a6c9 - add more logging 2017-10-28 15:54:07 -07:00
Anton Georgiev
462dd1aae4 pass temp parameter to GetListOfPresentationsRequest 2017-10-28 18:32:39 -04:00
Anton Georgiev
65d65959cf Merge branch 'antobinary-pods_vol4' of github.com:ritzalam/bigbluebutton into pods_vol4 2017-10-28 18:26:23 -04:00
Anton Georgiev
374d454357 propagate events to SlideView 2017-10-28 18:25:11 -04:00
Richard Alam
a683dca073 - fix initialization of var in command/event 
- comment again positionPage method
 2017-10-28 14:33:37 -07:00
Richard Alam
a5397054ae Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into antobinary-pods_vol4 2017-10-28 14:13:31 -07:00
Anton Georgiev
2703372d1c handle current Pod Presenter in dropdown 2017-10-28 17:02:40 -04:00
Chad Pilkey
dba9359d13
Merge pull request #4589 from capilkey/chat-pod-layout 
Make Chat Pods layout compatible
 2017-10-28 14:50:54 -04:00
Chad Pilkey
47b98e0def chat windows now open in order and the first is included in the layouts 2017-10-28 14:41:15 -04:00
Richard Alam
ffbacbfcfe - display presentation on viewer when presenter uploads new presentation 2017-10-28 07:58:10 -07:00
Richard Alam
519da9033d Merge branch 'pods_vol4' of https://github.com/antobinary/bigbluebutton into antobinary-pods_vol4 2017-10-27 17:16:57 -07:00
Anton Georgiev
99f409f41e cleanup 2017-10-27 19:28:22 -04:00
Anton Georgiev
d38a05105c work on maintaining correct state (current presentation in pod) 2017-10-27 19:17:50 -04:00
Fred Dixon
132f552e78
Merge pull request #4586 from capilkey/pod-compatible-layouts 
Changed the layout module to use custom names instead of the class name
 2017-10-27 18:51:04 -04:00
Chad Pilkey
15a495f931 changed the layout module to use custom names instead of the class name 2017-10-27 18:30:23 -04:00
Richard Alam
89809e83e9 Merge branch 'condense-layout-tools-2.1' of https://github.com/capilkey/bigbluebutton into capilkey-condense-layout-tools-2.1 2017-10-27 09:31:08 -07:00
Chad Pilkey
00c5a31ffb condense the layout tools down to one button 2017-10-27 11:47:12 -04:00
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
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
Anton Georgiev
1efe354031 work on default pod race condition and controlling current pres 2017-10-26 17:54:21 -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
Ghazi Triki
7e4017ad17 Remove code that was moved to locale change. 2017-10-25 20:28:42 +01: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
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
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
cbdd70fff6 - update locales 2017-10-24 13:21:28 -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
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