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 |
|
Anton Georgiev
|
bfd4afd07d
|
Users collection now available on client side
|
2016-05-09 21:19:45 +00:00 |
|
Anton Georgiev
|
dcce6d3122
|
set baseUrl to html5client/
|
2016-05-09 19:19:52 +00:00 |
|
perroned
|
67115c0169
|
Begins adding deskshare functionality
|
2016-05-06 15:15:47 -05:00 |
|
Anton Georgiev
|
76d599eb32
|
join route handled via localStorage
|
2016-05-06 19:12:28 +00:00 |
|
perroned
|
4a7938e1c0
|
Adds settings and styling
|
2016-05-06 12:46:14 -05:00 |
|
Anton Georgiev
|
b95c380b56
|
working on join route
|
2016-05-06 15:34:00 +00:00 |
|
Maxim Khlobystov
|
67bb61c975
|
Code style cleanup.
|
2016-05-05 18:30:57 -04:00 |
|
perroned
|
1f3fcf611f
|
Fixes button import path
|
2016-05-05 16:15:32 -05:00 |
|
perroned
|
d602a66d7f
|
Begins adding modals
|
2016-05-05 16:14:39 -05:00 |
|
perroned
|
f8893d61da
|
Cleans polling
|
2016-05-05 14:50:11 -05:00 |
|
perroned
|
e9b5e11ac2
|
Begins adding polling component
|
2016-05-05 13:50:18 -05:00 |
|
Oswaldo Acauan
|
2d57d7cbed
|
Rename Actionsbar and Navbar to ActionsBar and NavBar
|
2016-05-04 11:48:53 -03:00 |
|
Oswaldo Acauan
|
ddd38c57ac
|
Add i18n, modular layouts and basic styles
|
2016-05-03 17:40:46 -03:00 |
|
Oswaldo Acauan
|
01860a8804
|
Add basic styles for new design
|
2016-05-02 19:42:54 -03:00 |
|