Commit Graph

38426 Commits

Author SHA1 Message Date
André Castro
e5268887bd
removing duplicates 2023-06-16 12:13:07 -03:00
André Castro
36ccf862a3
Merge pull request #3 from GuiLeme/I-18101-back-end
[I-18101-back-end] - back-end portion
2023-06-16 10:46:45 -03:00
GuiLeme
f36ffbe949 [I-18101-back-end] - back-end portion 2023-06-16 09:24:50 -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 B
38425a0e16 test: update rewrite snapshots script 2023-06-15 17:59:19 -03: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
d8cc9f0e61 fix: missing comma after conflict resolving 2023-06-15 16:01:05 -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
André Castro
5af5151219
Merge branch 'v2.7.x-release' into I-18137 2023-06-15 11:50:02 -03:00
André Castro
34130b06d6
Lint error caused by prettier 2023-06-15 11:41:03 -03:00
André Castro
c1cd4f6c84
Update index.js 2023-06-15 11:24:23 -03:00
GuiLeme
48ebf3150d [issue-18021-back-end] - Back-end portion of disabled camera as content 2023-06-15 10:24:28 -03:00
André Castro
88d8266f7e
Merge pull request #2 from GuiLeme/I-18137-back-end
[I-18137-back-end] - Back-end implementation for disabledTimer
2023-06-15 10:20:43 -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
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
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
GuiLeme
8c5c1728ee [I-18137-back-end] - Back-end implementation for disabledTimer 2023-06-14 17:19:40 -03:00
Scroody
53fcfd9101 Resolving issues 2023-06-14 16:47:57 -03:00
Ramón Souza
03c3eae821 remove unused code 2023-06-14 16:35:44 -03: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
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
62436808f5 temp: force ci rerun with bbb-install java17 2023-06-14 14:37:59 -04:00
Scroody
c5250d1ee5 Lint corrections requested 2023-06-14 15:04:58 -03: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 Georgiev
5a66989212
Merge pull request #18144 from bigbluebutton/build-webhooks
build: recover installation of bbb-webhooks
2023-06-14 13:12:10 -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
Scroody
11169b76ff conflict resolving 2023-06-14 11:32:52 -03:00
Scroody
ce937cb5c5 api.md altered 2023-06-14 11:27:21 -03: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
danielpetri1
84e797e8ee Fix double file separator glitch 2023-06-14 13:48:46 +00:00
Ramón Souza
337688b3a3 add present/away toggle 2023-06-14 10:21:33 -03: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
Ramón Souza
c3cecae951
Update docs/docs/data/create.tsx 2023-06-14 09:00:59 -03:00
Anton Georgiev
d2f17148bd
Merge branch 'v2.7.x-release' into java-17-upgrade 2023-06-14 07:56:32 -04:00
Anton Georgiev
8378fe50a6
Merge pull request #18120 from gabriellpr/disbled-features-exclude
test: Disabled features exclude
2023-06-13 16:34:56 -04:00