Commit Graph

38208 Commits

Author SHA1 Message Date
André Castro
389f7b0fe3
removing unnecessary code 2023-06-23 14:46:16 -03:00
André Castro
ef384eae15
Removal of unnecessary imports 2023-06-23 14:42:45 -03:00
André Castro
a09953039e
Update container.jsx 2023-06-23 14:40:42 -03:00
André Castro
c72d3e5fe6
Update bigbluebutton-html5/imports/ui/services/features/index.js
Co-authored-by: Gustavo Trott <gustavo@trott.com.br>
2023-06-23 11:01:51 -03:00
André Castro
d515fd06c7
Merge pull request #7 from ramonlsouza/pr-18197x
rename param + remove unused code
2023-06-22 15:41:10 -03:00
Ramón Souza
af670883c1 remove unused code 2023-06-22 15:35:40 -03:00
Ramón Souza
ae1e6079e1 rename includeMods -> sendInviteToModerators 2023-06-22 13:55:23 -03:00
André Castro
c83b2d518f
Merge pull request #6 from ramonlsouza/pr-18197x
back-end part
2023-06-22 10:42:27 -03:00
Ramón Souza
96a2484876 additional client-side changes 2023-06-21 16:49:38 -03:00
Ramón Souza
56d16f0330 back-end part 2023-06-21 16:47:28 -03:00
Scroody
36bc004425 Additional changes 2023-06-21 11:53:11 -03:00
Scroody
61fef1ece4 Allow dynamic control on mod invitation for breakouts 2023-06-21 11:06:41 -03:00
Anton Georgiev
7c6546784f
Merge pull request #18196 from bigbluebutton/antobinary-patch-2
build: fix mismatched quote
2023-06-21 09:14:58 -04:00
Anton Georgiev
ff086191ae
build: fix mismatched quote 2023-06-21 09:14:32 -04:00
Anton Georgiev
882bb3a4bc
Merge pull request #18195 from bigbluebutton/antobinary-patch-1
build: resetting mcs-address from localhost to 127.0.0.1
2023-06-21 09:06:29 -04:00
Anton Georgiev
3b5062ed16
build: resetting mcs-address from localhost to 127.0.01 2023-06-21 08:58:23 -04:00
Anton Georgiev
799d92a9e6
Merge pull request #18185 from ramonlsouza/18126
refactor: Sort Grid Mode items alphabetically
2023-06-19 16:25:34 -04:00
Anton Georgiev
bc40d4e191
Merge pull request #18186 from ramonlsouza/fix-locked-annotation
fix: locked label in userlist
2023-06-19 16:24:25 -04:00
Ramón Souza
3bac90a40c fix lint errors 2023-06-19 15:39:04 -03:00
Anton Georgiev
6fe704f444
Merge pull request #18174 from GuiLeme/issue-18021-back-end
feat: [issue-18021-back-end] - Back-end portion of disabled camera as content
2023-06-19 10:28:03 -04:00
Ramón Souza
e9aa7a5184 fix locked label annotation in userlist 2023-06-19 11:17:07 -03:00
Ramón Souza
9d3242037f sort grid mode items 2023-06-19 10:03:25 -03:00
GuiLeme
0c5f8aa1f0 [issue-18021-back-end] - Changes in review and fix to support screenshare disabled and cameraAsContent enabled 2023-06-16 17:48:52 -03:00
Anton Georgiev
22419c40b8
Merge pull request #18169 from antonbsa/modal-prop-and-depend-updt
test: Fix data-test prop in modals and update dependencies
2023-06-15 20:57:38 -04:00
Anton Georgiev
62248f0244
Merge pull request #18124 from gustavotrott/fix-ldashboard-emoji
fix (Learning Dashboard): Emoji not working on Learning Dashboard
2023-06-15 16:20:40 -04:00
Anton Georgiev
692be43eeb
Merge pull request #18173 from ramonlsouza/fix-audio-position
fix: audio button position changes when modal is open
2023-06-15 14:25:21 -04:00
Anton Georgiev
1e18f80057
Merge pull request #18175 from bigbluebutton/antobinary-patch-1
build: Adapt bbb-web for upgrades from java11 env
2023-06-15 14:24:53 -04:00
Anton Georgiev
a99d028ce9
build: Adapt bbb-web for upgrades from java11 env 2023-06-15 14:20:36 -04:00
GuiLeme
48ebf3150d [issue-18021-back-end] - Back-end portion of disabled camera as content 2023-06-15 10:24:28 -03:00
Ramón Souza
56d1fe46fb fix audio button position when modal is open 2023-06-15 09:49:05 -03:00
Anton Georgiev
cdfb5b2296
Merge pull request #18172 from antobinary/java-17-upgrade
docs: fix java docs for java <17
2023-06-15 08:05:50 -04:00
Anton Georgiev
6c9d2dd23c
chore: Bump BBB version to 2.7.0-alpha.2 2023-06-15 08:03:15 -04:00
Anton Georgiev
55bb56322b docs: fix java docs for java <17 2023-06-15 08:01:48 -04:00
Anton Georgiev
3610ca53e6
Merge pull request #18154 from paultrudel/java-17-upgrade
build: Java 17 support
2023-06-15 07:48:26 -04:00
Anton Georgiev
e8ea4de784
Update .github/workflows/automated-tests.yml 2023-06-15 07:24:04 -04:00
Anton B
182edfc111 test: remove and change notification checks 2023-06-14 22:38:15 -03:00
Anton B
02a6237337 test: increase expected dropdown list items for actions button 2023-06-14 22:37:14 -03:00
Anton B
9391ac2009 test: fix audio modal data-test props and audio tests related 2023-06-14 22:36:18 -03:00
Anton Georgiev
e6dbbeed80 bbb-web to depend on java17 2023-06-14 20:25:37 -04:00
Anton Georgiev
1b04b17f6c bbb-web to depend on java17 2023-06-14 20:25:10 -04:00
Anton Georgiev
91ea0b7c74 build: alternative way to set java17 2023-06-14 16:42:24 -04:00
Anton Georgiev
63bbd234d9
Merge pull request #18147 from wilkis3/patch-1
docs: Fix typo at api.md
2023-06-14 15:05:39 -04:00
Anton Georgiev
62436808f5 temp: force ci rerun with bbb-install java17 2023-06-14 14:37:59 -04:00
Anton Georgiev
b3b04240bc
Merge pull request #18166 from antobinary/june14merge
chore: Merge BBB 2.6 into 2.7
2023-06-14 13:50:12 -04:00
Anton B
8c28449d3c test: update test dependencies 2023-06-14 14:01:17 -03:00
Anton Georgiev
ae55f9e858 Merge branch 'java-17-upgrade' of github.com:paultrudel/bigbluebutton into java-17-upgrade 2023-06-14 10:55:28 -04:00
Anton Georgiev
98ce6b781e build: specify java 17 on bbb-web install 2023-06-14 10:55:00 -04:00
Anton Georgiev
474a6996e0 docs: do not carry over some 2.6 docs on whats new 2023-06-14 10:12:52 -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
Ramón Souza
3e63cc0f89
Merge pull request #18157 from Scroody/I-18021
Client: Camera as content as content added to disabled features
2023-06-14 09:01:39 -03:00