Anton Georgiev
|
3ce6dbf997
|
Merge pull request #14665 from JoVictorNunes/breakout-update
feat: move users among breakouts
|
2022-04-14 08:22:49 -04:00 |
|
Anton Georgiev
|
ec4bb8822c
|
Merge pull request #14824 from antobinary/merge-25-dev
chore: Merge BBB 2.5 into develop
|
2022-04-13 17:00:21 -04:00 |
|
Anton Georgiev
|
aaef76cd2e
|
Merge branch 'v2.5.x-release' of github.com:bigbluebutton/bigbluebutton into merge-25-dev
|
2022-04-13 20:58:02 +00:00 |
|
Anton Georgiev
|
6d48e66048
|
Merge pull request #14774 from antonbsa/fix-test-warnings
test: Fix warnings
|
2022-04-13 15:14:45 -04:00 |
|
Anton Georgiev
|
dd97ed5b5b
|
Merge pull request #14628 from GuiLeme/issue-14304
Implementation to read files from `/etc/bigbluebutton/` and override default configs.
|
2022-04-13 14:20:51 -04:00 |
|
João Victor Nunes
|
f32208ec59
|
Merge pull request #2 from gustavotrott/breakout-updated
fix: Dont remove invite of free rooms
|
2022-04-13 14:26:55 -03:00 |
|
Gustavo Trott
|
725bed6797
|
Small fixes
|
2022-04-13 14:22:02 -03:00 |
|
Anton Georgiev
|
8e81225937
|
Merge pull request #14822 from antobinary/npm
chore: Drop .dockerignore and docker-entrypoint.sh files #14814
|
2022-04-13 13:20:41 -04:00 |
|
Anton Georgiev
|
c808f1f1dd
|
chore: Drop .dockerignore and docker-entrypoint.sh files #14814
|
2022-04-13 17:17:08 +00:00 |
|
Anton Georgiev
|
7f986660e4
|
Merge pull request #14821 from gustavo-em/mobile_translations2
refactor: Edit mobile translations (WIP)
|
2022-04-13 12:54:10 -04:00 |
|
gustavo-em
|
2f6fe788a1
|
ajusts
|
2022-04-13 13:44:23 -03:00 |
|
gustavo-em
|
f40fcc1696
|
translations to mobile app
|
2022-04-13 13:13:38 -03:00 |
|
Anton Georgiev
|
ec6f5691c9
|
Merge pull request #14799 from Tainan404/fix-notes-showing-text
fix(notes): Fix notes display order
|
2022-04-13 08:50:55 -04:00 |
|
Anton Georgiev
|
04f5d30e98
|
Merge pull request #14815 from antobinary/drop-obsolete-dockerfiles
chore: update package-lock.json for lockfileVersion: 2
|
2022-04-12 16:45:36 -04:00 |
|
Anton Georgiev
|
05baa9b19c
|
chore: update package-lock.json for lockfileVersion: 2
|
2022-04-12 20:41:38 +00:00 |
|
Anton Georgiev
|
4a7c2aae16
|
Merge pull request #14814 from antobinary/drop-obsolete-dockerfiles
chore: Drop obsolete Dockerfiles
|
2022-04-12 16:37:00 -04:00 |
|
Anton Georgiev
|
13bed65baf
|
chore: drop obsolete Dockerfile from BBB
|
2022-04-12 20:34:28 +00:00 |
|
Anton Georgiev
|
c38ce37459
|
chore: drop labs/docker
|
2022-04-12 20:33:13 +00:00 |
|
Anton Georgiev
|
aa333ebf25
|
Merge pull request #14813 from antobinary/servlet
fix: Adjust property path for grails session.cookie.secure
|
2022-04-12 16:31:59 -04:00 |
|
Anton Georgiev
|
8a75e5cc7a
|
fix: Adjust property path for grails session.cookie.secure
|
2022-04-12 20:28:07 +00:00 |
|
Anton Georgiev
|
dd8ac845d2
|
Merge pull request #14797 from JoVictorNunes/chat-time-alignment
fix: chat message time alignment
|
2022-04-12 16:02:28 -04:00 |
|
Anton Georgiev
|
37de853bf5
|
Merge pull request #14812 from ramonlsouza/locales25-apr12
chore: Pulled the latest 2.5 HTML5 locales from Transifex
|
2022-04-12 16:02:07 -04:00 |
|
Localization Server
|
763d8edd55
|
chore: Pulled the latest 2.4 HTML5 locales from Transifex
|
2022-04-12 16:43:08 -03:00 |
|
Joao Victor
|
911edbf9f5
|
Rebase to 2.5
|
2022-04-12 16:26:13 -03:00 |
|
Anton Georgiev
|
edeb6c1c50
|
Merge pull request #14809 from ramonlsouza/24-25-merge-apr12
chore: Merge 2.4 into 2.5
|
2022-04-12 15:22:04 -04:00 |
|
Ramon Souza
|
7a57344177
|
Merge remote-tracking branch 'upstream/v2.4.x-release' into 24-25-merge-apr12
|
2022-04-12 14:46:13 -03:00 |
|
João Victor Nunes
|
9ec06177c1
|
Merge pull request #1 from gustavotrott/breakout-updated
Move user among brekout rooms - Backend part
|
2022-04-12 14:25:45 -03:00 |
|
Anton Georgiev
|
5f91a3ab86
|
Merge pull request #14808 from ramonlsouza/issue-14748
Localize keys in shortcut modal
|
2022-04-12 13:18:33 -04:00 |
|
Gustavo Trott
|
ecbfee26db
|
Missing parts
|
2022-04-12 13:56:54 -03:00 |
|
Ramon Souza
|
7735abb16e
|
localize keys in shortcut modal
|
2022-04-12 13:49:10 -03:00 |
|
Anton Georgiev
|
96c2fc9d86
|
Merge pull request #14734 from JoVictorNunes/issue-14721
fix: link sanitizing in welcome message
|
2022-04-12 10:36:59 -04:00 |
|
Anton Georgiev
|
8ab4023eb5
|
Merge pull request #14783 from frankemax/bbb-darkmode-25
feat(theme): add dark mode
|
2022-04-12 10:35:31 -04:00 |
|
Anton Georgiev
|
47eb51fdb7
|
Merge pull request #14802 from GuiLeme/nokogiri-update-1.13.4
chore: [nokogiri-update] - Update nokogiri to version 1.13.4+
|
2022-04-12 10:25:45 -04:00 |
|
Guilherme Leme
|
0319ecf371
|
[nokogiri-update] - Update of nokogiri to version 1.13.4+
|
2022-04-12 11:07:59 -03:00 |
|
Gustavo Trott
|
77a8aba1f5
|
Merge remote-tracking branch 'upstream/develop' into breakout-updated
|
2022-04-12 09:54:25 -03:00 |
|
Gustavo Trott
|
102eee3ba5
|
Backend portion of breakout Manage Users
|
2022-04-12 09:50:19 -03:00 |
|
Tainan Felipe
|
292d39c773
|
Fix notes showing text in wrong order
|
2022-04-11 17:43:21 -03:00 |
|
Anton Georgiev
|
bc823b84e0
|
Merge pull request #14779 from GuiLeme/issue-14749
fix(presentation) - Refactored `temporaryPresId` format to accept german umlauts
|
2022-04-11 16:10:07 -04:00 |
|
Anton Georgiev
|
5a4f63a7e2
|
Merge pull request #14798 from antobinary/fred-conf
fix(conf): setip should not wipe out existing properties
|
2022-04-11 15:17:34 -04:00 |
|
Anton Georgiev
|
6f554e9776
|
fix(conf): setip should not wipe out existing properties
|
2022-04-11 19:07:11 +00:00 |
|
Anton Georgiev
|
547ca21622
|
Merge pull request #14795 from antobinary/fred-conf
fix(bbb-conf): Update securitySalt (shared secret) in bbb-web.properties
|
2022-04-11 14:45:55 -04:00 |
|
Anton Georgiev
|
243f8ec70a
|
Merge pull request #14782 from pedrobmarin/c-p-v3-4-1
chore(playback): v3.4.1
|
2022-04-11 13:48:59 -04:00 |
|
Anton Georgiev
|
ee4af7730e
|
Merge pull request #14780 from ramonlsouza/i-14689
fix: Screenshare is not displayed to new users, if autoSwapLayout=true
|
2022-04-11 13:48:20 -04:00 |
|
Anton Georgiev
|
f761391697
|
Merge pull request #14796 from ramonlsouza/issue-14790
fix: Incorrect position of the microphone icon in the webcam box in RTL - BBB v2.4.5
|
2022-04-11 13:46:18 -04:00 |
|
Ramon Souza
|
1c3d29daa1
|
adjust video list icon in rtl
|
2022-04-11 14:40:37 -03:00 |
|
Anton Georgiev
|
1d495968dc
|
Merge pull request #14793 from ramonlsouza/issue-14762
Enable sidebar resize in media area of 'focus on' layouts
|
2022-04-11 13:16:52 -04:00 |
|
Ramon Souza
|
283c21e4ab
|
enable sidebar resize in media on 'focus on' layouts
|
2022-04-11 13:48:46 -03:00 |
|
Anton Georgiev
|
ec1893ba10
|
chore: Fix typo in bigbluebutton-config/bin/bbb-conf
|
2022-04-11 15:40:42 +00:00 |
|
Anton Georgiev
|
0275b8710b
|
Merge pull request #14787 from Arthurk12/camera-cancellable-button-2.5
refactor(webcam): cancellable button
|
2022-04-11 10:17:50 -04:00 |
|
Fred Dixon
|
c73943471f
|
Set securitySalt (shared secret) in bbb-web.properties
|
2022-04-11 13:54:51 +00:00 |
|