Anton Georgiev
5f1fb7542e
Merge pull request #4204 from Klauswk/fix-missing-state
...
[HTML5 2.0] Fix Audio Modal on Meeting Join
2017-08-15 15:11:47 -04:00
Anton Georgiev
f6e8e743e0
Merge pull request #4244 from KDSBrowne/fix-meeting-title
...
[HTML5] - Meeting title fix
2017-08-15 15:11:27 -04:00
Richard Alam
12021fb451
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-08-15 10:47:03 -07:00
Richard Alam
bbe00830a7
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
2017-08-15 10:46:39 -07:00
Richard Alam
0e6ba882fd
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
2017-08-15 10:44:00 -07:00
Anton Georgiev
54047a02c9
Merge pull request #4238 from Klauswk/html5-breakout-2x-fix
...
[HTML5 2.0] Fix breakout on the HTML5
2017-08-15 13:43:02 -04:00
KDSBrowne
66d1a3b06a
fix meeting title
2017-08-15 10:24:58 -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
dee3e89d79
Updated audio join and leave icons.
2017-08-15 17:37:40 +01:00
Klaus
3730891d5f
Merge branch 'bbb-2x-mconf' into html5-breakout-2x-fix
2017-08-15 13:08:13 -03:00
Richard Alam
2160fd79c8
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
2017-08-15 09:06:51 -07:00
Ghazi Triki
44c0b3b327
Added custom skin for scroll bars.
2017-08-15 16:56:50 +01:00
Richard Alam
440331fb62
Merge pull request #4240 from kepstin/bbb-20-rec-fixes
...
Bbb 20 rec fixes
2017-08-15 10:46:36 -04: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
Ghazi Triki
51253910ac
Visually disable user selection in users list. (reverted from commit 09ed1ba699)
2017-08-15 08:54:48 +01:00
Calvin Walton
0087139f0d
rnp: Fix playback to handle shape updates correctly.
...
The previous code would cause shapes to "blink" during updating if
the updates weren't continuous - in a gap between updates, the shape
would disappear.
Rework the logic for looking up "current" shapes to return the
nearest previous update rather than only exact matching timestamps,
and simplify the logic that decides whether to make a shape visible
or hidden.
2017-08-14 18:18:16 -04:00
Anton Georgiev
6efdb1d430
Merge pull request #4237 from Klauswk/html5-2x-separate-redis-channel
...
[HTML5 2.0] Handling Separate Redis Channel
2017-08-14 15:47:51 -04:00
Klaus
dc62d15ad0
Change variable name
2017-08-14 16:19:35 -03:00
Richard Alam
5779f26fc2
Merge branch 'antobinary-audio-state' into bbb-2x-mconf
2017-08-14 12:03:02 -07:00
Klaus
e996bea1e9
Handling separate redis channel
2017-08-14 15:55:17 -03:00
Klaus
7c12ccb39e
Handling meeting end
2017-08-14 15:52:18 -03: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
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
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
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
