Anton Georgiev
71615bd477
Merge pull request #14186 from ramonlsouza/unused-remove
...
refactor: remove unused imports/variables
2022-01-25 08:52:14 -05:00
Anton Georgiev
0159683bfe
Merge pull request #14197 from pedrobmarin/f-p-adqta
...
fix(pads): add double quotes to APIKEY
2022-01-25 08:52:00 -05:00
Anton Georgiev
1af1fcbc9e
Merge pull request #14196 from pedrobmarin/f-p-aptbc
...
feat(pads): add pads to bbb-conf
2022-01-25 08:51:48 -05:00
Pedro Beschorner Marin
becce20fa5
fix(pads): add double quotes to APIKEY
...
JSON file format requires double quoted string data. Add quotes when configuring
ETHERPAD_API_KEY at bbb-pads build scripts.
2022-01-25 08:47:24 -03:00
Pedro Beschorner Marin
d7c9112578
feat(pads): add pads to bbb-conf
...
Add bbb-pads service to bbb-conf `status`, `start` and `stop` scripts.
2022-01-25 08:32:18 -03:00
Anton Georgiev
18a357455c
Merge pull request #12535 from pedrobmarin/r-w-rfmr
...
refactor!(webhooks): remove from main repository
2022-01-24 20:22:16 -05:00
Anton Georgiev
0cd8cb9d2f
Merge pull request #13916 from pedrobmarin/r-r-e-acea
...
refactor(etherpad): access control et al.
2022-01-24 20:20:15 -05:00
Anton Georgiev
5f4c5cdedb
Merge branch 'develop' into r-r-e-acea
2022-01-24 16:05:57 -05:00
Anton Georgiev
e905d08f3d
Merge pull request #14022 from danielpetri1/bbb-conf-checks
...
bbb-record: refactoring, more config checks, list-workflows option
2022-01-24 15:48:08 -05:00
Pedro Beschorner Marin
90953c9679
Merge pull request #14063 from SashoVihVas/position-in-waiting-queue
...
Add position in waiting queue for guest users
2022-01-24 14:33:10 -03:00
Pedro Beschorner Marin
c9043655f1
Merge branch 'develop' into position-in-waiting-queue
2022-01-24 14:31:03 -03:00
Anton Georgiev
8760443c75
Merge pull request #14067 from SashoVihVas/develop-private-guest-lobby-messages
...
Add private guest lobby messages
2022-01-24 10:55:25 -05:00
Ramón Souza
115ba187b5
remove unused imports/variables
2022-01-24 13:12:37 +00:00
Pedro Beschorner Marin
810deb907b
refactor(etherpad): access control et al.
...
Move all Etherpad's access control from Meteor to a separated [Node application](https://github.com/bigbluebutton/bbb-pads ).
This new app uses [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview )
to create groups and manage session tokens for users to access them. Each group
represents one distinct pad at the html5 client.
- Removed locked users' access to pads: replaced readOnly pad's access with a new pad's content sharing routine
- Pad's access is now controlled by [Etherpad's API](https://etherpad.org/doc/v1.8.4/#index_overview )
- Closed captions edited content now reflects at it's live feedback
- Improved closed caption's dictation mode live feedback
- Moved all Etherpad's API control from Meteor to a separated [app](https://github.com/bigbluebutton/bbb-pads )
- Included access control both in akka-apps and bbb-pads
2022-01-21 16:56:01 -03:00
Anton Georgiev
9fd5a73393
Merge pull request #14174 from ramonlsouza/restore-missing-variable
...
fix: restore missing variable
2022-01-21 13:34:21 -05:00
Ramón Souza
a9d4d87d2a
restore missing variable
2022-01-21 17:38:25 +00:00
Anton Georgiev
a6c8121776
Merge pull request #14161 from ramonlsouza/fix-mute-and-listen-onlyicon
...
fix: mute + listen only icons in userlist
2022-01-20 14:05:46 -05:00
Ramón Souza
d92290ed6f
fix mute + listen only icons in userlist
2022-01-20 19:00:18 +00:00
SashoVihVas
d99c271fa6
This commit includes following changes:
...
1.HashMap updates in Meeting.java are updated
2.callback is removed from setGuestStatus.js
3.MeetingService.java passes the guest list instead of iterating through it
2022-01-20 18:24:25 +00:00
Daniel Petri Rocha
45dd98bfe9
Use yq; show steps in --list-workflows
2022-01-20 18:40:12 +01:00
Aleksandar Vasilev
3b5781402c
Corrected HashMap updates in GuestsWaiting.scala
2022-01-20 04:11:34 +02:00
Aleksandar Vasilev
06799ad64f
Corrected HashMap updates in Meeting.java
2022-01-20 04:08:59 +02:00
Aleksandar Vasilev
6c265af1d6
Merge branch 'bigbluebutton:develop' into develop-private-guest-lobby-messages
2022-01-20 03:06:56 +01:00
Anton Georgiev
bcedc2be31
Merge pull request #14019 from jgribonvald/patch-1
...
fix(recording): not processed screenshare
2022-01-18 16:47:46 -05:00
Anton Georgiev
342f6ad6c3
Merge pull request #14128 from JoVictorNunes/infinite-score
...
fix(Dashboard): average activity score
2022-01-18 12:42:34 -05:00
Joao Victor
51bcec9b9e
Fix average activity score to prevent a potential 'infinity'
2022-01-18 11:39:30 -03:00
Pedro Beschorner Marin
b8fa15ed17
refactor!(webhooks): remove from main repository
...
BREAKING CHANGES: moved to https://github.com/bigbluebutton/bbb-webhooks
2022-01-17 15:55:48 -03:00
Anton Georgiev
efd7c5a160
Merge pull request #14117 from JoVictorNunes/dashboard-patch-after-merging
...
fix(Dashboard 2.5): patch
2022-01-17 13:00:07 -05:00
Joao Victor
79e96c0adc
LAD patch
2022-01-17 11:50:11 -03:00
Aleksandar Vasilev
6935b8293c
Merge branch 'bigbluebutton:develop' into position-in-waiting-queue
2022-01-16 02:59:40 +01:00
Aleksandar Vasilev
6103ae960d
Merge branch 'bigbluebutton:develop' into develop-private-guest-lobby-messages
2022-01-16 02:58:43 +01:00
Anton Georgiev
16ca899fcc
Merge pull request #14093 from bigbluebutton/prlanzarin-patch-1
...
[2.5] chore(bbb-html5): enable camera pin/screenshare volume control by default
2022-01-14 10:39:07 -05:00
Paulo Lanzarin
e87a633da3
chore(bbb-html5): enable camera pin/screenshare volume control by default
2022-01-13 19:08:14 -03:00
Anton Georgiev
8bffc54593
Merge pull request #14081 from ramonlsouza/dev-24-partial
...
chore: Merge 2.4 into develop
2022-01-13 08:45:39 -05:00
Ramón Souza
08c5d0943b
Merge pull request #1 from gustavotrott/merge-24-ramon
...
Resolves conflicts in Dashboard 2.4 merge
2022-01-13 10:11:22 -03:00
Daniel Petri Rocha
93360e1fb8
Add post_publish.log check
2022-01-13 13:25:06 +01:00
Gustavo Trott
baf1b53407
Resolve conflicts in Ramon's 2.4 merge
2022-01-12 19:35:00 -03:00
Ramón Souza
f6e65f58c5
merge 2.4 into develop and resolve conflicts - partial
2022-01-12 16:40:45 +00:00
Daniel Petri Rocha
fb76ea2585
Grep pattern in variable, read-only vars, grep -m instead of | head -n
2022-01-12 15:10:33 +01:00
SashoVihVas
1862f60e05
Add private guest lobby messages
2022-01-12 14:10:30 +00:00
SashoVihVas
2d7c82e73d
Add position in waiting queue for guest users
2022-01-12 03:08:43 +00:00
Anton Georgiev
9f9a7249b9
Merge pull request #14057 from ramonlsouza/fix-pr-14023
...
fix: forceCacheUpdate method
2022-01-11 15:12:30 -05:00
Ramón Souza
e17cacf7d3
fix forceCacheUpdate
2022-01-11 18:20:34 +00:00
Anton Georgiev
0c2023827c
Merge pull request #14055 from mariogasparoni/add-params-for-connecting-and-reconnecting-websocket
...
feat(audio): add settings for audio websocket connection
2022-01-11 11:14:16 -05:00
Anton Georgiev
84390e9f83
Merge pull request #14053 from ramonlsouza/issue-12681
...
fix: Different behaviour on userdata-bbb_listen_only_mode=false
2022-01-11 09:33:33 -05:00
Ramón Souza
dc08b7857c
go to echo test on audio modal mount if listen only is disabled
2022-01-11 13:59:46 +00:00
Anton Georgiev
d94b7b77fb
Merge pull request #14050 from KDSBrowne/bbb-9317
...
feat: Add Promoted / Demoted Toast Notification
2022-01-11 08:39:37 -05:00
KDSBrowne
77bf16c726
update lower hand string
2022-01-11 12:58:04 +00:00
KDSBrowne
6e9dcef7b3
use settings constants in notification check
2022-01-11 05:18:28 +00:00
KDSBrowne
4ec19006db
add promoted / demoted notification
2022-01-11 05:02:24 +00:00
