Tainan Felipe
141be357ed
Little clean up
2021-01-19 14:16:34 -03:00
Tainan Felipe
8e2fe47c6f
Implements chat using react context as middleware
2021-01-19 14:06:32 -03:00
Anton Georgiev
99c14af039
Merge pull request #11171 from KDSBrowne/bbb-11056
...
Fix fetch loop when override / fallback locales set with region
2021-01-19 11:28:06 -05:00
KDSBrowne
3f0cde7dbb
Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into bbb-11056
2021-01-19 16:02:32 +00:00
KDSBrowne
206cae3707
fix locale fetch loop with xx_XX fallback/override
2021-01-19 16:02:20 +00:00
Fred Dixon
7b9bb8cf61
Merge pull request #11125 from hiroshisuga/patch-15
...
Rename GoupChatMsg.scala to GroupChatMsg.scala
2021-01-15 22:54:36 -04:00
Fred Dixon
27cb9e8a39
Merge pull request #11078 from hiroshisuga/patch-11
...
Remove mountModal requirement in presentation uploader
2021-01-15 22:53:53 -04:00
hiroshisuga
ad40faaf66
Rename GoupChatMsg.scala to GroupChatMsg.scala
2021-01-09 09:01:51 +09:00
Anton Georgiev
ce6f7f55b4
Merge pull request #11114 from antobinary/2.3-recover-guest-join
...
Temporarily allow undefined user name for offline chat sender
2021-01-06 14:22:22 -05:00
Anton Georgiev
d9629113cb
fix undefined css class button in video-button
2021-01-06 19:13:48 +00:00
Anton Georgiev
24e2fe967b
temporarily allow undefined user name for offline chat sender
2021-01-06 19:12:35 +00:00
Anton Georgiev
2da63af0fc
Merge pull request #11113 from antobinary/2.3-recover-guest-join
...
Remove duplicated html id video-modal-input
2021-01-06 11:57:33 -05:00
Anton Georgiev
2dabeaae29
remove duplicated html id video-modal-input
2021-01-06 16:53:22 +00:00
Anton Georgiev
4758cf8464
Merge pull request #11112 from antobinary/2.3-recover-guest-join
...
Correct path to silence.mp3
2021-01-06 11:39:47 -05:00
Anton Georgiev
3e3f3236cc
correct path to silence.mp3
2021-01-06 15:55:01 +00:00
Anton Georgiev
6a59c7168b
Merge pull request #11111 from antobinary/2.3-recover-guest-join
...
Ensure sorting has a fallback in case of undefined name
2021-01-06 10:25:29 -05:00
Anton Georgiev
eb8e412935
ensure sorting has a fallback in case of undefined name
2021-01-06 15:21:44 +00:00
Fred Dixon
b9a05154d2
Merge pull request #11110 from bigbluebutton/ffdixon-patch-3
...
Update bigbluebutton-release
2021-01-06 07:04:29 -04:00
Fred Dixon
9265634e19
Update bigbluebutton-release
2021-01-06 07:03:48 -04:00
Anton Georgiev
a6330cf884
Merge pull request #11105 from antobinary/2.3-recover-guest-join
...
Updated axios to 0.21.1 to resolve vuln
2021-01-05 16:19:08 -05:00
Fred Dixon
f67fe93e3e
Merge pull request #11106 from bigbluebutton/revert-11094-dependencies-as-submodules
...
Revert "add submodules: bbb-webrtc-sfu, etherpad-lite, freeswitch"
2021-01-05 15:15:51 -04:00
Fred Dixon
f9143801c1
Revert "add submodules: bbb-webrtc-sfu, etherpad-lite, freeswitch"
2021-01-05 15:14:49 -04:00
Anton Georgiev
f734071cb8
update axios to 0.21.1 to resolve vuln
2021-01-05 16:16:36 +00:00
Anton Georgiev
9cdda21c50
Merge pull request #11104 from antobinary/2.3-recover-guest-join
...
Handle guestWait url for multiple nodejs instanceIds
2021-01-05 11:10:28 -05:00
Anton Georgiev
3135c6bb22
Handle guestWait url for multiple nodejs instanceIds
2021-01-05 15:38:21 +00:00
Fred Dixon
63d36f57fb
Merge pull request #11094 from zfgrnzfsberire/dependencies-as-submodules
...
add submodules: bbb-webrtc-sfu, etherpad-lite, freeswitch
2021-01-02 08:52:55 -04:00
Fred Dixon
9e7bd44c9b
Merge pull request #10604 from hiroshisuga/patch-8
...
Fix slide size problem at fullscreen <-> window-mode transition
2020-12-30 08:08:38 -04:00
zfgrnzfsberire
97543c4818
add submodules: bbb-webrtc-sfu, etherpad-lite, freeswitch
2020-12-29 17:49:30 +01:00
Fred Dixon
517ad6d5b3
Merge pull request #11093 from ffdixon/add-ckj-libreoffice
...
Add fonts-noto-cjk to build of libreoffice docker container
2020-12-29 11:16:32 -04:00
Fred Dixon
c6ea649fec
Fix #11089
2020-12-29 09:15:00 -06:00
Fred Dixon
278a010ae3
Merge pull request #11074 from hiroshisuga/patch-10
...
Suppress warning of React file player
2020-12-28 22:38:11 -04:00
Fred Dixon
9b973c331f
Merge pull request #11077 from hiroshisuga/bug-shortcutwindow
...
Adding ID to debug window shortcut translation
2020-12-28 22:37:30 -04:00
Fred Dixon
40dc4ffb8b
Merge pull request #11085 from bigbluebutton/ffdixon-patch-2
...
Update bigbluebutton-release
2020-12-28 06:54:44 -05:00
Fred Dixon
22b9c684ab
Update bigbluebutton-release
2020-12-28 07:45:09 -04:00
Fred Dixon
1a4dd87f7f
Merge pull request #11080 from hiroshisuga/patch-12
...
enabling copy-pasting in the chat window on 2.3a3
2020-12-27 08:04:33 -05:00
hiroshisuga
3c0a35706c
Update styles.scss
2020-12-27 15:10:32 +09:00
hiroshisuga
4e4d3beb10
Update component.jsx
2020-12-27 10:36:01 +09:00
hiroshisuga
90ea3f845b
Update en.json
2020-12-27 09:58:44 +09:00
hiroshisuga
d30a9bba47
Update component.jsx
2020-12-27 09:55:32 +09:00
hiroshisuga
3dc0aa83f2
Update component.jsx
2020-12-27 00:01:54 +09:00
Fred Dixon
0677cf33a3
Merge pull request #11061 from fcecagno/new-playback
...
Support for bbb-playback
2020-12-20 19:58:59 -05:00
Felipe Cecagno
47af1a391b
publish presentation format to use the new bbb-playback; redirect 2.0 to 2.3 by default
2020-12-20 21:43:54 -03:00
Fred Dixon
dfc375180c
Merge pull request #11060 from bigbluebutton/ffdixon-patch-1
...
Update events_worker.rb
2020-12-20 17:39:16 -05:00
Fred Dixon
e08ff14c52
Update events_worker.rb
...
Fix file existence test.
2020-12-20 18:38:18 -04:00
Fred Dixon
7594121664
Merge pull request #11049 from ffdixon/minor-updates-bbb-conf
...
Restart tomcat8
2020-12-18 20:49:45 -04:00
Fred Dixon
ed56de9567
Restart tomcat8
2020-12-18 18:47:59 -06:00
Anton Georgiev
2dc9ed6c74
Merge pull request #11048 from bigbluebutton/antobinary-patch-1
...
Recover 2.3-alpha3 version of bbb-conf
2020-12-18 18:40:11 -05:00
Anton Georgiev
278223b4e0
Recover 2.3-alpha3 version of bbb-conf
...
Most of the changes date back to #10700
We were trying to trace down a problematic change likely when merging 2.2.31 into 2.3 ( #11033 )
If anyone spots issues with bbb-conf on their 2.3 server, please comment
2020-12-18 18:38:46 -05:00
Fred Dixon
17c5ea9aed
Fixup bbb-conf for 2.3-alpha3
2020-12-18 16:41:08 -06:00
Anton Georgiev
882a941632
Merge pull request #11046 from antobinary/fixes-alpha-3
...
settings.yml media configs incorrectly placed under "stats"
2020-12-18 12:58:19 -05:00
