Commit Graph

436 Commits

Author SHA1 Message Date
Oswaldo Acauan
71fb7abd70 Refactor stuns/turns handler 2016-11-03 13:33:14 +00:00
Matthew Marangoni
d21545c847 added html5 stun request and reply 2016-10-25 07:59:14 -07:00
Oswaldo Acauan
c7b62a209c Refactor Meeting API 2016-10-21 16:27:47 +00:00
Laily Ajellu
f0cdbfaf2e Fixed merge conflicts 2016-08-23 16:45:28 -07:00
Oleksandr Zhurbenko
f64ed1fd4a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning 2016-08-20 16:37:11 -07:00
Lajellu
8e7b1d6317 HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07:00
Oswaldo Acauan
afe1a66e02 Fix conflicts and merge master 2016-07-28 19:50:44 +00:00
Oswaldo Acauan
b8e4a2692c Add handlers for kick 2016-07-28 19:48:26 +00:00
Oswaldo Acauan
2c93c41fc5 Update handler payload check 2016-07-26 18:50:18 +00:00
Anton Georgiev
3e070872cf fix issue with slide calc under https 2016-07-26 17:33:35 +00:00
Anton Georgiev
6a984c2b68 adding captions support in html5 (part1) 2016-07-14 12:03:30 -07:00
Oswaldo Acauan
d1f2614d00 Fix merge conflicts 2016-07-05 16:50:14 +00:00
Oswaldo Acauan
55538202d6 Change chat message timestamp from string to int 2016-07-04 18:34:36 +00:00
Jaeeun Cho
9eacf32497 fixes html5 clinet logout and nav-bar 2016-06-28 15:30:43 -04:00
Oleksandr Zhurbenko
390935e304 Changed 'let' to 'const' where it was possible and adjusted imports 2016-06-27 14:48:46 -07:00
Oleksandr Zhurbenko
8b4747a89d Fixed all the 120+ linter warnings 2016-06-27 11:24:37 -07:00
Jaeeun Cho
3325ac4974 fixes html5 clinet logout and nav-bar 2016-06-24 10:48:09 -04:00
Jaeeun Cho
73c9898698 fixes html5 clinet logout and nav-bar 2016-06-17 18:15:11 -04:00
Richard Alam
424de0f2f9 Merge pull request #3161 from antobinary/captions
recover caption funct; prepare akka-apps for captions on bbb-html5
2016-06-02 17:02:03 -04:00
Oswaldo Acauan
b77b8ce971 Fix Welcome message not being parsed 2016-06-02 16:34:17 -03:00
Anton Georgiev
9cf03a8ce8 move helpers; extract nodejsApp 2016-06-01 17:18:13 +00:00
perroned
8117f91ec9 Fixes some imports 2016-05-19 16:14:12 +00:00
perroned
97c94ecace Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
Conflicts:
	bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js
	bigbluebutton-html5/imports/api/phone/index.js
	bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js
2016-05-19 15:47:47 +00:00
perroned
d83c96bf5d Changes Meteor.config to an export 2016-05-18 20:19:50 +00:00
perroned
66a391c191 Updates server function to use new argument 2016-05-18 19:31:20 +00:00
Anton Georgiev
eea6bc0829 adjust path of collections 2016-05-16 20:26:24 +00:00
Anton Georgiev
8d52dc1b40 Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging
Conflicts:
	bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
	bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
	bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
	bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
	bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
	bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
	bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
	bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
	bigbluebutton-html5/imports/startup/server/eventHandlers.js
	bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-16 19:54:51 +00:00
Anton Georgiev
cbef1c4abd split emitter.on; move to api 2016-05-16 19:12:49 +00: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
Anton Georgiev
a263c1388b lint mostly 2016-05-16 14:35:59 +00:00
Anton Georgiev
57352f193c rework users publish 2016-05-13 16:11:44 +00:00
Anton Georgiev
ecd3b3de17 log in user properly 2016-05-12 19:22:51 +00:00
Anton Georgiev
6a92c9400b restructure modifiers and methods 2016-05-12 17:43:59 +00:00
Anton Georgiev
45342b8a04 restructure; subscribe for remaining collections 2016-05-10 18:53:05 +00:00
Anton Georgiev
bfd4afd07d Users collection now available on client side 2016-05-09 21:19:45 +00:00