root
ce7362380b
Merge branch 'develop' into origin/jdk-17-upgrade
2021-12-03 14:04:02 +00:00
Gustavo Trott
54d510bae1
Merge remote-tracking branch 'upstream/develop' into fix-breakout-freejoin-assignments
2021-12-02 11:10:58 -03:00
Gustavo Trott
fe944c1bdb
Fix breakouts assignments when freeJoin is true
2021-12-02 11:05:42 -03:00
Anton Georgiev
94f85ad68a
Merge pull request #13678 from gustavotrott/breakouts-n-groups-assignments-2.5
...
feat: Auto assign Breakouts (names and users) using previous rooms info or groups info
2021-12-01 15:01:23 -05:00
root
3f2f1678ce
upgrading akka-bbb-apps
2021-11-29 17:03:44 +00:00
Gustavo Trott
4ebd27065a
Include presentations info to Learning Dashboard Json
2021-11-17 14:42:34 -03:00
Gustavo Trott
8555187df3
Resolve conflicts with Develop branch
2021-11-11 14:02:03 -03:00
Gustavo Trott
e919e24b38
Auto assign breakout names and users using lastBreakout or groups
2021-11-11 10:10:31 -03:00
Anton Georgiev
019a0b25b9
Merge pull request #13564 from jfsiebel/remove-unused-property-chat-message
...
Remove unused properties from chat message event
2021-11-02 15:12:56 -04:00
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359
...
feat: multiple choice poll
2021-10-26 14:42:29 -04:00
Ramón Souza
1807122a84
fix multiple choice custom poll
2021-10-26 17:24:47 +00:00
Joao Siebel
7a118ed3b8
Remove unused properties from chat message event record. close #11696
2021-10-25 14:46:59 -03:00
Anton Georgiev
1622425cbc
Merge branch 'develop' of github.com:bigbluebutton/bigbluebutton into 2.4-into-develop
2021-10-22 19:12:58 +00:00
Tiago Jacobs
57c1ea332a
Increase time allowed for reconnection
2021-10-20 15:24:32 -03:00
Ramón Souza
1cc066366f
Merge remote-tracking branch 'upstream/develop' into PR-11359
2021-10-19 16:41:36 +00:00
Joao Siebel
1218b8b610
Add constraint for actions in breakouts on akka
2021-10-15 16:25:36 -03:00
Philipp Memmel
e580040e3a
Allow non-mod presenters to see and lower raised hands
2021-09-27 11:29:49 +00:00
Ramon Souza
c892a2a5d1
resolve conflicts
2021-09-21 12:06:27 -03:00
Anton Georgiev
0b1f26bd57
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-23-into-24
2021-09-21 14:12:32 +00:00
Ramon Souza
85ded998f2
remove linting
2021-09-17 11:03:09 -03:00
Ramon Souza
0ca1b7896e
Merge remote-tracking branch 'upstream/develop' into PR-11359
2021-09-17 09:12:43 -03:00
Gustavo Trott
065dedf0fa
Avoid to reset lastModeratorLeftOnInMs when some user leave the meeting
2021-09-16 14:46:16 -03:00
Gustavo Trott
2a348e5f71
Makes Akka stop ScreenShare when External Video is started
2021-09-09 15:27:29 -03:00
Joao Siebel
e51b197049
Prevent VIEWER to get breakout's url for breakouts that he is not assigned
2021-08-31 11:50:30 -03:00
Gustavo Trott
6970a0ab30
Merge branch 'develop' into learning-dashboard-improvements2
2021-08-30 15:23:04 -03:00
Anton Georgiev
4ecb24b4fa
Merge branch 'v2.3.x-release' of github.com:bigbluebutton/bigbluebutton into merge-aug30
2021-08-30 18:11:16 +00:00
Gustavo Trott
cd15f17394
Refactor all references for activity-report renaming to learning-dashboard
2021-08-25 11:38:35 -03:00
Pedro Beschorner Marin
57e27bb4dc
fix(polling): stop current running poll
...
As far as I could understand, polls are tightly coupled with the meeting
main content area, or at least they were and we still have to deal with
this close relation between them. Not sure if it's something we'll keep
this way forever but, from my candid perspective, looks like this is already
diverging inside the poll model. Polls are indexed by presentation pages,
screenshare or even something called "public" that I'm not 100% what
actually means. My best guess is anything besides the first and the second.
The polling stop process lacks to inform which pollId is scoped at source
so it relies on akka-apps to discover based on the current state of other
apps. This looks like the major problem over this polling termination issue.
Made a few changes at the running poll getter fallback at the polling stop
process. Following the premise that there is only one running poll available,
we make sure to return a valid running poll (if there's one).
2021-08-24 18:56:01 -03:00
Gustavo Trott
465a4c41ec
Includes dialIn users to Learning Dashboard
2021-08-18 11:45:24 -03:00
Anton Georgiev
c22875a6d7
Merge pull request #12977 from gustavotrott/learning-dash-improvements
...
Learning Dashboard: Layout improvements
2021-08-12 14:28:45 -04:00
Gustavo Trott
1d961d9c00
Sort users by moderator/alphabetical order
2021-08-11 18:22:55 -03:00
Gustavo Trott
dc2611632a
Adds more details about used Emojis
2021-08-11 14:46:44 -03:00
Joao Siebel
13913a6111
Remove LEGACY option for valid layouts. close #12858
2021-08-10 09:50:13 -03:00
Gustavo Trott
fd4761374f
Improvements to set all endedOn/leftOn when meeting is ended
2021-08-04 16:25:22 -03:00
Gustavo Trott
8346f1d9cf
Avoid send activity message if it didnt have new activities
2021-08-02 11:50:11 -03:00
Gustavo Trott
42e32b7ba8
Include infos about meeting endedOn and fix problem where user leftOn was never set if meeting ends before they left
2021-08-02 11:16:08 -03:00
Gustavo Trott
184f89c152
Merge branch 'activity-report' of github.com:gustavotrott/bigbluebutton into activity-report
2021-07-23 14:06:34 -03:00
Gustavo Trott
2500d4f767
Removes from Json all start/stop talks info, and inform only the totalTime
2021-07-23 14:02:48 -03:00
Gustavo Trott
eea16c8268
Remove unnecessary codes
2021-07-23 10:47:03 -03:00
Gustavo Trott
284b97840e
Remove unnecessary codes
2021-07-23 10:43:28 -03:00
Gustavo Trott
0661712da1
Removes Json content from INFO LOG. To avoid too large logs.
2021-07-23 10:40:57 -03:00
Gustavo Trott
e4ef1582f2
Merge branch 'develop' into activity-report
2021-07-22 11:33:47 -03:00
Gustavo Trott
3c6155a73e
Creates config activityReportTracking to enable Activity Report
2021-07-22 11:09:44 -03:00
Anton Georgiev
1abedcc698
Merge pull request #12789 from jfsiebel/implement-default-layout-config
...
Allow default layout config in bbb-web
2021-07-21 16:11:08 -04:00
Gustavo Trott
b0f9835ffd
Merge branch 'develop' into activity-report
2021-07-21 14:20:27 -03:00
Gustavo Trott
21f90fc0e3
Handle anonymous Polls to hide the autor of the answer
2021-07-21 14:16:27 -03:00
Gustavo Trott
c1e39819fe
Fix: Stop last user Talk when Audio is disabled or muted
2021-07-20 17:39:36 -03:00
Anton Georgiev
064f525f68
Merge pull request #12646 from jfsiebel/wip-prevent-unasign-assign-spam
...
WIP Prevent spam of assign presenter role
2021-07-20 16:02:52 -04:00
Joao Siebel
8462465a5f
Allow default layout config in bbb-web. close #12668
2021-07-19 11:02:58 -03:00
Gustavo Trott
d0b08f5603
Improvements in screenShare registers
2021-07-16 16:53:47 -03:00
