Anton Georgiev
|
298927cf4f
|
Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging
Conflicts:
bigbluebutton-html5/collections/collections.js
bigbluebutton-html5/imports/api/meetings/server/meetings.js
bigbluebutton-html5/imports/startup/server/collectionManagers/poll.js
bigbluebutton-html5/imports/startup/server/eventHandlers.js
bigbluebutton-html5/imports/startup/server/helpers.js
bigbluebutton-html5/imports/startup/server/meteorMethods/publishVoteMessage.js
bigbluebutton-html5/imports/startup/server/publish.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
bigbluebutton-html5/server/server.js
|
2016-05-10 19:39:01 +00:00 |
|
Anton Georgiev
|
45342b8a04
|
restructure; subscribe for remaining collections
|
2016-05-10 18:53:05 +00:00 |
|
perroned
|
84acf39fd3
|
Begins adding phone service
|
2016-05-10 10:54:55 -05:00 |
|
perroned
|
57add2fa50
|
rename poll -> polls.js
|
2016-05-10 10:34:13 -05:00 |
|
perroned
|
587627562c
|
Fixes some api structure
|
2016-05-10 10:23:22 -05:00 |
|
Anton Georgiev
|
bfd4afd07d
|
Users collection now available on client side
|
2016-05-09 21:19:45 +00:00 |
|
perroned
|
67115c0169
|
Begins adding deskshare functionality
|
2016-05-06 15:15:47 -05:00 |
|
perroned
|
3769c67534
|
Adds font control for settings
|
2016-05-05 16:15:15 -05:00 |
|