Commit Graph

35220 Commits

Author SHA1 Message Date
Ramón Souza
00c52adaee
Merge pull request #15794 from KDSBrowne/26-mute-all-label
Fix User Options Mute Items Not Updating
2022-10-24 10:13:29 -03:00
Ramón Souza
1c9a8435d5
Merge pull request #15862 from KDSBrowne/bbb-15836
Fix Moved to Back Shapes Lost Forever
2022-10-24 10:10:55 -03:00
Ramón Souza
175d90c015
Merge pull request #15789 from KDSBrowne/26-update-fs-labels
Improve Context of Text in Fullscreen Button Labels
2022-10-21 16:27:56 -03:00
Ramón Souza
7f3dcb7f13
Merge pull request #15844 from JoVictorNunes/issue-15758
style: breakout item padding
2022-10-21 16:23:13 -03:00
Ramón Souza
414f51ce38
Merge pull request #15883 from ramonlsouza/merge-258-26
chore: Merge v2.5.8 into v2.6
2022-10-21 15:08:43 -03:00
Ramón Souza
69c0616000 resolve conflict 2022-10-21 15:04:34 -03:00
Ramón Souza
8ed142a522 Merge remote-tracking branch 'upstream/v2.5.x-release' into merge-258-26 2022-10-21 14:43:23 -03:00
Gustavo Trott
c59061a991
Merge pull request #15875 from gustavotrott/poll-validate-typed-answer 2022-10-21 13:59:55 -03:00
Ramón Souza
2dae1774dc
chore: Bump version to 2.5.8 2022-10-21 09:18:53 -03:00
Gustavo Trott
14c1b719e5
Merge pull request #15879 from paultrudel/checksum-algorithm-fix-25 2022-10-21 09:11:01 -03:00
Gustavo Trott
86000eb851
Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 2022-10-21 09:09:58 -03:00
Gustavo Trott
48fda8f3b2
Update bigbluebutton-web/grails-app/conf/bigbluebutton.properties 2022-10-21 09:09:42 -03:00
Paul Trudel
c5f234ddf4 Fixed issue with checksum algorithms 2022-10-21 06:50:23 +00:00
Gustavo Trott
0e69596c7e
Merge pull request #15877 from gustavotrott/fix-pres-always-null 2022-10-20 15:14:38 -03:00
Gustavo Trott
245e67f418 Fix a problem where presentations is always null 2022-10-20 15:12:10 -03:00
Ramón Souza
23ce309edf
Merge pull request #15876 from ramonlsouza/bp15766
Update FreeSWITCH settings for improved audio (2.5)
2022-10-20 14:44:27 -03:00
Fred Dixon
aa0fdb8727 Updated FreeSWITCH settings to improve audio 2022-10-20 14:41:01 -03:00
Fred Dixon
3327a87d5f Updated FreeSWITCH settings to improve audio 2022-10-20 14:40:55 -03:00
Gustavo Trott
f51ad7c703 Ignore typed answer if Poll is not ResponsePollType 2022-10-20 14:18:34 -03:00
Gustavo Trott
30d7e172d8
Merge pull request #15873 from gustavotrott/upgrade-apacheText-1-10-0 2022-10-20 11:23:22 -03:00
Gustavo Trott
06fe8e9f59 Upgrade apacheText version 2022-10-20 10:09:59 -03:00
Gustavo Trott
84e5fdfffd
Merge pull request #15872 from gustavotrott/fix-polls-multiple-answers-v25 2022-10-20 09:26:03 -03:00
Gustavo Trott
d97dadaf65 Add validation on poll responses 2022-10-20 09:22:23 -03:00
Gustavo Trott
b125d9f343
Merge pull request #15871 from gustavotrott/default-pres-null-instruction 2022-10-19 18:23:29 -03:00
Gustavo Trott
37fc589f71 Instruction to disable default presentation 2022-10-19 18:18:41 -03:00
Gustavo Trott
d9e6e5c8bf
Merge pull request #15860 from zhem0004/defaultPresentationNull 2022-10-19 17:48:44 -03:00
Bohdan Zhemelinskyi
2ee70c671d set default as null 2022-10-19 20:17:53 +00:00
Bohdan Zhemelinskyi
927d97fc30 Merge branch 'defaultPresentationNull' of https://github.com/zhem0004/bigbluebutton into defaultPresentationNull 2022-10-19 19:39:09 +00:00
Ramón Souza
2e70c6899b
Merge pull request #15869 from ramonlsouza/locales-oct19
chore: Pulled the latest 2.5 HTML5 locales from Transifex
2022-10-19 10:18:22 -03:00
Localization Server
82c00c3f75 chore: Pulled the latest 2.5 HTML5 locales from Transifex 2022-10-19 10:16:33 -03:00
Ramón Souza
a08f93c781
chore: Bump version to 2.5.6 2022-10-19 09:51:25 -03:00
Ramón Souza
6677304c31
Merge pull request #15858 from ramonlsouza/oct18
refactor: check content size in smart slide feature
2022-10-19 08:30:21 -03:00
Gustavo Trott
ba2aefb5b2
Merge pull request #15840 from gustavotrott/fix-polls-multiple-answers-v26 2022-10-19 08:07:17 -03:00
Ramón Souza
d3cfe305b0 Merge remote-tracking branch 'upstream/v2.5.x-release' into oct18 2022-10-18 17:13:33 -03:00
Ramón Souza
e17045031d Merge remote-tracking branch 'upstream/v2.5.x-release' into oct18 2022-10-18 17:02:48 -03:00
Ramón Souza
5445b02fa4
Merge pull request #15861 from ramonlsouza/bp15856
Add Custom Poll Functionality Via Smart Slides (2.5)
2022-10-18 16:28:47 -03:00
Fred Dixon
d9d313aed3
Merge pull request #15850 from BrentBaccala/bbb-conf-stun
Improve STUN checks in bbb-conf
2022-10-18 15:24:46 -03:00
KDSBrowne
2d9dd58f9c set slide shape childIndex to -1 2022-10-18 18:12:42 +00:00
Gustavo Trott
a9fe2cf18d
Merge pull request #15755 from danielpetri1/capture-shared-notes 2022-10-18 14:19:29 -03:00
KDSBrowne
8ee7d85090 fix lint issue 2022-10-18 14:13:30 -03:00
KDSBrowne
32896d025b restrict poll item length to 30 chars 2022-10-18 14:13:23 -03:00
Ramón Souza
7553a7dbe2 add custom polling functionality to smart polls 2022-10-18 14:13:09 -03:00
Gustavo Trott
65489e9c04
Merge pull request #15859 from zhem0004/upgradeZ 2022-10-18 13:14:26 -03:00
Ramón Souza
4f96d35502
Merge pull request #15856 from KDSBrowne/26-smart-custom-polls
Add Custom Poll Functionality Via Smart Slides
2022-10-18 13:08:58 -03:00
Bohdan Zhemelinskyi
e1c019eb65 unset null 2022-10-18 15:06:22 +00:00
Bohdan Zhemelinskyi
2e11b884f7 Merge branch 'v2.6.x-release' of https://github.com/bigbluebutton/bigbluebutton into defaultPresentationNull 2022-10-18 14:58:09 +00:00
Bohdan Zhemelinskyi
35ed3228ef set defaultPresentation-null 2022-10-18 14:57:54 +00:00
Ramón Souza
77ae18f91c add safeMatch method 2022-10-18 14:50:18 +00:00
KDSBrowne
7cc79913f0 fix lint issue 2022-10-18 14:45:47 +00:00
Gustavo Trott
195beda6cb
Merge pull request #15855 from GuiLeme/backport-pdf-100 2022-10-18 10:34:51 -03:00