BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,617 Commits 13 Branches 260 Tags 1.1 GiB
fd874aa10a
Commit Graph

357 Commits

Author SHA1 Message Date
Anton Georgiev
97682d9162 Revert "Merge pull request #8759 from capilkey/2.2-join-fix" 
This reverts commit 5af41dabb4, reversing
changes made to 004d872584.
 2020-03-25 16:12:36 -04:00
Chad Pilkey
e9a73217da only join a user if the connection is still active 2020-03-11 13:40:50 -07:00
Chad Pilkey
6456ad0010 add meetingId to some server-side collection selectors 2020-03-04 07:54:32 -08:00
Anton Georgiev
1fa426058f corrected issues related to publishing and methods 2020-02-13 14:19:29 -05:00
Anton Georgiev
a8f4827af8 utilize Meteor connection id instead of trusting client side meetingId, userId 2020-02-06 15:48:16 -05:00
Anton Georgiev
4e1d55efd2 Prevent parallel screenshare and external-video 2019-12-18 16:40:04 -05:00
Tainan Felipe
957225fabf Rename collection to video-streams 2019-09-06 13:50:31 -03:00
Tainan Felipe
c27ff18958 Merge remote-tracking branch 'upstream/master' into video-performance 2019-09-06 10:16:22 -03:00
Tainan Felipe
060e82dddf Move hasStream to video-users collection 2019-09-05 15:29:30 -03:00
Anton Georgiev
7ec10d779a adjust flipped check for Moderator, isGuest, etc 2019-08-30 16:13:40 -04:00
Anton Georgiev
892336632f added "fields:{...}", removed most mapUser 2019-08-28 16:32:55 -04:00
Joao Siebel
132609414a Fix Clear All status icons action 
The problem was caused by a wrong parameter being passed down
to the function that set the emoji status for the user

close #7924
 2019-08-19 09:56:21 -03:00
Anton Georgiev
26da08c3a8
Merge pull request #7861 from Tainan404/userlist-rerendering 
Reduce Userlist Renderings
 2019-08-09 14:15:10 -04:00
Tainan Felipe
f2bc6553c8 Remove unnecessary variable 2019-07-30 14:13:47 -03:00
Tainan Felipe
1b2dff4b64 Remove moderator property 2019-07-30 10:56:20 -03:00
Tainan Felipe
a3b33a64a9 Remove leftovers 2019-07-30 10:09:03 -03:00
Tainan Felipe
73cf694a69 Reduce the amount of userlist renders 2019-07-30 09:03:10 -03:00
Tainan Felipe
b570c87d38 WIP 2019-07-29 11:29:31 -03:00
Joao Siebel
d556661873 save settings in a collection. close #7774 2019-07-29 11:17:38 -03:00
Chad Pilkey
cb58037ea1 fix crash from invalid online users 2019-07-08 19:04:12 +00:00
Anton Georgiev
f095f04fd3
Merge pull request #7702 from capilkey/fix-user-roles 
Clean up user roles
 2019-07-04 14:57:19 -04:00
Tainan Felipe
9df7ba1a1a
Merge branch 'master' into fix-user-leaving 2019-07-01 17:24:09 -03:00
Tainan Felipe
88cfb70255 Add ping-pong message to html5 client 2019-07-01 16:00:27 -03:00
Chad Pilkey
f0930e2d23 refactor user role management to follow proper format 2019-06-28 21:02:12 +00:00
Chad Pilkey
0de1d1d129 fix regression from #7606, handle roles correctly 2019-06-28 18:50:57 +00:00
Joao Siebel
cb22710917 update logging for settings changes 2019-06-27 14:01:14 -03:00
Anton Georgiev
5fb0c10ea6
Merge branch 'master' into issue-7556 2019-06-21 10:44:32 -04:00
Chad Pilkey
6e26a1c73d fix for voice-only users not appearing in the audio 2019-06-13 18:33:11 +00:00
Tainan Felipe
76bcdbc7dd Remove console 2019-06-12 15:05:25 -03:00
Tainan Felipe
d948a6a008 Add toast for webcam lock suggestion 2019-06-12 15:03:23 -03:00
Joao Siebel
8ba90b2121 Merge remote-tracking branch 'upstream/master' into network-indicator 2019-05-23 15:42:38 -03:00
Joao Siebel
a2d2dc332f fix a problem with local stream and update the code 2019-05-23 15:25:31 -03:00
Tainan Felipe
2f63c174a3 Fix youtube keeps playing audio when user left the meeting 2019-05-17 16:39:05 -03:00
Joao Siebel
fea22d5eef add flag to enable monitoring, correct who can see network problems and update logic 2019-05-09 18:25:29 -03:00
Joao Siebel
5ad451cfff prevent unnecessary network information update 2019-04-23 09:02:15 -03:00
Joao Siebel
c98db398fc Merge remote-tracking branch 'upstream/master' into network-indicator 2019-04-22 09:18:02 -03:00
Joao Siebel
08d177dac0 add initial network logic 2019-04-18 18:15:48 -03:00
Joao Siebel
dcbce93e7c add webcams data collector 2019-04-12 11:11:36 -03:00
Maxim Khlobystov
d7d69d1c98 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into user-information-lookup 2019-04-05 18:46:47 -04:00
Maxim Khlobystov
3fa22c6908 User information lookup feature in HTML5 client. 2019-04-05 18:32:21 -04:00
Joao Siebel
701911734b Merge remote-tracking branch 'upstream/master' into network-indicator 2019-03-25 09:52:33 -03:00
Anton Georgiev
3623b85258
Merge pull request #7015 from jfsiebel/user-inactivity-update 
Update inactivity modal
 2019-03-14 14:02:56 -04:00
Anton Georgiev
5fe8d6a2c0
Merge pull request #6930 from Tainan404/issue-6919 
Fix few breakout  room bugs.
 2019-03-14 13:05:54 -04:00
Tainan Felipe
eafd7f6673 Add user verification in 2 spots and Fiz join breakout opening into breakout 2019-03-14 13:45:20 -03:00
Joao Siebel
3cfc64ac89 Merge remote-tracking branch 'upstream/master' into user-inactivity-update 2019-03-14 09:29:52 -03:00
Joao Siebel
cb3763ca31 Adjust messages when removed or by inactivity. close #6911 close #6928 2019-03-12 15:02:52 -03:00
gustavotrott
e5c26c60ef Implement slow connection indicator 2019-03-11 21:34:34 -03:00
Chad Pilkey
9940846ff9 clean up issues introduced in #6869 2019-03-08 18:02:46 -08:00
Anton Georgiev
e174a2a197
Merge pull request #6869 from Tainan404/issue-6717 
Add pending/guest users waiting to approval panel
 2019-03-08 17:12:28 -05:00
Anton Georgiev
31acde212f reduce log noise for common benign events 2019-03-08 16:00:16 +00:00
Tainan Felipe
160c0669f8 Fix publishers access for moderators 2019-03-07 17:23:42 -03:00
Joao Siebel
b5929dc4b5 Add activity check modal 2019-02-26 14:40:01 -03:00
Tainan Felipe
3648afcf3f Add pending/guest users waiting to approval panel 2019-02-26 14:08:15 -03:00
Joao Siebel
681df8a546 handle user inactivity inspect on server 2019-02-21 18:09:44 -03:00
Anton Georgiev
827be6e9cd
Merge pull request #6806 from jfsiebel/stop-sync-video 
Stop external video sharing when current presenter leaves
 2019-02-20 13:24:18 -05:00
Anton Georgiev
40caed3924
Merge pull request #6734 from Tainan404/issue-6666 
Allow re-invite user that didn't joined in meeting
 2019-02-19 13:39:22 -05:00
Joao Siebel
4a7a7fd661 stop sharing video if presenter leaves. close #6596 2019-02-19 09:14:29 -03:00
Anton Georgiev
4b18d50b42 update npm packages versions 2019-02-13 19:44:21 +00:00
Anton Georgiev
a61e3e17d3
Revert "Fix error when user is not moderator" 2019-02-11 17:14:35 -05:00
Tainan Felipe
189d788744 Add verification for moderator and comments explaning pipe 2019-02-07 17:40:27 -02:00
Tainan Felipe
e4488b9769 Add breakoutProps to users collection 2019-02-07 15:56:33 -02:00
Tainan Felipe
a566fafcaa Allow re-invite user that didn't joined in meeting 2019-02-07 14:42:47 -02:00
Vitor Mateus
879c99be90 Fix error when user is not moderator 2019-02-07 12:01:03 -02:00
Joao Siebel
ba198e82c6 add unlock/lock individual attendee when the meeting is locked. close #6661 2019-01-29 13:17:09 -02:00
Vitor Mateus
a9989e1107 Fix chat alert (push and audio) #6430 2019-01-14 11:23:35 -02:00
Anton Georgiev
afa1a64e79 improve format of callbacks on collection document removal 2018-12-14 20:19:10 +00:00
João Francisco Siebel
8ce7f85dde add meetingId to filter results and avoid a bug with multiple meetings 2018-12-13 15:45:46 -02:00
João Francisco Siebel
e4eae33c8a implement setPresenterInPodReqMsg method as attempt to close #6109 and close #5941 2018-12-12 10:28:08 -02:00
Anton Georgiev
55f116cc95 revert presenter assign 6270 6326 2018-12-06 19:07:51 +00:00
João Francisco Siebel
ec91afdd58 simplify assignPresenter flow 2018-11-30 17:34:00 -02:00
João Francisco Siebel
877b9335b3 rename variable and add comments for better understanding 2018-11-20 18:14:17 -02:00
João Francisco Siebel
d8a2cb3883 set html5 client as pod presenter. close #6109 and close #5941 2018-11-20 17:44:05 -02:00
João Francisco Siebel
016efcc0eb Remove ACL from client side. close #6138 2018-11-05 17:30:37 -02:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.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/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
 2018-11-01 14:00:54 +01:00
Chad Pilkey
81983ae1e1 Stop HTML5 ejecting from voice on reconnect and fix voice user creation 2018-10-24 11:40:38 -07:00
João Francisco Siebel
74dfa52071 handle system messages on main public chat 2018-10-08 11:22:45 -03:00
Anton Georgiev
faac6a0d5d maintain array of user roles so they are unique 2018-09-25 19:24:43 +00:00
Anton Georgiev
68e02efe80 add missing Meeting const in addUser.js 2018-09-06 22:33:32 +00:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
Anton Georgiev
a0a46e5338 Merge branch 'akka-add-sync-voice-user' of github.com:jfsiebel/bigbluebutton into test-5983 2018-08-20 15:44:23 +00:00
Joao Siebel
c0b33de410 re-use function 2018-08-16 09:21:13 -03:00
Joao Siebel
445d710b2a handle SyncGetVoiceUsersRespMsg on meteor 2018-08-15 13:45:00 -03:00
Anton Georgiev
91b21540fa
Merge pull request #5970 from prlanzarin/html5-guest-always-accept 
Added support for ALWAYS_ACCEPT guest policy in the HTML5 client
 2018-08-14 15:00:06 -04:00
prlanzarin
71307e7b26 Added support for ALWAYS_ACCEPT guest policy in the HTML5 client 2018-08-10 19:30:17 +00:00
João Francisco Siebel
5a76eec168 remove chat collection and fix group chat messages subscription 2018-08-06 09:05:07 -03:00
Anton Georgiev
e64dbda4ce add check for logClient to handle media calls 2018-08-01 16:06:49 +00:00
Ghazi Triki
66a050b00b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0 
# Conflicts:
#	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
 2018-07-16 16:08:38 +01:00
Anton Georgiev
4dbe681a46 disable HTML5 waiting screen for guest approve 2018-07-11 12:46:44 +00:00
Anton Georgiev
eca2e50e1a Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current 2018-07-03 20:17:42 +00:00
Anton Georgiev
3414948f0e
Merge pull request #5795 from MaximKhlobystov/mod-only-message 
Moderator only message support.
 2018-07-03 11:48:08 -04:00
Maxim Khlobystov
4a7a3cfcf9 Clearing user system messages when adding a user. 2018-07-03 11:45:44 -04:00
Maxim Khlobystov
d7b99f5ed4 Cleanup. 2018-07-03 11:37:06 -04:00
Maxim Khlobystov
593a2ab744 Typo. 2018-07-03 11:31:00 -04:00
Maxim Khlobystov
efbc24db6f Add support for moderator only message. 2018-07-03 11:13:38 -04:00
Anton Georgiev
e2b86eb37c adjust guest status body params 2018-06-29 22:29:55 +00:00
Richard Alam
d891a4e85f Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch 2018-06-28 08:30:17 -07:00
Anton Georgiev
1e1e605d7a
Merge pull request #5722 from antobinary/breakouts-improvements-3 
Improvements to Breakouts on HTML5
 2018-06-27 12:35:16 -04:00
Anton Georgiev
79329d036a set dial-in clientType in html5 client 2018-06-26 20:50:03 +00:00
Anton Georgiev
e2e83e08df plug clientType in UserJoin* messages, not separate ones 2018-06-26 19:27:42 +00:00
Anton Georgiev
a6c693c93d add clientType in User and show it in api getMeeting* 2018-06-22 19:19:46 +00:00
Anton Georgiev
3546e49379 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into breakouts-improvements-3 2018-06-20 16:02:06 +00:00
Richard Alam
14327a1edf Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-branch 2018-06-19 12:58:51 -07:00
Anton Georgiev
634b7b34c7 avoid referencing null on user leave 2018-06-19 15:38:53 +00:00
Anton Georgiev
ad483dd0e5
Merge pull request #5702 from Tainan404/issue-5692 
Skip userLeaving when meeting is gone.
 2018-06-15 16:26:04 -04:00
Tainan Felipe
d5482651d9 rename variable 2018-06-15 17:24:03 -03:00
Tainan Felipe
f86d80c53d Remove skip userLeaving and change throw to log 2018-06-15 16:28:19 -03:00
Tainan Felipe
3884d45e5d skip userLeaving when meeting is ended 2018-06-15 15:16:05 -03:00
Anton Georgiev
7338086572 Do not auth validate Flash users (#5695) 
by @oswaldoacauan
 2018-06-14 17:24:55 -03:00
Richard Alam
a2eaa9babd Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch 
- some conflicts have been fixed.

The following needs working on:

       both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
        both modified:   ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml

Parking as need to work on something else.
 2018-06-06 08:23:13 -07:00
Bobak Oftadeh
136fa72a7e User list UI changes implemented 2018-05-29 12:23:13 -07:00
Anton Georgiev
2f0a33b738
Merge pull request #5296 from oswaldoacauan/fix-5183 
Sends a ejectUserFromVoice after removing a user
 2018-04-03 13:26:30 -04:00
João Francisco Siebel
2ff45a9d7f Rename function name to match his functionality 2018-04-02 14:08:25 -03:00
Oswaldo Acauan
04b98036e7 Sends a ejectUserFromVoice after removing a user 
Fix wrong linter change
 2018-04-02 11:42:13 -03:00
João Francisco Siebel
c598270663 Enforce authToken to re-joining users, resolve #5261 2018-03-29 09:10:30 -03:00
Anton Georgiev
07b867e52c
Merge pull request #5259 from oswaldoacauan/fix-ghost-and-reconnect-users 
Fix ghost and reconnecting users
 2018-03-19 14:07:46 -04:00
Oswaldo Acauan
16a61a891d Move userLeft out of subscription stop to socket close event. Closes #5240 2018-03-16 16:18:10 -03:00
Anton Georgiev
337bcd616c add logs to debug user join handler 2018-03-16 18:57:27 +00:00
Oswaldo Acauan
b03966d0d1 Close all user connections when removed 2018-02-20 12:02:04 -03:00
Oswaldo Acauan
8219c28084 Remove debug code 2018-02-20 11:59:47 -03:00
Oswaldo Acauan
2f741df97b Impl user-session based connections on server. Fix #5150 
Implement a connectionId for each user, each time a user try to validate we change their connectionId
and end all other connections of that user.
 2018-02-20 11:26:36 -03:00
Oleksandr Zhurbenko
607e2decad Removed a comment 2018-02-08 08:42:32 -08:00
Oleksandr Zhurbenko
894e2b94f2 Fixed exceptions thrown on PresenterAssignedEvtMsg event 2018-02-07 15:10:15 -08:00
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