Commit Graph

706 Commits

Author SHA1 Message Date
Oswaldo Acauan
d81cb28f35 Add new component button and some basic styles 2016-05-20 10:37:19 -03: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
dcce6d3122 set baseUrl to html5client/ 2016-05-09 19:19:52 +00:00
perroned
4a7938e1c0 Adds settings and styling 2016-05-06 12:46:14 -05:00
perroned
d602a66d7f Begins adding modals 2016-05-05 16:14:39 -05:00
Oswaldo Acauan
2d57d7cbed Rename Actionsbar and Navbar to ActionsBar and NavBar 2016-05-04 11:48:53 -03:00