Oswaldo Acauan
2cf4bd3f5a
Merge conflicts
2016-11-10 15:13:02 +00:00
Oswaldo Acauan
c590f3ffd9
Merge branch 'rewrite-queue-handler' into refactor-meetings-api
...
* rewrite-queue-handler:
Remove left over debug
Fix chat being always inserted when the server start
Add debug message when handler is completed with errors
2016-10-21 16:57:01 +00:00
Oswaldo Acauan
e67c127e8f
Fix chat being always inserted when the server start
2016-10-21 16:54:17 +00:00
Oswaldo Acauan
c7b62a209c
Refactor Meeting API
2016-10-21 16:27:47 +00:00
Oswaldo Acauan
6676feb933
Fix bug on the clearChats and addChat modifiers
2016-10-21 11:56:03 +00:00
Oswaldo Acauan
a76ab6e7e6
Refactor API Slides
2016-10-21 11:41:17 +00:00
Oswaldo Acauan
1d30281cf2
Refactor server Chat API
2016-10-19 12:18:47 +00:00
Laily Ajellu
f0cdbfaf2e
Fixed merge conflicts
2016-08-23 16:45:28 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
Oleksandr Zhurbenko
331ad1e3c4
Fixed a bug when we couldn't retrieve the initial Chat history
...
Happened when meeting and chat messages appeared before the Meteor joined
2016-07-18 10:42:53 -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
Oleksandr Zhurbenko
8b4747a89d
Fixed all the 120+ linter warnings
2016-06-27 11:24:37 -07: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
Oswaldo Acauan
d642cb1c99
Add chat send message functionality
2016-06-02 15:40:27 -03:00
Anton Georgiev
9cf03a8ce8
move helpers; extract nodejsApp
2016-06-01 17:18:13 +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
6a92c9400b
restructure modifiers and methods
2016-05-12 17:43:59 +00:00