Anton Georgiev
|
7d75843140
|
Fix a forgotten line left while resolving conflict
|
2020-07-14 11:19:11 -04:00 |
|
Anton Georgiev
|
b9b4490d8c
|
Merge branch 'develop' into layout
|
2020-07-14 10:32:24 -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 |
|
Vitor Mateus De Almeida
|
880963e0e7
|
Merge remote-tracking branch 'upstream/develop' into layout
|
2020-07-06 13:36:38 -03: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 |
|
Anton Georgiev
|
0a399af81f
|
add clientURL to logs from client
|
2020-06-30 15:18:01 -04:00 |
|
Joao Siebel
|
3e95ed0e4b
|
Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2
|
2020-06-16 16:40:56 -03:00 |
|
Vitor Mateus De Almeida
|
3b3a6a32f5
|
Fixes
|
2020-06-09 00:09:46 -03:00 |
|
Joao Siebel
|
faa0b35032
|
Show correct screen when user leave meeting. close #9710
|
2020-06-02 16:47:26 -03:00 |
|
Anton Georgiev
|
29afdafd3e
|
Merge pull request #9658 from konkret-devils/v2.2.x-release
Add bbb_show_public_chat_on_login as a join (co-) parameter
|
2020-05-29 12:42:59 -04:00 |
|
Anton Georgiev
|
1a7c07e380
|
Merge pull request #9113 from sualko/feat/html5/settings
add env to specify settings location
|
2020-05-28 16:21:25 -04:00 |
|
Anton Georgiev
|
1c6841dd1f
|
Merge pull request #9691 from jfsiebel/fix-breakout-room-logout
Close tab when user logout from a breakout room
|
2020-05-26 15:12:21 -04:00 |
|
Joao Siebel
|
1f8cae08d6
|
Close tab when user logout from a breakout room
|
2020-05-26 13:41:22 -03:00 |
|
Tainan Felipe
|
e1573bded9
|
Merge remote-tracking branch 'upstream/develop' into issue-8744
|
2020-05-26 11:44:20 -03:00 |
|
Martin Beckmann
|
c3f0447105
|
Integration of PR #9292 (by weeman1337) and PR #9658 (by mantridereso)
|
2020-05-26 15:07:37 +02:00 |
|
Anton Georgiev
|
9f60e925b5
|
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop
|
2020-05-25 19:55:36 +00:00 |
|
Anton Georgiev
|
c9e996de21
|
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop
|
2020-05-25 17:32:24 +00:00 |
|
Anton Georgiev
|
4a38524778
|
Logging with JSON stringify was leading to crashes. Reverting, need to investigate further
|
2020-05-24 08:22:10 -04:00 |
|
Martin Beckmann
|
ea3926e8ef
|
attempt to introduce an additional UserSettings parameter 'bbb_show_public_chat_on_login' as a co-parameter of 'bbb_show_participants_on_login' (the former intended to only have an effect if the latter is 'true')
|
2020-05-23 22:28:56 +02:00 |
|
Martin Beckmann
|
d6956a5516
|
test...
|
2020-05-23 21:43:26 +02:00 |
|
Martin Beckmann
|
f9c7c20d5a
|
test...
|
2020-05-23 21:40:39 +02:00 |
|
Martin Beckmann
|
51d3b3a94d
|
test...
|
2020-05-23 20:44:11 +02:00 |
|
Anton Georgiev
|
e7917994d5
|
add banUser field in EjectUserFromMeetingCmdMsgBody
|
2020-05-22 10:45:28 -04:00 |
|
Joao Siebel
|
73d0de34dd
|
Move Intl component outside of Base component
|
2020-05-12 10:31:00 -03:00 |
|
yogiks
|
360fce9781
|
Included Kannada
|
2020-05-11 15:40:00 -04:00 |
|
Tainan Felipe
|
851189f3c1
|
Merge remote-tracking branch 'upstream/develop' into issue-8744
|
2020-05-11 11:42:03 -03:00 |
|
Anton Georgiev
|
cc79c4b6ae
|
merge 2.2.10 into 2.3
|
2020-05-05 19:52:44 +00:00 |
|
Anton Georgiev
|
63f7da5241
|
include Meteor connection ID in logs
|
2020-04-30 16:40:45 -04:00 |
|
Anton Georgiev
|
89fb118d00
|
Pulled HTML5 locales April 23, 2020; Added Norwegian
|
2020-04-23 10:17:43 -04:00 |
|
Vitor Mateus
|
00259ab371
|
WIP Resizable works fine
|
2020-04-23 11:07:44 -03:00 |
|
Anton Georgiev
|
b1cfef4c1b
|
Pulled HTML5 locales April 17, 2020
|
2020-04-17 08:02:41 -04:00 |
|
sualko
|
6a5b9a98e2
|
add env to specify settings location
this would allow package maintaner to move config to /etc
see #9085
|
2020-04-16 17:06:52 +02:00 |
|
Tainan Felipe
|
425097d6ab
|
Replace legacy react lifecycle in the intl file
|
2020-04-15 11:20:07 -03:00 |
|
Anton Georgiev
|
3a1a23f91e
|
Georgian (ka.json) causes loops and other issues. Use ka_GE.json
By keeping ka.json uncommittable I can refrain from adding edge case handlers
|
2020-03-27 18:06:00 -04:00 |
|
Anton Georgiev
|
0efc79f0aa
|
Pulled HTML5 locales on March 27, 2020
Had to jump through hoops to add Georgian because Langmap does not have entry for 'ka' just for 'ka_GE'
|
2020-03-27 17:59:23 -04:00 |
|
KDSBrowne
|
e15e45b149
|
fix render loop after changing locale when override setting is set
|
2020-03-26 13:32:15 +00:00 |
|
Anton Georgiev
|
2e73d844fd
|
Pulled HTML5 locales, March 24, 2020
|
2020-03-25 16:18:19 -04:00 |
|
Anton Georgiev
|
606ca5887a
|
Revert "Merge pull request #8755 from KDSBrowne/fix-override-locale-loop"
This reverts commit 004d872584, reversing
changes made to ebdcf621b7.
|
2020-03-25 16:12:15 -04:00 |
|
Vitor Mateus
|
5b9aafd0d3
|
The presentation gets the size from the layout manager
|
2020-03-25 09:52:23 -03:00 |
|
KDSBrowne
|
c86988f92c
|
fix userlist / chat being opened after saving app settings
|
2020-03-24 15:06:02 +00:00 |
|
KDSBrowne
|
af14345185
|
fix render loop after changing locale when override setting is set
|
2020-03-11 13:55:41 +00:00 |
|
Chad Pilkey
|
cc07bfff20
|
fixed inconsitencies and usage of the idChatOpen Session variable
|
2020-03-05 15:14:22 -08:00 |
|
Anton Georgiev
|
d36c545706
|
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging
|
2020-03-04 23:41:18 +00:00 |
|
Vitor Mateus
|
ae560ca3eb
|
Create layout context and add a layout manager
|
2020-03-04 15:34:10 -03:00 |
|
Anton Georgiev
|
3754d0ab6f
|
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-master-feb-28-2020
|
2020-02-28 17:47:06 -05:00 |
|
Anton Georgiev
|
4b5c6c65e9
|
Merge pull request #8613 from antobinary/userId-stuff
Utilize Meteor session id instead of trusting client side meetingI…
|
2020-02-18 11:56:21 -05:00 |
|
Anton Georgiev
|
4b0452d1fd
|
Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb14-merge-2.2-into-master
|
2020-02-14 21:43:35 +00:00 |
|
Anton Georgiev
|
4e26af523f
|
Merge pull request #8639 from antobinary/locales-feb-14-2020
Pulled HTML5 locales Feb 14, 2020; Added Thai
|
2020-02-14 15:48:32 -05:00 |
|
Anton Georgiev
|
9c2797ecd6
|
Pulled HTML5 locales Feb 14, 2020; Added Thai
|
2020-02-14 15:46:33 -05:00 |
|
Anton Georgiev
|
1fa426058f
|
corrected issues related to publishing and methods
|
2020-02-13 14:19:29 -05:00 |
|