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

5240 Commits

Author SHA1 Message Date
Anton Georgiev
19355eef41 Merge pull request #4249 from antobinary/audio-state 
Handle renamed stop_talking_handler event from FreeSWITCH
 2017-08-17 12:20:43 -04:00
Ghazi Triki
0e342c08bb Make full screen button visible only on Firefox. 2017-08-17 17:08:31 +01:00
Chad Pilkey
465206dd12 change annotation storage in client for quicker lookup 2017-08-17 11:38:44 -04:00
Richard Alam
b7de8b41a9 - allow pausing of screen share 2017-08-16 17:44:31 -07:00
Richard Alam
5e1297e8f8 - trigger sending of rtt from server side 
- send rtt of client to server so we can collect data
 2017-08-16 14:05:22 -07:00
Richard Alam
ec314b8105 - add round trip trace message from client and back to tell us where the bottleneck 
might be when using multi-user whiteboard.
 2017-08-16 09:44:27 -07:00
Anton Georgiev
47ab72de88 handle renamed stop_talking_handler event from FreeSWITCH 2017-08-16 10:17:23 -04:00
Richard Alam
0b0eeaacef - only presenter can toggle multi-user whiteboard 2017-08-15 14:14:42 -07:00
Richard Alam
3e0701a0ae - fix issue where when switching presenter while multi-user whiteboard is on, the cursors 
for other users appears instead of just the presenter's cursor.
 2017-08-15 13:49:25 -07:00
Ghazi Triki
d4c888014d Improve item selection color and user list info position display. 2017-08-15 18:19:05 +01:00
Ghazi Triki
44c0b3b327 Added custom skin for scroll bars. 2017-08-15 16:56:50 +01:00
Ghazi Triki
d2ec64a2a3 Revert MuteMeButton to inherit CanvasButton. 2017-08-15 13:46:40 +01:00
Ghazi Triki
afa37f4166 Vertically and horizontally align scree sharing windows. 2017-08-15 11:27:25 +01:00
Ghazi Triki
ccbd1b8070 Style improve and make screen sharing windows background white. 2017-08-15 10:11:15 +01:00
Richard Alam
3879d48f17 Merge branch 'audio-state' of https://github.com/antobinary/bigbluebutton into antobinary-audio-state 2017-08-14 11:52:04 -07:00
Anton Georgiev
293c58ca42 distinguish fresh user join from reconnect. Recover audio state 2017-08-14 14:38:51 -04:00
Richard Alam
9112217b51 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-14 11:05:49 -07:00
Ghazi Triki
057a1732e5 Added dark background to SlideView. 2017-08-14 17:15:36 +01:00
Ghazi Triki
668ebfa31e Center slides navigation buttons. 2017-08-14 11:59:30 +01:00
Ghazi Triki
17305172d5 Update MainToolbar button positions and fix quick links toolbar. 2017-08-14 11:17:42 +01:00
Chad Pilkey
ac030e6254 fix meeting and client locking 2017-08-11 20:53:09 -04:00
Ghazi Triki
950b3828cf Minor flash ui improvements. 2017-08-11 20:44:34 +01:00
Ghazi Triki
52c6d51d53 Remove WhiteboardTextToolbar opacity states. 2017-08-11 18:38:38 +01:00
Ghazi Triki
78f15304e7 Disable close button and enable it instead of hiding it in FileUploadWindow.mxml 2017-08-11 17:49:10 +01:00
Richard Alam
e2aedbdb31 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-10 13:51:03 -07:00
Anton Georgiev
1e492dba73 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-webcam-state 2017-08-10 15:31:29 -04:00
Anton Georgiev
4ba3375fb4 update whiteboard (non)presenter view after reconnect 2017-08-10 15:29:27 -04:00
Ghazi Triki
18c618e1fc Change the order of main toolbar buttons. 2017-08-10 20:12:22 +01:00
Ghazi Triki
7f3a5dfdd0 Update notification status for chat tab. 2017-08-10 18:38:08 +01:00
Ghazi Triki
e160084ab5 Updated settings windows style and highlighted tab style. 2017-08-10 16:12:20 +01:00
Anton Georgiev
0b8a8c856b replace old user copy with the updated user to avoid false state 2017-08-10 10:52:56 -04:00
Richard Alam
6f9a9c09e3 Merge branch 'fix-promote-demote-users' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-fix-promote-demote-users 2017-08-09 14:04:00 -07:00
Richard Alam
f4748c0912 Merge branch 'fix-webcam-fullscreen' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-fix-webcam-fullscreen 2017-08-09 13:59:16 -07:00
Richard Alam
3ac8aa3fd2 - change logs to trace as logging isn't initialized yet when these are called. 
- send locale version even if when locale fails to load because it isn't available. The client needs to
   match locale versions from config.xml and the locale itself to make sure the locale strings are correct.
   If the client doesn't receive both version, the client won't continue.
 2017-08-09 13:54:20 -07:00
Richard Alam
6af15555f7 - minimize logging 2017-08-09 13:53:26 -07:00
Pedro Beschorner Marin
185f6a85e9 Missing code for the promote/demote users feature 2017-08-09 20:13:52 +00:00
Pedro Beschorner Marin
bf5b73c7a5 Fixing Firefox's Flash NPE 2017-08-09 18:22:15 +00:00
Ghazi Triki
5dc6d390e1 Properly fallback to the master locale when a selected locale is not available. 2017-08-09 17:28:12 +01:00
Pedro Beschorner Marin
422faf7014 Fixed webcam fullscreen display position 2017-08-09 16:11:44 +00:00
Ghazi Triki
733f122953 Use default selection and rollover colours for lists. 2017-08-09 10:36:45 +01:00
Ghazi Triki
46dc367be3 Fix MediaItemRenderer icons. 2017-08-09 09:19:27 +01:00
Richard Alam
5648f7ef8a Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-08 08:34:21 -07:00
Ghazi Triki
d8278c24da Revert back dark style when video chat layout is selected. 2017-08-08 13:30:18 +01:00
Ghazi Triki
3462c716be Make SlideView background white. 2017-08-08 11:22:29 +01:00
Ghazi Triki
5b8ae10d3c Updated chat options style, default radio button and checkbox styles. 2017-08-08 11:09:46 +01:00
Ghazi Triki
1f001ee0cb Update BBBSettings title position and style. 2017-08-07 21:15:16 +01:00
Ghazi Triki
35cc113996 Added new sking for the Tab component and updated chat list style. 2017-08-07 18:21:43 +01:00
Ghazi Triki
9a1553f95e Show presentation download button only when there is at least one downloadable presentation. 2017-08-07 14:07:47 +01:00
Richard Alam
b1b00aa070 - display breakout room time remaining 2017-08-04 08:14:48 -07:00
Ghazi Triki
f2e9ab2929 Updated windows titles styles and improved polling windows. 2017-08-04 10:03:26 +01:00
Ghazi Triki
3340808aac Updated WhiteboardTextToolbar style. 2017-08-04 08:18:19 +01:00
Richard Alam
32ecf3c975 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-03 20:21:24 -07:00
Richard Alam
13ef71c59d - listen in on breakout room works but there's sometimes a glitch on transferring 
the moderator from breakout room to parent meeting.
 2017-08-03 20:17:26 -07:00
Richard Alam
279d3797ef - not transfer works but user isn't removed from users list in breakout room 2017-08-03 15:16:29 -07:00
Ghazi Triki
35b8539bf7 Put ChromeWebcamPermissionImage in the front. 2017-08-03 22:01:32 +01:00
Ghazi Triki
f34a78018a Revert back old whiteboard cursors. 2017-08-03 20:59:15 +01:00
Richard Alam
ebd8b704f4 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-03 11:42:15 -07:00
Ghazi Triki
bd6530fcd8 Updated file download window. 2017-08-03 19:16:02 +01:00
Ghazi Triki
6a8d066b7a Updated FileDownloadWindow and UploadedPresentationRenderer. 2017-08-03 15:09:55 +01:00
Richard Alam
f343719297 - set logging to debug not to clutter our client logs 2017-08-02 12:59:32 -07:00
Richard Alam
3089219981 Merge branch 'fix-presenter-cursor-colour' of https://github.com/capilkey/bigbluebutton into capilkey-fix-presenter-cursor-colour 2017-08-02 12:10:00 -07:00
Chad Pilkey
43e6359029 make presenter cursor colour switch correctly 2017-08-02 13:04:09 -04:00
Ghazi Triki
8d0a74e904 Minor imprvements to icon sizes. 2017-08-02 16:12:52 +01:00
Ghazi Triki
dd9b71717a Add icons to users settings menu and imporve BreakoutRoomSettings window layout. 2017-08-02 13:45:34 +01:00
Ghazi Triki
961b417e65 Improve users list icons and item renders layout. 2017-08-02 12:53:20 +01:00
Ghazi Triki
9f938d9cde Remove warning in SharedNotesEventMapDelegate.as 2017-08-02 12:51:45 +01:00
Richard Alam
4889f66361 Merge branch 'restrict-remote-layout' of https://github.com/capilkey/bigbluebutton into capilkey-restrict-remote-layout 2017-08-01 17:35:47 -07:00
Chad Pilkey
89ea33359c only apply remote layouts to non-moderators 2017-08-01 18:51:20 -04:00
Richard Alam
3b44d0eac2 - fix issue where late joiners displays the wrong slide 2017-08-01 14:50:44 -07:00
Richard Alam
629939ccc7 - remove binding warnings 2017-08-01 11:31:39 -07:00
Ghazi Triki
a760d93c9f Fix presentation conversion pages number and setting to current. 2017-08-01 17:50:50 +01:00
Ghazi Triki
9ebd4468cc Revert WebRTCEchoTest yes button click handler removed by mistake. 2017-08-01 11:21:34 +01:00
Richard Alam
775ac013fd Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-07-31 17:58:03 -07:00
Ghazi Triki
9f0536c18b Align users action buttons to the right. 2017-07-31 23:22:40 +01:00
Richard Alam
63ed10e3f1 - log logout reason 2017-07-31 12:28:55 -07:00
Ghazi Triki
f67304442a Improve audio and lock settings title windows. 2017-07-31 18:13:10 +01:00
Ghazi Triki
77c5b98e2a Minor fixes to TabIndexer class. 2017-07-31 18:11:51 +01:00
Ghazi Triki
39fdeabf4c Improved audio settings windows. 2017-07-31 14:53:04 +01:00
Pedro Beschorner Marin
c919a203e7 Removed extra line included by mistake 2017-07-30 22:37:55 +00:00
Pedro Beschorner Marin
77603a62c8 Limiting the number of shared notes 2017-07-30 22:11:13 +00:00
Richard Alam
87e035c7a5 Merge branch 'do-not-send-extra-msg-on-val-token' of https://github.com/ritzalam/bigbluebutton into ritzalam-do-not-send-extra-msg-on-val-token 2017-07-27 13:52:33 -07:00
Richard Alam
ddef378e6a Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-07-27 13:51:40 -07:00
Richard Alam
eb994c09a3 - do not send extra messages on validate token response 
- make flash client explicitly send user join message to server
 2017-07-27 13:42:36 -07:00
Ghazi Triki
b6f11c5604 Updated list text states colours and bottom bar items height. 2017-07-27 21:36:23 +01:00
Richard Alam
0541fd2935 - fix message name for requesting url of breakout room 2017-07-27 11:34:52 -07:00
Ghazi Triki
60fceb8726 Remove tooltip from MDIWindow title bar. 2017-07-27 16:48:42 +01:00
Richard Alam
d57193ba1a Merge branch 'ss-loading' of https://github.com/perroned/bigbluebutton into perroned-ss-loading 2017-07-26 14:46:20 -07:00
perroned
d12d90b650 Screenshare loading screen 2017-07-26 20:43:08 +00:00
Richard Alam
6fb08c1396 - convert over lock setting into 2x messages 2017-07-26 13:19:19 -07:00
Richard Alam
67808fcb66 - display time remaining when meeting duration is not zero 2017-07-26 08:49:28 -07:00
Richard Alam
f9d49b65e1 - handle meeting muted and inactive messages 2017-07-26 08:37:19 -07:00
Richard Alam
fe7bd03297 Merge branch 'bbb-2x-mconf' into fix-breakout-room-messaging 2017-07-26 07:58:02 -07:00
Richard Alam
0274656058 - display timer only when there is meeting duration 2017-07-26 07:51:10 -07:00
Ghazi Triki
63b48d9db8 Restrict using emoji from version 1.1 only 2017-07-26 15:41:41 +01:00
Richard Alam
0f04b69897 Merge branch 'fix-breakout-room-messaging' of github.com:ritzalam/bigbluebutton into fix-breakout-room-messaging 2017-07-25 17:44:17 -07:00
Richard Alam
4a3a746949 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-25 17:07:48 -07:00
Richard Alam
3921eaf36f - display timer 
- make sure talking indicator is off when user is muted
 2017-07-25 13:43:35 -07:00
Richard Alam
971cd7fe92 - display metting timer 2017-07-25 13:42:53 -07:00
Richard Alam
59e149a6e1 - display meeting time remaining 2017-07-25 11:54:13 -07:00
Ghazi Triki
f086fb1abe Fix FileUploadWindow and make it close when clicking on the close button. 2017-07-25 15:28:52 +01:00
Ghazi Triki
528acab82e Updated toolbar logo to make aligned with meeting name label. 2017-07-25 14:10:44 +01:00
Ghazi Triki
d4d737dfd2 Implement new design for quick links buttons. 2017-07-25 11:35:54 +01:00
Richard Alam
ad37b52835 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-24 18:21:59 -07:00
Richard Alam
df99ac9689 Merge branch 'hide-unneeded-components' of https://github.com/capilkey/bigbluebutton into capilkey-hide-unneeded-components 2017-07-24 18:06:30 -07:00
Richard Alam
8415300b3f - fix breakout time remaining 2017-07-24 14:44:15 -07:00
Richard Alam
ab5cad41e7 - handle some of breakout messages 
- timer still not working
 - listen not working
 - breakout users list not working
 2017-07-24 12:56:09 -07:00
Chad Pilkey
6be3863f33 hide some unrequired UI elements 2017-07-24 15:42:29 -04:00
Richard Alam
c38d675ae9 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-24 11:02:07 -07:00
Richard Alam
636ceea82c Merge branch 'late-joiner-webrtc-screenshare-updates' of https://github.com/antobinary/bigbluebutton into antobinary-late-joiner-webrtc-screenshare-updates 2017-07-24 10:50:25 -07:00
Richard Alam
73ca0da708 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-07-24 10:41:36 -07:00
Richard Alam
555302f11e - try to fix messaging of breakout rooms 2017-07-24 10:39:29 -07:00
Anton Georgiev
76f42d420a Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into late-joiner-webrtc-screenshare-updates 2017-07-24 13:26:56 -04:00
Anton Georgiev
0c8941185c drop unnecessary class WebRTCConnection 2017-07-24 13:25:47 -04:00
Ghazi Triki
cd478ecb49 Fix borderThickness property name. 2017-07-24 14:10:14 +01:00
Ghazi Triki
fed90fdf90 Update top toolbar buttons with new colour styles with the correct states. 2017-07-24 12:58:28 +01:00
Richard Alam
e89c20f245 - need to fix client to handle breakout messages properly 2017-07-23 18:39:00 -07:00
Richard Alam
8305782294 - create breakout room 
- send join url to client
 2017-07-23 18:14:26 -07:00
Richard Alam
7d3faf9305 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into fix-breakout-room-messaging 2017-07-22 07:01:04 -07:00
Richard Alam
544943b16b - receive recording status messages from server 2017-07-22 06:56:37 -07:00
Richard Alam
2abedb7276 - try to fix breakout rooms 2017-07-21 19:00:00 -07:00
Ghazi Triki
ef4da9e29d Fix glow filter for MuteMeButton. 2017-07-21 15:01:18 +01:00
Richard Alam
ba2e99ed0e Merge branch 'work-on-meeting-lifcycle-2' of https://github.com/ritzalam/bigbluebutton into ritzalam-work-on-meeting-lifcycle-2 2017-07-20 18:19:00 -07:00
Richard Alam
f1b4f87752 Merge branch 'late-joiner-webrtc-screenshare' of https://github.com/antobinary/bigbluebutton into antobinary-late-joiner-webrtc-screenshare 2017-07-20 17:41:55 -07:00
Richard Alam
ad9b122f4c - try to get webcams working 2017-07-20 14:32:44 -07:00
Richard Alam
3afc92618b Merge branch 'bbb-2x-mconf' into work-on-meeting-lifcycle-2 2017-07-20 13:34:15 -07:00
Richard Alam
37c744b01b Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf 2017-07-20 10:25:36 -07:00
Richard Alam
6be6e9191a - try to fix webcam list 2017-07-20 10:09:01 -07:00
Ghazi Triki
41ea10d1d7 Restore DEFAULT_TOOLBAR_HEIGHT in MainApplicationShell.mxml 2017-07-20 17:27:33 +01:00
Ghazi Triki
cfdce6e531 Fix application not loading at startup. 2017-07-20 17:14:51 +01:00
Richard Alam
5431f29a07 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into work-on-meeting-lifcycle-2 2017-07-20 07:17:02 -07:00
Richard Alam
d7e1a23022 - continue implement guest policy 2017-07-19 19:24:43 -07:00
Richard Alam
d488ff745d - implement guest policy 2017-07-19 14:59:36 -07:00
Anton Georgiev
2995e10ce3 request screenshare status on screenshare module init 2017-07-18 15:57:27 -04:00
Ghazi Triki
186417fb6f Merge branch 'master-v2' into 2x-client-theme 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatControlBar.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/WebRTCDesktopPublishWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
 2017-07-18 18:38:46 +01:00
Chad Pilkey
20fe7c2f24 Merge pull request #4115 from capilkey/cleanup-old-1.1-apps 
Presenter and slide size fix for 2.0
 2017-07-18 13:03:55 -04:00
Chad Pilkey
39659dc4d1 fix the dispatching of MadePresenterEvents 2017-07-18 12:59:59 -04:00
Chad Pilkey
dcfee91fd3 correct the slide max height calculation 2017-07-18 12:59:03 -04:00
Richard Alam
810a027907 Merge branch '2x-transcode-screenshare-merge' of https://github.com/prlanzarin/bigbluebutton-1 into prlanzarin-2x-transcode-screenshare-merge 2017-07-17 18:49:58 -07:00
Ghazi Triki
f52352f88f Deleted legacy client themes. 2017-07-18 00:14:53 +01:00
Anton Georgiev
d8dc01d333 display current webrtc screenshare to late joiners (if broadcasting) 2017-07-17 17:48:44 -04:00
Ghazi Triki
f6844d83ba Replace image assets with new theme icons. 2017-07-17 18:43:16 +01:00
Ghazi Triki
3e78731b11 Replace all icons and update all styles for V2Theme.css 2017-07-17 15:29:47 +01:00
Richard Alam
7ff3b9f516 - display users list for provate chat 2017-07-16 16:47:48 -07:00
Richard Alam
43edb0ea4c - convert get users query to 2x 2017-07-16 14:06:05 -07:00
Chad Pilkey
c9ec18d10a Merge pull request #4099 from capilkey/cleanup-old-1.1-apps 
Cleanup of whiteboard, caption, and poll
 2017-07-15 17:33:34 -04:00
Chad Pilkey
cc1e47ecef fixed the poll annotation drawing 2017-07-15 15:34:30 -04:00
perroned
0a6bb57580 Comma to plus 2017-07-15 10:59:45 -04:00
Richard Alam
335c547b82 Merge pull request #4077 from perroned/WebRTC-Screenshare-logging 
Adds some WebRTC Screenshare logging
 2017-07-15 09:19:45 -04:00
Ghazi Triki
3ef64e465e Updated whiteboard icons and cursors. 2017-07-14 18:13:43 +01:00
Anton Georgiev
1fba3f0009 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-13 12:30:51 -04:00
Anton Georgiev
3d420cf459 force disconnect for all users on meeting end 2017-07-13 11:58:16 -04:00
Richard Alam
a7efe5364c - webrtc map shouldn't handle jws events 2017-07-13 08:25:49 -07:00
perroned
dc658b244f Adds logs to LOGGER 2017-07-13 11:18:38 -04:00
Ghazi Triki
62630b00c9 Use new icons and style for whiteboard tool bar. 2017-07-13 13:53:30 +01:00
perroned
2801709dcb Adds some WebRTC Screenshare logging 2017-07-12 15:27:44 -04:00
Ghazi Triki
1ca350c6c8 Updated data grid and icons for users item renderers. 2017-07-12 17:37:05 +01:00
prlanzarin
e3cf771891 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into 2x-transcode-screenshare-merge 2017-07-12 15:14:07 +00:00
Richard Alam
19e98b22f5 Merge branch 'fs-webrtc-screenshare' of https://github.com/ritzalam/bigbluebutton into ritzalam-fs-webrtc-screenshare 2017-07-11 17:08:38 -07:00
Pedro Beschorner Marin
2097b611ed Merge remote-tracking branch 'prlanzarin/1.1-transcode-screenshare-merge' into bigbluebutton/bbb-2.x-mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/LiveMeeting.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/AppsRedisSubscriberActor.scala
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/RegisterUserMessage.java
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreensharePublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/view/components/ScreenshareViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/UserGraphicHolder.mxml
	record-and-playback/core/scripts/rap-process-worker.rb
 2017-07-11 20:41:38 +00:00
Richard Alam
b04519ef0f FreeSWITCH webrtc screenshare 
- use webrtc screenshare using FS Verto
 - publish screenshare as rtmp to red5
 - flash clients view screenshare from red5 rtmp

 Fix mute/unmute/talking of user in voice conference
 2017-07-11 13:31:56 -07:00
Anton Georgiev
c5ca6a2fcc red5 closes connection when user is ejected 2017-07-11 14:56:35 -04:00
Richard Alam
02d9c6717b Merge branch 'implement-bbb-web-msgs' of https://github.com/antobinary/bigbluebutton into antobinary-implement-bbb-web-msgs 2017-07-11 08:12:18 -07:00
Ghazi Triki
25997d34c1 Implemented new style for user video. 2017-07-11 15:58:55 +01:00
Ghazi Triki
2944cfd35a Move MuteMeButton component to phone module and updates styles for phone module buttons. 2017-07-11 10:34:49 +01:00
Anton Georgiev
c810c2cf73 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-10 17:26:04 -04:00
Anton Georgiev
797b2904aa handle eject user from meeting (a.k.a. kick) 2017-07-10 15:36:26 -04:00
Richard Alam
72f274434a Merge pull request #4063 from perroned/webrtc-utils 
Webrtc 2.0
 2017-07-10 13:33:44 -04:00
perroned
c13cb35c2b Cleans up 2017-07-10 12:03:01 -04:00
Richard Alam
7a7712d986 - start implementing lock settings 2017-07-09 15:00:13 -07:00
perroned
03a97fef46 Cleans up -> StringUtils 2017-07-09 14:43:20 -04:00
perroned
020df250a6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into webrtc-utils 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
 2017-07-09 14:39:57 -04:00
Anton Georgiev
0e9dcee399 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-09 11:09:23 -04:00
Richard Alam
8d91ef8132 - convert several old client messages to new ones 2017-07-09 07:44:29 -07:00
Anton Georgiev
35b87ee069 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-09 10:37:34 -04:00
Anton Georgiev
900518fb1b cleanup 2017-07-09 10:26:55 -04:00
Richard Alam
5dbb8d5515 - implement emoji status message 2017-07-08 13:39:41 -07:00
Ghazi Triki
7b228f58d2 Added new programmatic skin for Panel based component. 2017-07-08 20:38:28 +01:00
Richard Alam
6588e6e89a Merge pull request #4052 from capilkey/improve-shell-resize 
Skip layout change when dimensions are invalid
 2017-07-08 15:11:45 -04:00
Richard Alam
366e2033c5 Merge pull request #4060 from perroned/fix-ss-2x 
Restores 1.1 JWS Screensharing on 2.0
 2017-07-08 15:11:24 -04:00
Richard Alam
77de38e2f3 Merge branch 'move-chat-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-chat-messages-2x 2017-07-08 08:41:20 -07:00
perroned
f77b29bad3 Restores 1.1 ss 2017-07-08 11:29:13 -04:00
Richard Alam
0cf4227273 Merge branch 'implement-bbb-web-msgs' into implement-meeting-status 2017-07-08 08:04:13 -07:00
Richard Alam
2212d95a28 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into implement-meeting-status 2017-07-08 07:23:30 -07:00
Chad Pilkey
e30ba20323 avoid exception when cursor user isn't found 2017-07-07 20:16:43 -04:00
Chad Pilkey
550b880db7 convert chat messages to 2x 2017-07-07 19:14:00 -04:00
Ghazi Triki
436094cd6e Added new skin for ComboBox component. 2017-07-07 22:53:53 +01:00
perroned
1b92aba481 Hangup and reconnect safely 2017-07-07 17:27:28 -04:00
perroned
f5650b1d16 Makes utility for webrtc capabilities 2017-07-07 17:06:52 -04:00
perroned
c08f9d4d7b Changes handler to WebRTC status class 2017-07-07 17:02:07 -04:00
perroned
cc497136e8 Add screenshare fallbacks 2017-07-07 17:01:53 -04:00
Chad Pilkey
fc3d7a05aa remove the screenshare code from the presentation module 2017-07-07 17:01:27 -04:00
Anton Georgiev
a0f90f181d assign proper userId for assignedBy 2017-07-07 11:25:48 -04:00
Anton Georgiev
dd38cebe58 trigger UI changes if we are the presenter 2017-07-07 10:51:11 -04:00
Anton Georgiev
0ec660c8d3 handle assign presenter in flash client and akka apps 2017-07-07 10:32:38 -04:00
Ghazi Triki
6123a83586 Improved ButtonSkin and implemented AudioSelectionWindow new design. 2017-07-07 00:42:57 +01:00
Ghazi Triki
917f9029d8 Replace swf asset button skin by a new skin class. 2017-07-06 15:58:12 +01:00
Richard Alam
44f7b0c622 - remove old users model 2017-07-05 11:20:48 -07:00
Ghazi Triki
859b0cd33d Updated to mdi window buttons and style. 2017-07-05 18:38:44 +01:00
Ghazi Triki
8bf90835ec Replace main png logo by a swf logo. 2017-07-05 15:56:53 +01:00
Ghazi Triki
fff2ad8f50 Updated layout.xml by adding gaps between windows. 2017-07-05 15:18:43 +01:00
Chad Pilkey
f0ce1c416f change main app shell resize handler 2017-07-04 17:17:56 -04:00
Richard Alam
955b162915 - send new presentation conversion progress messages 2017-07-04 10:32:30 -07:00
prlanzarin
89fe4df880 Merge branch '1.1-transcode' of https://github.com/pedrobmarin/bigbluebutton into 1.1-transcode-screenshare-merge 2017-07-04 16:27:14 +00:00
Ghazi Triki
97ba9e29a4 Implemented progress bar skins. 2017-07-04 16:44:39 +01:00
Ghazi Triki
5cb30b7bc3 Activated old button icons from legacy default theme. 2017-07-04 15:26:56 +01:00
Ghazi Triki
b4ee163e33 Added v2 styles for Alert, Button and CombBox. 2017-07-04 12:08:45 +01:00
prlanzarin
5b8109a566 Added support for Firefox WebRTC screensharing with KMS 
Fixed Chrome getUserMedia constraints

Added client-side draft methods for HTML5 screenshare
 2017-07-03 19:13:00 +00:00
Ghazi Triki
d5e0098a52 Added new theme named V2Theme with a brand fresh new style. 2017-07-03 18:36:53 +01:00
Ghazi Triki
b1a8ba17b6 Added SkinningApplication.mxml to test new theme implementation. 2017-07-03 18:35:40 +01:00
Ghazi Triki
8c4e58b111 Do not load style embedded to the application by default. 2017-07-03 18:34:15 +01:00
Pedro Beschorner Marin
79cf6bb623 Moved sharednotes messages to 2.0 format 2017-07-03 17:28:12 +00:00
Chad Pilkey
4e5df30ac4 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into fix-2.0-layout 2017-06-29 16:57:28 -04:00
Chad Pilkey
9f904e6267 reorganized the layout code in akka-apps and fixed layout broadcast 2017-06-29 16:55:25 -04:00
Richard Alam
a11c45fa02 - implement handlers for guest policy 2017-06-29 11:34:08 -07:00
Chad Pilkey
15c938e9cd fixed layout message response and removed redundant props 2017-06-29 14:32:31 -04:00
Richard Alam
04e55a1dd4 Merge branch 'move-caption-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-caption-messages-2x 2017-06-28 07:47:56 -07:00
Chad Pilkey
02e8c4f4cb forgot a semi-colon 2017-06-26 18:29:21 -04:00
Chad Pilkey
4c66393dbd Merge remote-tracking branch 'upstream/bbb-2x-mconf' into move-caption-messages-2x 2017-06-26 18:09:56 -04:00
Richard Alam
4baf8369ff - apply voice status to correct user 2017-06-26 14:01:25 -07:00
Richard Alam
00cee79501 - do not show when user joins listen-only 2017-06-26 14:00:51 -07:00
Richard Alam
2316e73c26 Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls 2017-06-26 14:00:38 -07:00
Chad Pilkey
adfdd3c230 add try/catch block to client message receiver 2017-06-26 16:48:05 -04:00
Richard Alam
99046fb685 - handle emoji status changed message in client 2017-06-26 12:38:00 -07:00
Chad Pilkey
76026da06c moved caption messages to 2.0 format 2017-06-26 15:00:32 -04:00
Richard Alam
9dc41437e8 - handle user left 2017-06-26 10:34:22 -07:00
Richard Alam
dfa1557116 - display default presentation 2017-06-26 07:24:38 -07:00
Richard Alam
f7376e11c0 - get presentation info 2017-06-25 16:11:29 -07:00
Richard Alam
2931b719c6 - get presentation info 2017-06-25 13:26:37 -07:00
Richard Alam
9317cdfcc0 Merge branch 'capilkey-move-presentation-messages-2x' into merge-presentation 2017-06-25 11:25:23 -07:00
Richard Alam
34cab65b2e Merge branch 'move-presentation-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-presentation-messages-2x 2017-06-24 15:46:22 -07:00
Richard Alam
ae4fc536b1 - fix use leaving voice conf 2017-06-24 06:47:19 -07:00
Richard Alam
77da487c60 - handle user muted and talking messages 2017-06-23 18:14:55 -07:00
Richard Alam
ceb4d74e55 - handle user join and left voice conference 2017-06-23 14:34:05 -07:00
Anton Georgiev
9a0a4d5669 work on displaying poll result annotation in flash client 2017-06-23 17:26:53 -04:00
Richard Alam
4dda2543ac - handle user joined voice conf 2017-06-23 12:26:28 -07:00
Richard Alam
7ffd1a80bd - assign presenter when no presenter present 2017-06-23 11:12:17 -07:00
Chad Pilkey
1c226fd3af 2.0 presentation message work, presentation conversion msgs in bbb-web missing 2017-06-23 13:27:56 -04:00
Richard Alam
c4616f1ce0 - load modules after validate token 2017-06-22 14:42:10 -07:00
Richard Alam
48b6fcdb09 - use LiveMeeting to store state 2017-06-22 13:52:39 -07:00
Anton Georgiev
9dc00519db Polls 2.0 on Flash client 2017-06-22 11:38:42 -04:00
Richard Alam
13efe38e87 - include webcam streams in users list 2017-06-22 08:30:39 -07:00
Richard Alam
0bc5e24886 - cleanup 2017-06-22 08:04:00 -07:00
Richard Alam
5957259b49 - combining web and voice users looks better 2017-06-22 08:00:32 -07:00
Richard Alam
8bf19d09ba - fix exception in voice users list 2017-06-21 17:20:44 -07:00
Richard Alam
f30f16c64c - try to display voice users list 2017-06-21 17:10:52 -07:00
Richard Alam
e32e15934b - try to display voice only users 2017-06-21 14:43:36 -07:00
Richard Alam
11609d840b - display users list 2017-06-21 13:47:10 -07:00
Richard Alam
c41b9b9a7a - display users list 2017-06-21 13:32:37 -07:00
Richard Alam
281108b1ab - send waitForApproval for guest on validate token 2017-06-21 10:49:08 -07:00
Richard Alam
30bafd7983 - try using new user data instead of BBBUser 2017-06-21 09:41:59 -07:00