BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,259 Commits 13 Branches 260 Tags 1.1 GiB
be48f7349f
Commit Graph

840 Commits

Author SHA1 Message Date
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
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
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
Scroody
aba7f66b2c Last details 2023-06-16 13:40:09 -03:00
Ramón Souza
03c3eae821 remove unused code 2023-06-14 16:35:44 -03: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
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
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
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
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
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