Commit Graph

932 Commits

Author SHA1 Message Date
Anton Georgiev
6b76d9aa66 Merge remote-tracking branch 'bbb/v2.6.x-release' into merge-july-21 2023-07-21 16:24:45 -04:00
Gustavo Trott
185e48d36c Merge remote-tracking branch 'upstream/v2.7.x-release' into develop 2023-07-21 17:17:52 -03:00
Gustavo Trott
762ae78814 Implements func to Clear all users reaction 2023-07-21 11:10:10 -03:00
Scroody
0a1428b862 Time features label change 2023-07-19 15:00:48 -03:00
Anton Georgiev
a92d668bd4
Update bigbluebutton-html5/public/locales/en.json 2023-07-18 15:54:46 -04:00
Ramón Souza
bf6f96fc44 renaming interactions -> reactions 2023-07-18 08:54:36 -03:00
Gustavo Trott
cf896e8a66 Merge branch 'v2.7.x-release' into develop 2023-07-17 11:20:49 -03:00
transifex-integration[bot]
a9d75b5164
Translate en.json in fa_IR (#18326)
100% translated source file: 'en.json'
on 'fa_IR'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-07-17 09:56:16 -04:00
Gustavo Trott
21f1ed9f27 Merge 2.7 into Develop 2023-07-14 17:42:13 -03:00
Gustavo Trott
a5c78c7161 Revert en.json indent 2023-07-14 17:25:26 -03:00
Dennis Benz
dd15012761 Html5: Add config to hide names in typing indicator 2023-07-14 15:35:18 +02:00
Anton Georgiev
45215ed88f
Merge branch 'v2.7.x-release' into bbb-wake-locke 2023-07-14 07:50:04 -04:00
Anton Georgiev
cd9f93be44 Merge remote-tracking branch 'bbb/v2.6.x-release' into merge-july12 2023-07-12 15:59:46 -04:00
transifex-integration[bot]
f191d462ee
Updates for bigbluebutton-html5/public/locales/en.json in zh_TW (#18269)
* Translate en.json in zh_TW

100% translated source file: 'en.json'
on 'zh_TW'.
---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-07-11 06:06:17 -04:00
transifex-integration[bot]
a6c2de155e
Updates for bigbluebutton-html5/public/locales/en.json in ko_KR (#18264)
* Translate en.json in ko_KR

100% translated source file: 'en.json'
on 'ko_KR'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-07-11 06:04:38 -04:00
Ramón Souza
67cd275dc1
Merge pull request #18293 from ramonlsouza/issue-18214
fix: change presentation download labels
2023-07-10 16:53:34 -03:00
Ramón Souza
af593e41ee
Merge pull request #18289 from ramonlsouza/issue-15863
Layout Settings Enhancements
2023-07-10 16:53:16 -03:00
Ramón Souza
6b44650c5d change presentation download labels 2023-07-10 09:44:34 -03:00
Tainan Felipe
f2e0fd43e9
Refactor: Make all chat area use graphql (#18122)
* Refactor: Make all chat area use graphql

* Fix: large space between welcome msg and chat list

* Fix: missing file

* add pending status and fix system messages

* Add: mark messages as seen in chat

* Refactor: Move char opening logic to inside of chat panel

* Refactor message and mark as seen

* Add Recharts to package.json and fix miss data

* Implements clear-chat function on graphql

* Make system message sticky

* Add clear message support and fix user is typing

* FIx chat unread and scroll not following the tail

* Change: make unread messages be marked by message and fix throttle

* Don't show restore welcome message when the welcome message isn't set

* Fix: scroll not following the tail properly

* Fix: previous page last sender not working

* Fix: scroll loading all messages

* Fix messaga not marked as read

---------

Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2023-07-07 17:46:36 -03:00
Ramón Souza
870d773fdf remove unused code 2023-07-07 13:22:34 -03:00
Ramón Souza
804d7e859c change labels, update push layout experience 2023-07-07 09:53:58 -03:00
Scroody
50511ff3d3 Requested changes made 2023-07-05 13:58:40 -03:00
Scroody
d145a482cb Enhancement: Breakout modal UI improved 2023-06-30 10:53:58 -03:00
Gustavo Trott
a7cd1c5232 Merge 2.7 into Develop 2023-06-29 16:27:10 -03:00
Gustavo Trott
c8867fadb5
Merge pull request #18197 from Scroody/I-18127
Allow dynamic control on moderators invitation for breakouts
2023-06-29 13:39:26 -03:00
Gustavo Trott
58e862e6a7 Make names more clear for 'invite assigned moderators to breakoutRooms' 2023-06-29 12:04:14 -03:00
Ramón Souza
be48f7349f
Merge pull request #18168 from ramonlsouza/issue-18134
refactor: Restyle Reactions bar to be a bar
2023-06-28 17:27:45 -03:00
Gustavo Trott
5681e88c60 Merge 2.7 into Develop 2023-06-26 17:21:01 -03:00
Ramón Souza
574b187645
Merge pull request #18130 from Scroody/I-18101
Client change: List the option to download presentation with annotations even if there are no annotations
2023-06-26 16:27:58 -03:00
transifex-integration[bot]
1b6ae23bc7
Translate en.json in uk_UA (#18213)
100% translated source file: 'en.json'
on 'uk_UA'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-26 05:51:06 -04:00
transifex-integration[bot]
f63023053b
Translate en.json in gl (#18210)
100% translated source file: 'en.json'
on 'gl'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-26 05:50:30 -04:00
transifex-integration[bot]
588cb5f8fb
Translate en.json in es_ES (#18209)
100% translated source file: 'en.json'
on 'es_ES'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-26 05:50:11 -04:00
transifex-integration[bot]
11c6141d06
Translate en.json in es (#18208)
100% translated source file: 'en.json'
on 'es'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-26 05:49:43 -04:00
Ramón Souza
411f0e01a4 move active/away to userlist 2023-06-23 10:39:40 -03:00
Ramón Souza
d0ed90a6c0 Merge remote-tracking branch 'upstream/v2.7.x-release' into issue-18134 2023-06-23 09:32:55 -03:00
Gustavo Trott
6ba4aad05a
Merge branch 'v2.7.x-release' into user-raiseHand-away-flags 2023-06-22 08:27:20 -03:00
transifex-integration[bot]
7f67d2ac3c
Translate en.json in fr (#18199)
100% translated source file: 'en.json'
on 'fr'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-22 06:27:48 -04:00
Scroody
61fef1ece4 Allow dynamic control on mod invitation for breakouts 2023-06-21 11:06:41 -03:00
transifex-integration[bot]
2e1cd4a83e
Translate en.json in eu (#18179)
100% translated source file: 'en.json'
on 'eu'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-19 16:40:07 -04:00
Scroody
aba7f66b2c Last details 2023-06-16 13:40:09 -03:00
transifex-integration[bot]
0b1a7fbd82
Translate en.json in fa_IR (#18171)
100% translated source file: 'en.json'
on 'fa_IR'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-15 07:03:11 -04:00
Ramón Souza
03c3eae821 remove unused code 2023-06-14 16:35:44 -03:00
transifex-integration[bot]
7bf58dcf5a
Updates for bigbluebutton-html5/public/locales/en.json in tr (#18138)
* Translate en.json in tr

100% translated source file: 'en.json'
on 'tr'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-14 14:46:05 -04:00
Anton Georgiev
a962a44c74 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june14merge 2023-06-14 10:07:54 -04:00
Arthurk12
f880e56a1e feat(wake-lock): prototype
Adds wake lock feature, which is available only for mobile users using
browser with support to the given API.
When an user using a supported device joins the meeting, a toast is
displayed offering to activate the feature.
Adds a toggle under settings menu to activate/deactivate it.
2023-06-13 16:22:02 -03:00
transifex-integration[bot]
9301f33b77
Translate en.json in ru (#18152)
100% translated source file: 'en.json'
on 'ru'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-12 14:21:25 -04:00
Gustavo Trott
22a2c8ce7c Merge remote-tracking branch 'upstream/v2.7.x-release' into graphql-timer 2023-06-12 10:06:22 -03:00
transifex-integration[bot]
af90b88f07
Translate en.json in el_GR (#18146)
100% translated source file: 'en.json'
on 'el_GR'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-12 08:46:47 -04:00
transifex-integration[bot]
193a03f046
Updates for bigbluebutton-html5/public/locales/en.json in de (#18132)
* Translate en.json in de

100% translated source file: 'en.json'
on 'de'.

* Translate en.json in de

100% translated source file: 'en.json'
on 'de'.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-08 15:59:49 -04:00
Anton Georgiev
c8b0437df3
Merge pull request #18133 from GuiLeme/port-timer-with-events-suggestions
feat(timer): Port timer (Mconf) with events suggestions
2023-06-08 15:56:10 -04:00
GuiLeme
2cf46e4d05 [port-timer-with-events-suggestions] - made review suggestions 2023-06-08 16:37:32 -03:00
Anton Georgiev
49d48c0945
Merge pull request #18097 from ramonlsouza/16120
feat: Add Lock Setting For Viewer Annotations
2023-06-08 11:12:22 -04:00
transifex-integration[bot]
e14fb4b153
Translate en.json in et (#18116)
100% translated source file: 'en.json'
on 'et'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-08 10:07:48 -04:00
transifex-integration[bot]
67ec35c83f
Translate en.json in ja (#18117)
100% translated source file: 'en.json'
on 'ja'.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-08 10:07:30 -04:00
Gustavo Trott
ca9b873c4a Resolve conflicts 2023-06-08 10:03:35 -03:00
Gustavo Trott
15e413a3c0 Handle notification of away and raiseHand differently 2023-06-07 22:57:49 -03:00
Anton Georgiev
1146ab9be9 Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-26-27-june-6 2023-06-06 09:28:53 -04:00
Ramón Souza
22b02ead28 Merge remote-tracking branch 'upstream/v2.7.x-release' into 16120 2023-06-06 08:45:29 -03:00
Daniel Petri Rocha
d2762657ee
Merge branch 'v2.6.x-release' into mime-fixes 2023-06-06 12:12:13 +02:00
Anton Georgiev
70b3220f41 Merge branch 'v2.7.x-release' of github.com:bigbluebutton/bigbluebutton into june5-27 2023-06-05 17:09:35 -04:00
transifex-integration[bot]
3a12532572
Updates for bigbluebutton-html5/public/locales/en.json in fa_IR (#18062)
* Translate en.json in fa_IR

100% translated source file: 'en.json'
on 'fa_IR'.


---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-06-05 14:25:30 -04:00
Anton Georgiev
748c7a4a0b Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into june227 2023-06-02 09:45:34 -04:00
Gustavo Trott
2f68313df0 Merge remote-tracking branch 'upstream/v2.7.x-release' into develop 2023-05-30 08:43:14 -03:00
Anton Georgiev
20d124722a
Merge pull request #17962 from ramonlsouza/change-self-cam-label
refactor: Change enable/disable self cam label based on state
2023-05-29 09:49:52 -04:00
transifex-integration[bot]
905312e184
Translations for bigbluebutton-html5/public/locales/en.json in fa_IR (#18027)
* Translate en.json in fa_IR

100% translated source file: 'en.json'
on the 'fa_IR' language.
Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-29 09:48:40 -04:00
danielpetri1
0711e69ff9 Typo - Office as proper noun 2023-05-29 13:26:44 +00:00
transifex-integration[bot]
4241dc9447
Translate en.json in ru (#18023)
100% translated source file: 'en.json'
on the 'ru' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-26 15:15:17 -04:00
Ramón Souza
6ef4b408f6 self cam -> self-view 2023-05-26 13:21:56 -03:00
Gustavo Trott
51bdcededc Merge 2.7 into develop 2023-05-26 10:50:39 -03:00
Paulo Lanzarin
5447666c15
Merge branch 'v2.7.x-release' into port-timer 2023-05-26 10:33:38 -03:00
Anton Georgiev
4948731fe7
Merge pull request #17764 from lfzawacki/reactions-port
feat: Port Mconf Reactions into BBB 2.7
2023-05-26 08:05:02 -04:00
Anton Georgiev
1a1f442d5a
Merge pull request #17746 from Carloshsc/port-present-webcam-27
feat(camera as content): present webcam
2023-05-26 08:01:40 -04:00
prlanzarin
7c77fc7433 Merge remote-tracking branch 'origin/v2.7.x-release' into reactions-port 2023-05-25 19:54:01 -03:00
Anton Georgiev
25af259d2d Merge branch 'v2.6.x-release' of github.com:bigbluebutton/bigbluebutton into merge-may-24 2023-05-24 17:23:00 -04:00
transifex-integration[bot]
60ea38bfed
Translations for bigbluebutton-html5/public/locales/en.json in fa_IR (#17940)
* Translate en.json in fa_IR
100% translated source file: 'en.json'
on the 'fa_IR' language.

---------

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-24 16:12:52 -04:00
transifex-integration[bot]
376139a30d
Translate en.json in es (#17965)
100% translated source file: 'en.json'
on the 'es' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-23 07:41:35 -04:00
transifex-integration[bot]
08c5f5b6b6
Translate en.json in es_ES (#17966)
100% translated source file: 'en.json'
on the 'es_ES' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-23 07:41:12 -04:00
Ramón Souza
810a9895f8 change enable/disable self cam label based on state 2023-05-22 09:06:39 -03:00
Anton Georgiev
1d3bdb5802
Merge pull request #17648 from GuiLeme/issue-17531
feat: Restore old downloading of original presentation
2023-05-18 15:40:01 -04:00
Arthurk12
f5a5a960ba feat(timer): adds more songs
Adds 2 more songs to the timer, which can be switched using the radio
buttons inside timer panel.
Changed the music loop logic to make it gapless.
2023-05-18 15:29:35 -03:00
Arthur B. Grossi
cc61652aa3 feat(timer): ambient music
Adds a music player for ambient sound which can be turned on and off using a
toggle located inside timer panel. When stopwatch is selected, this toggle is
automattically turned off.
2023-05-18 15:29:34 -03:00
Arthurk12
cc2f509c7c Refactored timer design 2023-05-18 15:29:33 -03:00
Pedro Beschorner Marin
5463a4a423 Stopwatch handlers 2023-05-18 15:29:31 -03:00
Arthurk12
953a3d3548 Timer first commit 2023-05-18 15:29:31 -03:00
Ramón Souza
c64cf5ccbd
Merge pull request #17935 from Scroody/I-16114
feat: Disable self-view of webcam
2023-05-17 14:49:40 -03:00
Scroody
0fa1b9b3eb More requested changes made 2023-05-17 13:54:54 -03:00
GuiLeme
1b26302745 [issue-17531] - merge upstream/v2.7.x-release 2023-05-16 15:30:15 -03:00
Scroody
8272b487f3 Testing 2023-05-16 14:39:56 -03:00
transifex-integration[bot]
a4f046a219
Translate en.json in uk_UA (#17922)
100% translated source file: 'en.json'
on the 'uk_UA' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:49:45 -04:00
transifex-integration[bot]
46573b1963
Translate en.json in es_ES (#17921)
100% translated source file: 'en.json'
on the 'es_ES' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:49:31 -04:00
transifex-integration[bot]
37aec5d5ee
Translate en.json in eu (#17911)
100% translated source file: 'en.json'
on the 'eu' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:49:15 -04:00
transifex-integration[bot]
6a26c6a817
Translate en.json in fa_IR (#17912)
100% translated source file: 'en.json'
on the 'fa_IR' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:49:00 -04:00
transifex-integration[bot]
2591cbc5a3
Translate en.json in nl (#17918)
100% translated source file: 'en.json'
on the 'nl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:48:44 -04:00
transifex-integration[bot]
1225104df5
Translate en.json in pt (#17909)
100% translated source file: 'en.json'
on the 'pt' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:48:27 -04:00
transifex-integration[bot]
a28e80655d
Translate en.json in tr (#17920)
100% translated source file: 'en.json'
on the 'tr' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:48:05 -04:00
transifex-integration[bot]
b5f4f972f8
Translate en.json in gl (#17914)
100% translated source file: 'en.json'
on the 'gl' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:47:33 -04:00
transifex-integration[bot]
ef85ab2893
Translate en.json in et (#17910)
100% translated source file: 'en.json'
on the 'et' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:47:18 -04:00
transifex-integration[bot]
1049731140
Translate en.json in es (#17913)
100% translated source file: 'en.json'
on the 'es' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:46:55 -04:00
transifex-integration[bot]
6e09ebc976
Translate en.json in fr (#17916)
100% translated source file: 'en.json'
on the 'fr' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:46:33 -04:00
transifex-integration[bot]
3a6e80f0f6
Translate en.json in ja (#17908)
100% translated source file: 'en.json'
on the 'ja' language.

Co-authored-by: transifex-integration[bot] <43880903+transifex-integration[bot]@users.noreply.github.com>
2023-05-15 14:46:04 -04:00