Commit Graph

17856 Commits

Author SHA1 Message Date
Anton Georgiev
35ed73c9ae Merge pull request #4442 from bigbluebutton/revert-4371-presentation-uploader-2x
Revert "[HTML5 2.0] Presentation Manager"
2017-09-29 11:38:20 -04:00
Anton Georgiev
dbd00f3445 Revert "[HTML5 2.0] Presentation Manager" 2017-09-29 11:35:05 -04:00
Anton Georgiev
76ff1b2552 Merge pull request #4371 from oswaldoacauan/presentation-uploader-2x
[HTML5 2.0] Presentation Manager
2017-09-22 13:27:54 -04:00
Oswaldo Acauan
c0307e36a6 Presentation Uploader to 2.0 2017-09-07 15:18:14 -03:00
Oswaldo Acauan
a2268494e6 Move old files to the 2.0 folder 2017-08-31 09:56:51 -03:00
Oswaldo Acauan
6070a4ea25 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x 2017-08-31 09:49:59 -03: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
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
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
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
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
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
Richard Alam
e9936f78be Merge pull request #4316 from kepstin/bbb-20-rec-fixes
Bbb 20 rec fixes
2017-08-28 10:59:53 -04:00
Richard Alam
7f0b72856d Merge branch 'riadvice-2x-client-theme' into bbb-2x-mconf 2017-08-28 07:56:23 -07:00
Richard Alam
cd64e38cd6 Merge branch '2x-client-theme' of https://github.com/riadvice/bigbluebutton into riadvice-2x-client-theme 2017-08-28 07:53:20 -07:00
Ghazi Triki
c7377d2c81 Increase icon thickness for main buttons in the top toolbar. 2017-08-28 10:12:49 +01:00
Ghazi Triki
30f7b302a2 Increse users window height in default layout. 2017-08-28 10:04:22 +01:00
Calvin Walton
2d19cd7b7b Make the fallback slide images transparent, so the logo is visible 2017-08-25 16:05:46 -04:00
Calvin Walton
195b499e06 RnP: Fix square/circle rendering
Different parts of the code were using symbol vs string keys, so
the circle/square code never got applied. Use symbols everywhere for
consistency.
2017-08-25 15:46:03 -04:00
Ghazi Triki
4da0052edd Updated shared notes icons. 2017-08-25 20:19:18 +01:00
Pedro Beschorner Marin
eff0c66dc8 Added users typing notification in shared notes 2017-08-25 18:54:38 +00:00
Calvin Walton
a3a530553a RnP: Force re-encoding text from textfiles into UTF-8
Some old recordings might have invalid or legacy encoding stuff
in the text files. To allow processing to continue, just re-encode int
UTF-8 with the invalid option set to replace, to remove the invalid
characters.
2017-08-25 14:02:09 -04:00
Pedro Beschorner Marin
75d4cbebf7 Changing additional notes visibility to match the main one 2017-08-25 17:09:25 +00:00
Calvin Walton
dba121e6f4 Merge pull request #3998 from kepstin/caption-fixes
Update caption track generation based on feedback
2017-08-25 12:04:59 -04:00
Richard Alam
4481fa11bd Merge pull request #4314 from kepstin/bbb-20-rec-fixes
RnP: Some shapes in BBB 2.0 now have sharp corners
2017-08-25 12:03:51 -04:00
Calvin Walton
0d91b9444e RnP: Some shapes in BBB 2.0 now have sharp corners 2017-08-25 11:39:00 -04:00
Ghazi Triki
6211af3b83 Update chrome and firefox webcam and microhpone permissions helper. 2017-08-25 15:49:47 +01:00
Richard Alam
8c6bd6698b Merge pull request #4311 from ritzalam/fix-exception
- fix exception
2017-08-24 15:49:52 -04:00