Fred Dixon
5743b29eba
Merge pull request #11805 from sebastianberm/patch-2
...
Updated usage section of analytics script to match actual syntax
2022-01-03 16:38:19 -04:00
Anton Georgiev
f1cdcf7854
Merge pull request #13855 from drlight17/develop
...
added drawImageProp function
2021-12-23 14:41:48 -05:00
Anton Georgiev
f1a354c9b0
Merge pull request #13951 from bigbluebutton/antobinary-patch-1
...
docs: Update SECURITY.md for 2.4
2021-12-21 12:09:48 -05:00
Anton Georgiev
1eb49be737
Update SECURITY.md
2021-12-20 10:42:10 -05:00
Anton Georgiev
0db29ec893
Merge pull request #13939 from pedrobmarin/b-e-b-v1-8-16
...
build(etherpad): bump v1.8.16
2021-12-16 13:16:35 -05:00
Pedro Beschorner Marin
d592c11062
build(etherpad): bump v1.8.16
2021-12-16 15:04:26 -03:00
Anton Georgiev
306175cbea
Merge pull request #13930 from JoVictorNunes/timeline-grouped-by-extId
...
refactor(Dashboard): add support for users grouped by extdId
2021-12-15 15:23:44 -05:00
Joao Victor
e750f8a2c8
fixes conflict
2021-12-15 16:48:53 -03:00
Joao Victor
87f3b603b2
fixes user row
2021-12-15 15:06:41 -03:00
Joao Victor
5a158061d9
adds support for users grouped by extdId
2021-12-15 13:16:24 -03:00
Joao Victor
e20adadecc
merge branch develop
2021-12-15 11:32:30 -03:00
Joao Victor
b54feab6f5
refactors the status timeline
2021-12-15 11:29:20 -03:00
Anton Georgiev
ea7f0fffe7
Merge pull request #13918 from danielpetri1/patch-1
...
Bug fix: support recordings with no fill attribute
2021-12-15 09:25:54 -05:00
Anton Georgiev
8a5e826fa7
Merge pull request #13926 from gustavotrott/dashboard-24-to-develop-merge
...
refactor: Merge Dashboard improvements from 2.4 to Develop
2021-12-15 09:25:16 -05:00
Gustavo Trott
35e465387b
Merge of last Dashboard 2.4 improvements
2021-12-15 10:35:14 -03:00
Daniel Petri Rocha
14df8d110a
Bug fix: support recordings with no fill attribute
...
This script is failing for older recordings with no fill attribute. In that case,`event.at_xpath('fill')` is `nil`, failing once `.text` on `nil` is called.
2021-12-14 17:02:19 +01:00
Anton Georgiev
e14392fb26
Merge pull request #13862 from JoVictorNunes/LD-presentation-timeline
...
feature (Dashboard): add the UI for presentation slides
2021-12-14 09:25:14 -05:00
Joao Victor
0b9d99406f
fixes verification of slides
2021-12-14 09:39:39 -03:00
Gustavo Trott
104ace2ee1
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-14 08:30:56 -03:00
Joao Victor
2c1706d186
fixes conflicts
2021-12-13 16:57:18 -03:00
Joao Victor
3754c075ae
fixes RTL mode
2021-12-13 16:38:10 -03:00
Anton Georgiev
50b6cf48fb
Merge pull request #13914 from antobinary/broken-merge-24-into-develop
...
Merge bbb 2.4-rc6 into 'develop'
2021-12-13 14:16:15 -05:00
Anton Georgiev
4d6348c031
Merge pull request #11 from gustavotrott/broken-merge-24-into-develop
...
Resolves conflicts in Dashboard
2021-12-13 13:49:49 -05:00
Gustavo Trott
e03bab1a88
Fix conflicts in Dashboard
2021-12-13 15:23:31 -03:00
Joao Victor
b2075b5bd1
fixes alignment of the emojis and thumbnails
2021-12-13 14:50:10 -03:00
Anton Georgiev
dfcd6a4fe8
Resolved akka-apps conflicts
2021-12-10 23:08:40 +00:00
Ramón Souza
d1c516fef6
resolve html5 conflicts
2021-12-10 21:07:35 +00:00
Joao Victor
44b6e2d62e
fixes bad filter
2021-12-10 11:26:38 -03:00
Gustavo Trott
5eff7578cb
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-10 10:50:52 -03:00
Anton Georgiev
797fc49633
TEMP
2021-12-09 20:37:05 +00:00
Anton Georgiev
07cfcd376a
Merge pull request #13877 from prlanzarin/u24-bumpmaster-flash
...
build: bump bbb-webrtc-sfu to v2.6.4
2021-12-09 12:03:24 -05:00
Anton Georgiev
5c6a43464c
Merge pull request #13860 from hiroshisuga/patch-52
...
fix (test): non-iterating loop in Playwright
2021-12-09 12:00:07 -05:00
Anton Georgiev
2c6f495f1c
Merge pull request #13878 from bigbluebutton/antobinary-patch-2
...
refactor: Decrease time allowed for reconnection
2021-12-09 11:56:39 -05:00
Anton Georgiev
75a64da3cc
refactor: Decrease time allowed for reconnection
...
We are receiving feedback that due to this 30s period that the user remains in the room, if a user exits a breakout room, that user won't be able to re-join it until 30s elapses.
More investigation is needed but given that this 30s value is somewhat large, I'm [temporarily] reducing it to 10s. Related #13531
2021-12-09 11:46:51 -05:00
Anton Georgiev
d4457383dc
Merge pull request #13874 from ramonlsouza/poll-annotation-order-24
...
Keep original order of poll answers in whiteboard annotation (2.4)
2021-12-09 10:43:47 -05:00
prlanzarin
c3f6abfca8
build: bump bbb-webrtc-sfu to v2.6.4
2021-12-09 12:14:53 -03:00
Ramón Souza
1f42751c23
keep original order of poll answers in whiteboard annotation
2021-12-09 14:20:34 +00:00
drlight17
250eab08bb
refactored drawImageProp call
2021-12-09 15:51:20 +03:00
Anton Georgiev
f76475f77e
Merge pull request #13868 from schrd/pres-download-fix
...
fix presentation download
2021-12-08 16:55:28 -05:00
Daniel Schreiber
e052b1f773
fix presentation download
...
this fixes the presentation download. This slipped through in commit
c46556e1f6
2021-12-08 22:32:22 +01:00
Anton Georgiev
9b143e80bc
Merge pull request #13864 from ramonlsouza/issue-13841
...
fix: Users disappearing from the polling results when they vote
2021-12-08 12:35:13 -05:00
Ramón Souza
33089d6226
fix new secret poll issue
2021-12-08 16:49:43 +00:00
Joao Victor
7c192f0b7f
removes the default presentation slide
2021-12-08 13:25:55 -03:00
Anton Georgiev
6e920ad785
Merge pull request #13861 from gustavotrott/dashboard-support-multiple-choices-poll
...
feat: Dashboard support for multiple choices polls
2021-12-08 09:02:18 -05:00
Anton Georgiev
0d0531d799
Merge pull request #13859 from ramonlsouza/typing-indicator-fix-25
...
fix: typing indicator names position (2.5)
2021-12-08 08:59:19 -05:00
Anton Georgiev
2f49f0720c
Merge pull request #13858 from ramonlsouza/typing-indicator-fix
...
fix: typing indicator names position (2.4)
2021-12-08 08:58:32 -05:00
Joao Victor
547197282b
feature (Dashboard): add the UI for presentation slides
2021-12-08 10:51:48 -03:00
Gustavo Trott
a8042a5b9e
Allow multiple choices poll in Dashboard
2021-12-08 10:40:09 -03:00
hiroshisuga
82980ac17b
fix non-looping loop
2021-12-08 22:09:58 +09:00
Ramón Souza
0e50f7b0ae
fix typing indicator position (2.5)
2021-12-08 11:39:06 +00:00
