Commit Graph

17867 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
74de057a1d Fixed visibility of the create a new note option in all shared notes windows 2017-09-01 17:49:51 +00:00
Pedro Beschorner Marin
438bcdbf24 Removed colour picker from shared notes 2017-09-01 17:47:46 +00:00
Richard Alam
0327c538e1 Merge pull request #4352 from pedrobmarin/shared-notes-ui-changes
Shared notes ui changes
2017-09-01 10:37:41 -04:00
Anton Georgiev
d60e06e28f Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase
[HTML5] changed string id to camelCase
2017-09-01 10:05:50 -04:00
Chad Pilkey
f8481e9557 Merge pull request #4344 from antobinary/fullscreen
Switch from flash based fullscreen to html5 api based
2017-08-31 17:02:13 -04:00
Anton Georgiev
25fa5f5445 expose fullscreen state to flash to control button icon 2017-08-31 16:44:47 -04:00
Pedro Beschorner Marin
a6d6b83712 Consolidated add new note and clear into single gear menu 2017-08-31 19:36:45 +00:00
Fred Dixon
457bf87a7e Merge pull request #4350 from capilkey/2.0-fix-fittopage
Fix for switching back to fit-to-page
2017-08-31 14:56:32 -04:00
Chad Pilkey
01a52f46b6 reset values when switching to fit-to-page 2017-08-31 14:49:58 -04:00
Pedro Beschorner Marin
9def1a40c4 Removed justify from shared note text formatting. Still there is a problem in the icon. It's replaced with the center format 2017-08-31 17:31:18 +00:00
Pedro Beschorner Marin
bef2483783 Replaced shared note text font colors to five shades of grey 2017-08-31 17:30:08 +00:00
Pedro Beschorner Marin
d0a597059c Included shared note characters remaining tooltip 2017-08-31 17:28:54 +00:00
Pedro Beschorner Marin
0dc3cef38e Changed shared note message length warning 2017-08-31 17:28:11 +00:00
Pedro Beschorner Marin
4847812996 Removed horizontalBar from shared note window 2017-08-31 17:26:26 +00:00
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
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
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
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
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
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