Commit Graph

24 Commits

Author SHA1 Message Date
Anton Georgiev
6a984c2b68 adding captions support in html5 (part1) 2016-07-14 12:03:30 -07:00
Oswaldo Acauan
9b53090c81 Change Auth service to be a singleton class 2016-07-11 13:45:24 +00:00
Oswaldo Acauan
f39b7171af Move session/auth logic to separated services 2016-06-02 10:46:35 -03:00
gcampes
ce32ae5b20 Merge branch 'html5-new-userlist' into html-userlist 2016-05-31 08:37:14 -03:00
Anton Georgiev
02f03205a4 minor edit to handle voice events 2016-05-25 16:32:23 -03:00
perroned
c8fdf66099 Lints 2016-05-27 16:34:03 +00:00
perroned
393b49fdbe Cleans up duplicate code 2016-05-27 16:17:16 +00:00
perroned
b8ae3a5304 Fixes some imports 2016-05-26 20:01:49 +00:00
perroned
ef56169ebb Access sip function through window 2016-05-19 20:18:20 +00:00
perroned
e8229b1851 Some linting 2016-05-19 19:27:49 +00:00
perroned
3934ae3dce Adds some work for verto calling 2016-05-19 18:33:27 +00:00
perroned
428941f896 Hangs up from sip audio 2016-05-19 16:21:22 +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
955c27efcc Beginning to add exiting sip 2016-05-19 15:20:36 +00:00
perroned
4be18d2156 Updates client side data gathering for audio call 2016-05-18 19:29:28 +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
98aae7aade Changes collection imports 2016-05-16 13:05:44 -05:00
perroned
3b8c9c2971 Changing structure to /api/list/index.js 2016-05-12 14:04:00 -05: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
6a92c9400b restructure modifiers and methods 2016-05-12 17:43:59 +00:00
perroned
f1f24acda8 Adds some services 2016-05-12 10:43:09 -05:00
perroned
84acf39fd3 Begins adding phone service 2016-05-10 10:54:55 -05:00