Ghazi Triki
a2feb9bf5b
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
...
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
# bigbluebutton-client/branding/default/style/css/V2Theme.css
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
# bigbluebutton-html5/private/config/development/server/log.yaml
2018-01-23 12:27:42 +01:00
Anton Georgiev
44cf02424f
Adjust user guesStatus User property to handle join in BBB 2.1
...
Also add muteOnStart Meeting property and some logs for easier work on redis message handling
2018-01-11 15:05:19 -05:00
Oleksandr Zhurbenko
7871681448
Changed all the references of kick to remove, to be consistent
2018-01-09 14:28:48 -08:00
Oleksandr Zhurbenko
2de02c4f8d
Linting
2018-01-07 16:25:56 -08:00
Oleksandr Zhurbenko
4af6d30f6a
Switched from the broken 4commerce:env-settings package to native Meteor.settings
2018-01-07 16:24:05 -08:00
Oswaldo Acauan
eb4c89aefc
Fix bug when users re-validate after refresh
2017-12-19 10:19:47 -02:00
Oswaldo Acauan
62454b826b
Remove duplicated log
2017-12-13 16:20:29 -02:00
Anton Georgiev
64f2613818
send requesterId rather than userId on request to akka-aps
2017-11-24 17:03:17 -05:00
Anton Georgiev
a210f2476a
Merge pull request #4572 from KDSBrowne/z07-change-role-refactor
...
Change Role refactor
2017-10-27 13:22:41 -02:00
KDSBrowne
4899b88f27
change condition in changeRole logger message
2017-10-27 08:10:53 -07:00
KDSBrowne
ec0daac263
add return to presenterAssigned handler
2017-10-26 08:13:43 -07:00
KDSBrowne
fa4c96491c
remove meteor import
2017-10-25 12:05:29 -07:00
KDSBrowne
34313c6eaa
replace strings with constants
2017-10-25 12:00:31 -07:00
KDSBrowne
092839228b
make changeRole handle any role
2017-10-25 10:29:03 -07:00
Oleksandr Zhurbenko
6049223e3a
Fixed a typo
2017-10-23 16:16:54 -07:00
Tainan Felipe
5ac96e6979
solve merge issues
2017-10-23 13:47:14 -02:00
Tainan Felipe
873d227819
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
2017-10-13 10:35:38 -03:00
Oleksandr Zhurbenko
430ddc0d3b
Removing unnecessary 2x from the collections, publishers, subscriptions and logs
2017-10-12 12:07:02 -07:00
Tainan Felipe
4bda76c5bb
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
2017-10-12 15:36:52 -03:00
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
337f53e72b
Moved files up to api/
2017-10-11 18:09:35 -07:00
Klaus Klein
c627deca36
Move api to api/1.1
2017-06-19 08:57:32 -03:00
Oswaldo Acauan
e6412275a6
Linter auto fix
2017-06-02 19:25:02 +00:00
Anton Georgiev
250c6cdb8b
Merge pull request #3948 from KDSBrowne/x0-lint-Client
...
[HTML5] - Fix client lint issues
2017-05-25 13:57:04 -04:00
KDSBrowne
ff1a152f0b
remove new lines being rendered in log/development.log
2017-05-19 09:05:09 -07:00
Anton Georgiev
409a471ab5
bring catch clause on the same line as closing curly brace
2017-05-18 10:52:59 -04:00
Anton Georgiev
71d4e8b0e0
catch Meteor error on userLeaving
2017-05-17 15:17:27 -04:00
KDSBrowne
df76d33cba
set files permission to 644
2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c
Fix client lint issues except those which are comment related
2017-05-16 08:37:17 -07:00
Anton Georgiev
b9f75f88ae
Merge pull request #3928 from JaeeunCho/locked_status
...
HTML5 - added locked status for users
2017-05-12 12:56:53 -04:00
Anton Georgiev
b5601ecabc
fix issue with userLeave on breakout end
2017-05-12 09:14:26 -04:00
JaeeunCho
ca808195f2
HTML5 - added locked status for users
2017-05-10 14:02:50 -07:00
JaeeunCho
bd923e0f39
HTML5 - added locked status for users
2017-05-10 14:00:03 -07:00
Anton Georgiev
3904771fc3
if microphone lock is enforced, pick listenOnly join over using mic
2017-05-03 16:12:47 -04:00
Klauswk
30b7c3c1e4
Merge branch 'master' into AddServerCallback
2017-04-28 17:28:45 -03:00
Klaus Klein
31ae8854c9
Lint problems fixed
2017-04-28 17:01:02 -03:00
Anton Georgiev
ef0d2f5729
Merge pull request #3861 from antobinary/disallow-moderator-2
...
HTML5: demote html5 moderator user to viewer based on flag
2017-04-27 16:17:49 -04:00
Anton Georgiev
684f87e77a
demote html5 moderator user to viewer based on flag
2017-04-27 16:07:27 -04:00
Klaus Klein
d4917e975c
Review change
2017-04-26 17:07:22 -03:00
Klauswk
73fb753edb
Merge branch 'master' into FixAuthentication
2017-04-25 14:09:47 -03:00
Klaus Klein
6f564ba7b6
Fix auth and user kick, HTML5 closes #3844 #3828
2017-04-25 14:04:17 -03:00
Anton Georgiev
5b0454a11c
Merge pull request #3836 from Klauswk/FixAvatarIssue
...
Fix avatar issue in chat, HTML5 #3830
2017-04-19 17:25:58 -04:00
Klaus Klein
23d472bcde
Fix avatar issue in chat, HTML5 #3830
2017-04-19 14:11:13 -03:00
gcampes
0fd59394e7
remove unwanted debug, adds back log for error
2017-04-17 14:20:09 -03:00
gcampes
16c8497e36
Merge remote-tracking branch 'upstream/master' into unauthorized-page-fix
...
* upstream/master: (26 commits)
Fix lint issues
Fix lint issues
Fix a few lint problems
fix missing import causing breakouts to not work
Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded.
Fix poll options remain visible on html5, closes #3806 HTML5
- user internal userId instead of external userId in register user message
remove unnecessarily added svgs
updated icons to v11, adjusted few icons
Fix merge algoritm problem
set chat input color to gray (text-color)
Fixed user leave problem on private chat, close #3799 HTML5
align emojis horizontally
Check userId when validating token
Cleanup - remove extra > on meeting name on getRecording API response
Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint.
Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used.
improved logic for updating message-list
Change to fetch from chat system id, issue #3792 HTML5
Fix multiple welcome messages, issue #3792 HTML5
...
2017-04-17 14:15:40 -03:00
gcampes
832d916fd8
Fix unauthorized on slow connection
2017-04-17 14:14:31 -03:00
Klaus Klein
3ad7f9b5a0
Fix a few lint problems
2017-04-12 17:19:39 -03:00
Klauswk
9649f7523d
Merge branch 'master' into FixPrivateOfflineChatProblem
2017-04-12 08:33:07 -03:00
Anton Georgiev
a192eb5740
Merge pull request #3796 from Klauswk/FixWelcomeMessage
...
Fix multiple welcome messages, issue #3792 HTML5
2017-04-11 15:59:48 -04:00
Klaus Klein
419902cc8b
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-11 16:46:51 -03:00
