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
|
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 |
|
Klaus
|
f591a155b5
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-breakout-2x-fix
|
2017-08-14 14:05:25 -03:00 |
|
Maxim Khlobystov
|
3d7a35972b
|
Updated the page object classes according with the multiremote needs.
|
2017-08-14 12:58:43 -04:00 |
|
Maxim Khlobystov
|
8379d5207c
|
Updated all the existing landing page specs to support mutiremote mode.
|
2017-08-14 12:30:14 -04: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 |
|
Maxim Khlobystov
|
4e55403348
|
Added multiremote to the test runner config.
|
2017-08-14 10:03:43 -04: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 |
|
Klaus
|
de6b40a666
|
Fix counter in breakout notification
|
2017-08-11 17:17:35 -03:00 |
|
Anton Georgiev
|
412c1f95a2
|
refactor join audio user handler so it can be reused
|
2017-08-11 15:56:03 -04:00 |
|
Anton Georgiev
|
ec3166dc4a
|
pass correct value for voiceUserId
|
2017-08-11 15:51:11 -04: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 |
|
Klaus
|
17dce149d9
|
fix dropdown going missing
|
2017-08-11 15:02:26 -03:00 |
|
Ghazi Triki
|
52c6d51d53
|
Remove WhiteboardTextToolbar opacity states.
|
2017-08-11 18:38:38 +01:00 |
|
Klaus
|
babc981867
|
Messages been correct handle
|
2017-08-11 14:14:50 -03: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 |
|