perroned
|
d966aee2d7
|
Fixing paths for structure
|
2016-05-12 14:50:02 -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 |
|
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 |
|
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 |
|
Anton Georgiev
|
dcce6d3122
|
set baseUrl to html5client/
|
2016-05-09 19:19:52 +00:00 |
|
Anton Georgiev
|
76d599eb32
|
join route handled via localStorage
|
2016-05-06 19:12:28 +00: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
|
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 |
|
Anton Georgiev
|
0deaadfd87
|
Merge branch 'new-router' of github.com:oswaldoacauan/bigbluebutton into router-merging
Conflicts:
bigbluebutton-html5/client/MainContainer.jsx
bigbluebutton-html5/client/globals.js
bigbluebutton-html5/client/lib/bbb_api_bridge.js
bigbluebutton-html5/client/whiteboard_models/whiteboard_paper.js
bigbluebutton-html5/imports/ui/chat/Chat.jsx
bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
bigbluebutton-html5/imports/ui/userlist/UserListService.js
bigbluebutton-html5/imports/ui/whiteboard/EmojiContainer.jsx
bigbluebutton-html5/imports/ui/whiteboard/Slide.jsx
bigbluebutton-html5/imports/ui/whiteboard/UploaderControls.jsx
bigbluebutton-html5/imports/ui/whiteboard/WhiteboardControls.jsx
|
2016-05-04 22:04:08 +00:00 |
|
Anton Georgiev
|
fe8f73d592
|
linting
|
2016-05-04 21:49:01 +00:00 |
|
Anton Georgiev
|
0c6c73f891
|
extract event handlers from redispubsub. rename to camelCase
|
2016-05-04 20:25:34 +00:00 |
|
Anton Georgiev
|
7b0b3eb177
|
move files to imports
|
2016-05-04 18:29:43 +00:00 |
|
Anton Georgiev
|
863fcef7f6
|
extract logger, redispubsub; export all
|
2016-05-04 17:00:57 +00: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 |
|
Oswaldo Acauan
|
7d31eb43f9
|
Switch from ion-router to react-router
|
2016-04-28 15:57:14 -04:00 |
|