Richard Alam
5d60a59650
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into bbb-2x-mconf
2017-08-31 08:49:41 -07:00
Richard Alam
58b659b4af
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
2017-08-31 08:49:17 -07:00
Richard Alam
2dd6a5e005
Merge pull request #4348 from ritzalam/skip-bad-matadat-xml
...
- do not include recordings with bad metadata.xml in the response fo…
2017-08-31 11:19:03 -04:00
Richard Alam
e8127fdb61
- do not include recordings with bad metadata.xml in the response for recording api calls
2017-08-31 08:06:15 -07:00
Anton Georgiev
3146de984b
remove hide-show toolbar code
2017-08-31 10:53:37 -04:00
Ghazi Triki
bf3c6096d5
Users list does not scroll to the selected item when the data provider is refreshed.
2017-08-31 13:11:22 +01:00
Oleksandr Zhurbenko
58d21dfef5
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-30 16:13:42 -07:00
Oleksandr Zhurbenko
28f7f8ad11
Minor fixes and adjustments
2017-08-30 16:12:03 -07:00
Chad Pilkey
a8ff311f91
Merge pull request #4342 from pedrobmarin/shared-notes-message-limit
...
Shared notes message limit
2017-08-30 18:42:00 -04:00
Chad Pilkey
b9dc10ede4
Merge pull request #4343 from capilkey/clean-pencil-end-numbers
...
Clean dimension numbers from pencil end message
2017-08-30 17:41:04 -04:00
Anton Georgiev
ed3bfae6e9
switch from flash based fullscreen to html5 api based
2017-08-30 17:18:59 -04:00
Chad Pilkey
13a1b19f6c
Merge pull request #4337 from capilkey/fix-annotation-clipping
...
Attempt to fix annotation clipping
2017-08-30 17:15:10 -04:00
Chad Pilkey
52bff50f10
clean dimension numbers from pencil end message
2017-08-30 17:14:00 -04:00
Oleksandr Zhurbenko
e4c4f4584d
Prevented publishing messages on random clicks for common shapes, and enabled that for pencil
2017-08-30 13:45:47 -07:00
Pedro Beschorner Marin
20779c4602
Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into shared-notes-message-limit
2017-08-30 20:40:05 +00:00
Pedro Beschorner Marin
6ab641e7c3
Added shared notes clear button for moderators
2017-08-30 20:32:42 +00:00
Chad Pilkey
3affad6be4
the whiteboard annotations should now always clip
2017-08-30 16:20:44 -04:00
Richard Alam
ac23e266c2
Merge pull request #4335 from kepstin/bbb-20-rec-fixes
...
RnP: Fix shape type name for poll shapes
2017-08-30 14:52:34 -04:00
Calvin Walton
b810939643
RnP: Fix parsing poll fields as numbers rather than text
2017-08-30 14:51:52 -04:00
Pedro Beschorner Marin
35d054fcb6
Avoid to persist patches bigger than the message size limiter
2017-08-30 18:49:09 +00:00
Calvin Walton
e81d77a318
RnP: Fix shape type name for poll shapes
2017-08-30 14:42:29 -04:00
Richard Alam
82177b4d85
- fix recording of poll result. See issue #4237 .
2017-08-30 11:01:19 -07:00
Fred Dixon
29a65f4f1e
Merge pull request #4333 from riadvice/2x-client-theme
...
[Flash 2.0] - UI updates for shared notes and breakout rooms
2017-08-30 12:16:36 -04:00
Ghazi Triki
10c9069467
Display remaining time in the breakout room if 30 minutes or below.
2017-08-30 17:08:51 +01:00
Anton Georgiev
a36b89a6da
Merge pull request #4330 from antobinary/fullscreen
...
Disable toolbar hiding on fullscreen
2017-08-30 11:58:47 -04:00
Richard Alam
960ad3a27b
Merge pull request #4331 from ritzalam/increase-message-limit
...
- increase default message limit
2017-08-30 11:39:05 -04:00
Richard Alam
98b5ea65ce
- increase default message limit
2017-08-30 08:37:54 -07:00
Anton Georgiev
88cc66f78b
disable toolbar hiding on fullscreen
2017-08-30 11:25:10 -04:00
Ghazi Triki
82f99acc16
Hide logout and end the meeting button when the conference is a breakout room.
2017-08-30 16:04:13 +01:00
Ghazi Triki
1ff3ed88da
Validate creating a shared not by typing ENTER key.
2017-08-30 15:50:52 +01:00
Ghazi Triki
446304ac50
Display all rows in breakout rooms data grid.
2017-08-30 14:40:15 +01:00
Ghazi Triki
a844f8e0fa
Multiuser button is selected when multiuser feature is enabled.
2017-08-30 11:44:22 +01:00
Ghazi Triki
a5780bb890
Update presentation area background to lighter gray.
2017-08-30 11:22:10 +01:00
Ghazi Triki
1e46bbbbed
Updated breakout rooms icons.
2017-08-30 11:12:29 +01:00
Oleksandr Zhurbenko
f78283a17d
Fixes
...
Hide wb toolbar when there is no slide; fixed cursor's text clipping; fixed exceptions thrown on 'Clear All' by reactive-annotation container; fixed shapes' thickness scaling on zoom; fixed dimensions' data types sent to akka (it doesn't accept Doubles)
2017-08-29 18:43:55 -07:00
KDSBrowne
b2fcfef145
move if condition
2017-08-29 16:26:43 -07:00
Oleksandr Zhurbenko
e1cf0ad9d5
Rewrite of the cursor component
2017-08-29 13:58:48 -07:00
Pedro Beschorner Marin
9d9313a231
Added a control to turn on and off hidding the additional notes with tha main one
2017-08-29 19:45:45 +00:00
Richard Alam
7aad997d8a
Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf
2017-08-29 12:41:43 -07:00
Richard Alam
6b45fca4a3
Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme
2017-08-29 12:37:18 -07:00
KDSBrowne
126f4589e1
move if conditions
2017-08-29 12:31:09 -07:00
KDSBrowne
20316be90f
add suggested changes
2017-08-29 12:25:01 -07:00
Ghazi Triki
9112eff046
Move breakout room timer to the top blue ribbon.
2017-08-29 18:50:14 +01:00
Anton Georgiev
273659a2ac
Merge pull request #4315 from pedrobmarin/notes-typists
...
Show users that are typing in shared notes...
2017-08-29 13:23:38 -04:00
Ghazi Triki
46fde19356
Change join breakout room alert by a new JoinBreakoutRoomWindow component.
2017-08-29 17:53:19 +01:00
Chad Pilkey
fad6959866
Merge pull request #4324 from capilkey/relax-pencil-smoothing
...
Relax pencil smoothing
2017-08-29 10:27:49 -04:00
Chad Pilkey
207fa6b62c
add a tooltip for the multiuser button
2017-08-29 10:23:59 -04:00
Chad Pilkey
b0e3442ef6
relax the pencil smoothing a little
2017-08-29 10:23:25 -04:00
Ghazi Triki
02da94e000
Added prominent blue ribbon to display breakout room.
2017-08-29 13:52:54 +01:00
Klaus
ade47254d3
Fix inconsistency inside the ACL, #4310
2017-08-28 16:48:46 -03:00
