Anton Georgiev
|
8d52dc1b40
|
Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging
Conflicts:
bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
bigbluebutton-html5/imports/startup/server/eventHandlers.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
|
2016-05-16 19:54:51 +00:00 |
|
Anton Georgiev
|
cbef1c4abd
|
split emitter.on; move to api
|
2016-05-16 19:12:49 +00:00 |
|
perroned
|
4adad8bb32
|
Changes credential passing to 1 object
|
2016-05-16 13:12:27 -05:00 |
|
perroned
|
98aae7aade
|
Changes collection imports
|
2016-05-16 13:05:44 -05:00 |
|
Anton Georgiev
|
a263c1388b
|
lint mostly
|
2016-05-16 14:35:59 +00:00 |
|
Anton Georgiev
|
6a92c9400b
|
restructure modifiers and methods
|
2016-05-12 17:43:59 +00:00 |
|
Anton Georgiev
|
45342b8a04
|
restructure; subscribe for remaining collections
|
2016-05-10 18:53:05 +00:00 |
|