Oswaldo Acauan
e6412275a6
Linter auto fix
2017-06-02 19:25:02 +00:00
Oswaldo Acauan
fbe34b2ed3
Refactor of validate_auth_token and clearUsers
2017-02-23 18:15:08 +00:00
Oswaldo Acauan
edae8ea1be
Fix clear captions calls
2017-02-10 12:25:31 +00:00
Oswaldo Acauan
b4679bc601
Refactor Captions API
2017-01-18 12:53:33 +00:00
gcampes
655f8dd6d6
Fix merge conflicts
2016-11-23 13:33:51 -02:00
gcampes
0aa6022c89
Changes breakout code to handle the new message format
2016-11-23 13:32:04 -02:00
gcampes
bdb6780f7a
Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5
...
* upstream/master:
removed unecessary import statements
adjusted to meet component/container structure conventions and simplify code
Remove wrong commited files
Refactor API Cursor's
Fix bug related to presentation handlers
linting fixes & updated based on feedback
HTML5-clent messages on chat - changed icon for logged out users
fixed an error with exit audio
Added mute/unmute/join listen only/leave audio features to join audio modal
HTML5-client messages for logged out user on chat
HTML5-clent messages on chat
2016-11-21 10:53:55 -02:00
Oswaldo Acauan
b0e784ec60
Merge remote-tracking branch 'upstream/master' into refactor-api-shapes
...
* upstream/master:
Remove wrong commited files
Refactor API Cursor's
2016-11-18 17:35:53 +00:00
Oswaldo Acauan
529ff51a72
Refactor Shapes API
2016-11-18 17:35:28 +00:00
Oswaldo Acauan
b4f9d88fac
Refactor API Cursor's
2016-11-18 12:26:14 +00:00
Gabriel Carvalho de Campes
7cdf04dd66
update clear for meetings, adds breakouts
2016-11-17 13:20:40 -02:00
Anton Georgiev
8a377e0a18
adjust name of resource + function
2016-11-14 21:40:50 +00:00
Anton Georgiev
74cf17e812
Merge branch 'refactor-poll-api' of github.com:Gcampes/bigbluebutton into merge-osw-pr-1
2016-11-14 21:31:21 +00:00
Gabriel Carvalho de Campes
214357adc6
Fix conflicts
2016-11-14 14:54:04 -02:00
Oswaldo Acauan
1df46bb201
Refactor of Presentations API
2016-11-11 19:02:46 +00:00
Oswaldo Acauan
0d2225b79c
Clean up before PR
2016-10-24 11:20:30 +00:00
Oswaldo Acauan
c7b62a209c
Refactor Meeting API
2016-10-21 16:27:47 +00:00
Anton Georgiev
349b216928
omit hiredis package; cleanup
2016-08-29 21:34:03 +00:00
Laily Ajellu
f0cdbfaf2e
Fixed merge conflicts
2016-08-23 16:45:28 -07:00
Lajellu
19ff007adb
Changes logger to NPM package. Makes RedisPubSub and logger run after Meteor.startup
2016-08-19 14:08:46 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
Anton Georgiev
6a984c2b68
adding captions support in html5 (part1)
2016-07-14 12:03:30 -07: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
Anton Georgiev
7fb2184c02
fix querry for existing meetings
2016-06-13 21:39:31 +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
a637c29710
Fixes some paths
2016-05-19 15:19:42 +00:00
perroned
d83c96bf5d
Changes Meteor.config to an export
2016-05-18 20:19:50 +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