Commit Graph

17600 Commits

Author SHA1 Message Date
Richard Alam
a8a59c92e1 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-14 11:09:57 -07: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
acb3a68613 Added padding to window title. 2017-08-14 16:00:58 +01:00
Richard Alam
7e52e01bd1 Merge branch 'capilkey-fix-client-locking' into bbb-2x-mconf 2017-08-14 07:40:38 -07:00
Ghazi Triki
668ebfa31e Center slides navigation buttons. 2017-08-14 11:59:30 +01:00
Ghazi Triki
09ed1ba699 Visually disable user selection in users list. 2017-08-14 11:34:13 +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
Richard Alam
dcc6014ff3 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-11 14:05:42 -07:00
Richard Alam
99172177d4 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-11 14:01:12 -07:00
Richard Alam
b1b6c83235 Merge pull request #4232 from ritzalam/more-logging-during-conversion
More logging during conversion
2017-08-11 16:28:02 -04:00
Richard Alam
252d857e86 Merge pull request #4231 from ritzalam/cleanup-printlns
- remove some printlns to minimize noise
2017-08-11 16:27:25 -04:00
Richard Alam
45160333e8 - log extra infor during doc conversion 2017-08-11 13:20:47 -07:00
Richard Alam
bc6f4f6638 - log switch presentation
- fix switch presentation
2017-08-11 13:19:56 -07:00
Richard Alam
965977cf80 - go through all presentations instead of just getting the active presentation 2017-08-11 13:19:05 -07:00
Ghazi Triki
950b3828cf Minor flash ui improvements. 2017-08-11 20:44:34 +01:00
Ghazi Triki
1994464e95 Always show PopUpButtonSkin separator. 2017-08-11 20:43:56 +01:00
Richard Alam
7956b561d2 - remove some printlns to minimize noise 2017-08-11 11:22:26 -07: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
f2a42bf791 Merge pull request #3929 from riadvice/document-conversion
Update document conversion threshold values with lower values
2017-08-11 11:20:29 -04:00
Richard Alam
a3adc5e070 Merge pull request #4230 from ritzalam/fix-end-time-format
- fix end time format of get-meeting-info api response
2017-08-11 11:14:56 -04:00
Richard Alam
a81f2474e0 - fix end time format of get-meeting-info api response 2017-08-10 14:26:10 -07:00
Richard Alam
89d70ad188 Merge branch 'ritzalam-end-breakout-rooms' into bbb-2x-mconf 2017-08-10 14:11:20 -07:00
Richard Alam
53b64fcca0 Merge branch 'end-breakout-rooms' of https://github.com/ritzalam/bigbluebutton into ritzalam-end-breakout-rooms 2017-08-10 13:58:02 -07:00
Richard Alam
e1cb751e4a Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-10 13:55:17 -07: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
Richard Alam
774caa5c9c Merge branch 'antobinary-fix-webcam-state' into bbb-2x-mconf 2017-08-10 13:50:00 -07:00
Richard Alam
7f63490e63 - end breakout rooms when parent meeting ends
- send breakout ended event
 - do not send negative time remaining updates
2017-08-10 13:29:33 -07:00
Ghazi Triki
f1c73c1aad Swap sad and neutral icons to fix them. 2017-08-10 21:21:06 +01:00
Ghazi Triki
af123e25cd Added disabled icons for top toolbar buttons. 2017-08-10 20:58:46 +01: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
1dc5de1665 cleanup unused object 2017-08-10 15:30: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
Richard Alam
39c6a07b1f Merge pull request #4220 from ritzalam/send-msgs-using-different-channels
- send messages into separate channels so other components can  …
2017-08-10 13:39:39 -04:00
Ghazi Triki
7f3a5dfdd0 Update notification status for chat tab. 2017-08-10 18:38:08 +01:00
Richard Alam
d50041f03c - send messages into separate channels so other components can pick and choose which
channels to listen to.
2017-08-10 10:14:50 -07:00
Ghazi Triki
e160084ab5 Updated settings windows style and highlighted tab style. 2017-08-10 16:12:20 +01:00
Anton Georgiev
0546afce1f only allow presenter to change slide 2017-08-10 10:59:03 -04:00
Anton Georgiev
0b8a8c856b replace old user copy with the updated user to avoid false state 2017-08-10 10:52:56 -04:00
Ghazi Triki
3df8e6fb3c Add missing enableGuestUI option to UsersModule configuration. 2017-08-10 15:46:38 +01:00
Richard Alam
51df1122d4 Merge branch 'pedrobmarin-fix-promote-demote-users' into bbb-2x-mconf 2017-08-09 14:11:22 -07: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
20381b5fb8 Merge branch 'pedrobmarin-fix-webcam-fullscreen' into bbb-2x-mconf 2017-08-09 14:02:28 -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
902d57df22 Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-09 13:56:56 -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