Anton Georgiev
a654f44011
Merge pull request #13623 from ramonlsouza/styled-components-7
...
refactor: styled-components conversion - partial
2021-11-03 08:44:04 -04:00
Anton Georgiev
13aba985cb
Merge pull request #10737 from hiroshisuga/fillshape
...
feat: Fill shape in whiteboard
2021-11-02 15:03:22 -04:00
Ramón Souza
f6f47bf25a
convert whiteboard annotations component
2021-11-02 16:35:54 +00:00
Anton Georgiev
c60ef3c179
Merge pull request #13253 from ramonlsouza/PR-11359
...
feat: multiple choice poll
2021-10-26 14:42:29 -04: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
Ramón Souza
1cc066366f
Merge remote-tracking branch 'upstream/develop' into PR-11359
2021-10-19 16:41:36 +00:00
Ramón Souza
9e71583ec7
restore old minimize presentation button and add a flag to switch
2021-10-14 19:31:47 +00:00
Anton Georgiev
24d672a832
Merge branch 'v2.4.x-release' of github.com:bigbluebutton/bigbluebutton into merge-24-dev
2021-10-14 15:13:17 +00:00
Tainan Felipe
1de8e0779d
Add server side reactivity to publications
2021-10-13 15:00:52 -03:00
Lucas Fialho Zawacki
d7f3924350
Enable swap layout for screenshare and external video
2021-09-27 21:03:20 +00:00
Ramon Souza
0ca1b7896e
Merge remote-tracking branch 'upstream/develop' into PR-11359
2021-09-17 09:12:43 -03:00
germanocaumo
e252012bd5
fix(poll): missed test for polls with > 5 default answers
2021-06-16 23:16:28 +00:00
germanocaumo
7bedcb08e5
fix(poll): don't translate user/presenter typed answers
...
When the answer is not default (Custom or UserResponse), don't translate the answers.
2021-06-11 16:55:53 +00:00
hiroshisuga
e0a78ffbac
Merge branch 'develop' into fillshape
2021-05-14 20:57:16 +09:00
Ramon Souza
7a28119bc9
adjust poll annotations
2021-05-06 15:38:01 -03:00
Michael Zinsmeister
5ca831ff86
Merged upstream develop branch
2021-05-01 16:59:20 +02:00
Ramon Souza
7af5b0cea0
fix number of votes in poll results annotation
2021-04-30 13:40:46 -03:00
Ramon Souza
2e82bb2f64
resize whiteboard poll results
2021-04-23 11:24:01 -03:00
Ramon Souza
e7366485aa
removing unused imports
2021-04-13 08:43:08 -03:00
Anton Georgiev
aae72c0547
Merge branch 'develop' into multiple-choice-poll
2021-03-29 11:54:44 -04:00
Anton Georgiev
7d9abe77a0
Merge pull request #11127 from FarzadKarkhani/patch-2
...
Fix for poll result in RTL languages
2021-03-26 16:35:33 -04:00
Michael Zinsmeister
5fb33d5224
merge upstream develop branch into current
2021-03-23 18:01:11 +01:00
Maxim Khlobystov
5adb3429eb
Make typed poll responses grouping case insensitive
2021-03-23 06:30:37 +00:00
Anton Georgiev
b1bbc3fd52
Merge branch 'develop' into multiple-choice-poll
2021-03-17 16:11:49 -04:00
Pedro Beschorner Marin
381c5cb15c
Isolated whiteboard access
...
Modified the previous implementation of the whiteboard individual access to remove
multiple Collections dependency on this feature. Multi-user whiteboard is now an
array instead of a boolean value and most of the access control can be synchronized
and handled by akka-apps.
2021-03-16 19:55:25 -03:00
Michael Zinsmeister
214b236701
Merge with upstream
2021-03-07 15:12:49 +01:00
KDSBrowne
2f094f7048
skip publishing poll annotation to whiteboard if presentation swapped
2021-02-17 14:15:20 +00:00
Michael Zinsmeister
6ad4828955
Merge remote-tracking branch 'upstream/develop' into multiple-choice-poll
2021-02-11 10:12:34 +01:00
Ramon Souza
3652562b63
resolve conflict
2021-02-10 17:35:55 -03:00
Michael Zinsmeister
eaa6f0260c
Fix poll results and add locale entries
2021-02-08 10:57:39 +01:00
Anton Georgiev
09e6ba8dfd
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-Jan30
2021-01-29 20:58:05 +00:00
Tainan Felipe
3aa8e115b5
Merge branch 'develop' into unsafe-whiteboard-components
2021-01-25 17:36:12 -03:00
werk21
80af96ff76
9101: Survey: New profile yes/no/abstention
2021-01-24 02:22:40 +01:00
Fazrad Karkhani
bdc3973538
Fix for poll result in RTL languages
2021-01-09 00:37:49 -08:00
hiroshisuga
677b26eb73
Update component.jsx
2020-10-28 14:39:33 +09:00
hiroshisuga
f5ac8470bb
Update component.jsx
2020-10-28 14:38:44 +09:00
hiroshisuga
dcf50d4e47
Update component.jsx
2020-10-28 14:37:49 +09:00
Mohamed Amine Ben Salah
bf45dbc7f9
adds visual regressions test with snapshots ready to use
2020-10-27 12:54:55 -03:00
Anton Georgiev
d8b185f2b3
Merge branch 'issue-9219' of github.com:Tainan404/bigbluebutton into locales-total
2020-09-09 19:29:18 +00:00
KDSBrowne
77b71a4d1f
fix duplicate css variables being loaded (improve imports)
2020-09-01 18:46:13 +00:00
Tainan Felipe
5bfeab289c
Merge remote-tracking branch 'upstream/develop' into issue-9219
2020-08-19 10:41:03 -03:00
Anton Georgiev
5be5aed1d9
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12
2020-08-12 17:12:58 +00:00
Tainan Felipe
bd6471b664
Remove unsafe lifecycle from all whiteboard related components
2020-08-07 17:21:28 -03:00
KDSBrowne
f409e912b1
add aria-label to whiteboard poll result
2020-07-31 13:20:48 +00:00
Tainan Felipe
e64c0e1c62
Merge branch 'develop' into issue-9219
2020-07-28 13:28:32 -03:00
Anton Georgiev
21b6def708
Revert "Replace unsafe react lifecycle methods"
2020-07-15 15:52:34 -04:00
Anton Georgiev
e48306431a
Merge pull request #9498 from Tainan404/issue-8744
...
Replace unsafe react lifecycle methods
2020-07-14 10:30:37 -04:00
Pedro Beschorner Marin
526f79e8f2
Merge remote-tracking branch 'bigbluebutton/v2.2.x-release' into bigbluebutton/develop
2020-06-30 18:15:18 -03:00
KDSBrowne
dabc2e8213
fix poll annotation error with large presentations
2020-06-01 16:57:46 +00:00
Tainan Felipe
e1573bded9
Merge remote-tracking branch 'upstream/develop' into issue-8744
2020-05-26 11:44:20 -03:00
