Commit Graph

764 Commits

Author SHA1 Message Date
Anton Georgiev
8cc8474655 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 08-26-merge 2020-08-27 19:09:07 +00:00
Anton Georgiev
b82eca1422 Pulled HTML5 locales Aug 21, 2020 2020-08-21 15:27:46 -04:00
Anton Georgiev
4fb301c48b
Merge pull request #10293 from prlanzarin/upstream-2.2-vpeg-pagination
video-provider: first tackle at video pagination
2020-08-20 15:24:57 -04:00
Pedro Beschorner Marin
69c408e16a Disable notes and captions footer
Something related on not being able to provide links
2020-08-19 20:27:41 -03:00
Anton Georgiev
3099b8fb45
Merge pull request #10265 from pedrobmarin/notes-cc-header-style
Fix shared notes and closed captions header button style
2020-08-19 15:58:51 -04:00
prlanzarin
28e826118a video-provider: first version of video pagination 2020-08-18 17:00:47 +00:00
KDSBrowne
fbeaf87dbd localize the dropdown values for webcam quality 2020-08-17 16:19:45 +00:00
Pedro Beschorner Marin
26fcb97dd9 Fix shared notes and closed captions header button style
Also adds a little more visibility and well-deserved credit to Etherpad's project
2020-08-14 11:32:52 -03:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
Anton Georgiev
d3ab3f34b7 Pulled HTML5 locales Aug 10, 2020 2020-08-10 16:31:40 -04:00
KDSBrowne
bb22ab84fc add download link to current presentation toast 2020-08-10 12:51:06 +00:00
prlanzarin
1b75bb30e6 video-provider: remove unused app.video.stats locales 2020-08-07 14:38:51 +00:00
Pedro Beschorner Marin
4d5d0ad8b4 Multiple webcams stop all button 2020-08-05 14:23:34 +00:00
prlanzarin
dac3259c48 Merge remote-tracking branch 'pedrobmarin/bbb-multiple-webcams' into upstream-2.2-vpeg-base 2020-08-05 14:20:58 +00:00
KDSBrowne
bd5b010695 add message 2020-07-31 14:37:13 +00:00
Anton Georgiev
45c2368a3c Pulled HTML5 locales on July 29, 2020 2020-07-29 11:54:21 -04:00
Anton Georgiev
7744817130
Merge branch 'develop' into issue-9647 2020-07-28 10:48:13 -04:00
Anton Georgiev
6a738a43d5
Merge pull request #8464 from KDSBrowne/add-upload-toast
Non-blocking presentation upload
2020-07-28 10:40:41 -04:00
Anton Georgiev
b87b619fdd
Merge pull request #9964 from KDSBrowne/dev2.3-raise-hand-toast
Improve toast notification for raised hands
2020-07-28 10:29:21 -04:00
Anton Georgiev
394ccce435
Merge pull request #8758 from pedrobmarin/multiple-cam-stop-all-button
Multiple webcams stop all button
2020-07-22 09:57:23 -04:00
KDSBrowne
df1486fabf Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-07-16 12:12:42 +00:00
KDSBrowne
8a9430bf26 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into issue-9647 2020-07-16 12:05:44 +00:00
KDSBrowne
600c41142a Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into dev2.3-raise-hand-toast 2020-07-16 11:59:38 +00:00
Anton Georgiev
0adaff23b4 Pulled HTML5 locales July 10, 2020 2020-07-10 11:19:42 -04:00
Pedro Beschorner Marin
526f79e8f2 Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop 2020-06-30 18:15:18 -03:00
KDSBrowne
d62ca65ded add formatted message / custom style for raised hand toast 2020-06-30 18:53:30 +00:00
KDSBrowne
c70a58c1ff add status notification component 2020-06-30 02:43:20 +00:00
KDSBrowne
0cb1dc0a65 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-06-25 19:20:18 +00:00
KDSBrowne
0877604d00 improve notification position / prevent state update on unmounted component 2020-06-23 13:38:59 +00:00
KDSBrowne
b3b9a45b35 add config options for muted alert 2020-06-22 16:02:24 +00:00
Fred Dixon
86c6451bcc
Make end meeting more clear 2020-06-22 10:54:23 -04:00
Anton Georgiev
e7d3487b5d
Merge pull request #9878 from lfzawacki/ending-time-alerts
Make meeting/breakout ending time alerts configurable
2020-06-19 16:25:50 -04:00
Anton Georgiev
af21f695ee
Update bigbluebutton-html5/private/locales/en.json 2020-06-19 16:25:24 -04:00
Anton Georgiev
c23611ac01
Update bigbluebutton-html5/private/locales/en.json 2020-06-19 16:25:16 -04:00
Anton Georgiev
0a0af871fc Pulled HTML5 locales on June 18, 2020 2020-06-18 20:39:25 +00:00
Lucas Zawacki
3f16d894c3 Configurable ending time and alert values 2020-06-18 15:11:33 -03:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
KDSBrowne
061e522493 add notification when speaking while muted 2020-06-16 13:41:51 +00:00
Anton Georgiev
8d27ec90bb
Merge pull request #9845 from lkiesow/external-video-sharing-note
Update Note About Sharing External Video
2020-06-16 08:46:12 -04:00
Lars Kiesow
91e629b453
Update Note About Sharing External Video
This patch updates the note about which external videos can be shared
by looking at what react-player supports. Most notably, external video
URLs are added.

This also fixes the misspelled name of Dailymotion.
2020-06-16 00:59:16 +02:00
Anton Georgiev
123f016610 Pulled HTML5 locales on June 5, 2020 2020-06-05 17:02:36 +00:00
Anton Georgiev
7b883fbe49 Pulled HTML5 locales on May 29, 2020 2020-05-29 13:49:32 -04:00
Anton Georgiev
ac6fd2824c
Merge branch 'develop' into 2.3-audio-stats 2020-05-26 12:36:15 -04:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
KDSBrowne
3f79eefb18 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into add-upload-toast 2020-05-25 13:10:50 +00:00
KDSBrowne
03d0931c1c add style / message updates 2020-05-22 16:39:54 +00:00
Anton Georgiev
ede8d82384
Merge pull request #9641 from antobinary/locales-may-22
Pulled HTML5 locales May 22, 2020
2020-05-22 11:55:19 -04:00
Anton Georgiev
c9faef96c9 Pulled HTML5 locales May 22, 2020 2020-05-22 11:48:11 -04:00
Anton Georgiev
1874cf8392 Add visuals for banning vs ejecting user 2020-05-21 16:40:08 -04:00
KDSBrowne
f327f31e71 update not supported string to be browser agnostic (screen share) 2020-05-15 13:10:52 +00:00