gcampes
|
947721250d
|
Adds the new layout for the user-list
|
2016-05-17 10:52:27 -03: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 |
|
perroned
|
642a4e45c5
|
Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton
Conflicts:
bigbluebutton-html5/imports/ui/components/app/AppService.js
|
2016-05-13 14:54:19 -05:00 |
|
perroned
|
6adaff0c44
|
Cleans lint
|
2016-05-13 11:31:06 -05:00 |
|
perroned
|
6a9ccb355f
|
Updates callServer arguments and passes credential object
|
2016-05-13 11:17:00 -05:00 |
|
perroned
|
544220f7c0
|
Updating import paths for new structure
|
2016-05-13 09:47:24 -05:00 |
|
perroned
|
d12c31e324
|
Moving components to structure
|
2016-05-13 09:39:10 -05:00 |
|
Anton Georgiev
|
8a6fc308da
|
avoid race cond when subscribing for data
|
2016-05-13 14:34:29 +00:00 |
|
perroned
|
d966aee2d7
|
Fixing paths for structure
|
2016-05-12 14:50:02 -05:00 |
|
perroned
|
3e0c3d1ee1
|
Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton
Conflicts:
bigbluebutton-html5/imports/ui/components/app/AppService.js
|
2016-05-12 14:30:46 -05:00 |
|
Anton Georgiev
|
ecd3b3de17
|
log in user properly
|
2016-05-12 19:22:51 +00:00 |
|
perroned
|
dc3dd43f1a
|
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
Conflicts:
bigbluebutton-html5/imports/api/polls/polls.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
|
2016-05-12 13:58:06 -05:00 |
|
Anton Georgiev
|
783f150442
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging
Conflicts:
bigbluebutton-html5/imports/startup/client/routes.js
|
2016-05-12 18:08:44 +00:00 |
|
Anton Georgiev
|
6a92c9400b
|
restructure modifiers and methods
|
2016-05-12 17:43:59 +00:00 |
|
perroned
|
3971bdb548
|
Lints
|
2016-05-12 11:10:43 -05:00 |
|
perroned
|
dff3dd2436
|
Moves serverCall to imports service api
|
2016-05-12 11:10:20 -05:00 |
|
perroned
|
f1f24acda8
|
Adds some services
|
2016-05-12 10:43:09 -05:00 |
|
perroned
|
666c96dab9
|
Adds server call wrapper to service
|
2016-05-12 10:41:51 -05:00 |
|
perroned
|
38d2bff789
|
Loads sip li. Adds audio tag
|
2016-05-11 15:43:07 -05:00 |
|
Anton Georgiev
|
699fde7344
|
accommodate for poll and deskshare
|
2016-05-10 20:25:24 +00:00 |
|
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 |
|