Ghazi Triki ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master ... # Conflicts: # bigbluebutton-html5/imports/ui/services/audio-manager/index.js		2018-11-02 21:02:02 +01:00
..
acl	react-router removed, lots of code commented out, client loads	2018-10-03 16:14:10 +00:00
annotations	Fix Acl for cursor/annotations for pods	2018-08-01 10:21:44 -03:00
audio/client/bridge	Update sip.js	2018-10-24 16:26:20 -04:00
breakouts	Add intl to breakout room name	2018-10-29 16:29:45 -03:00
captions	rename function of skipFlashDirectEvent to processForHTML5ServerOnly	2018-04-13 16:26:58 -03:00
common/server	Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods	2018-07-24 17:20:37 -03:00
cursor	Fix Acl for cursor/annotations for pods	2018-08-01 10:21:33 -03:00
group-chat	handle SyncGetGroupChatsRespMsg and SyncGetGroupChatMsgsRespMsg messages	2018-08-08 13:42:45 -03:00
group-chat-msg	Fix not clearing pods and token when removing a meeting	2018-09-19 14:48:15 -03:00
log-client/server	Merge remote-tracking branch 'upstream/master' into upload-token	2018-09-11 16:17:38 -03:00
meetings	Merge remote-tracking branch 'upstream/master' into breakout-room-html5	2018-10-23 14:53:46 -03:00
polls
presentation-pods	Fix not clearing pods and token when removing a meeting	2018-09-19 14:48:15 -03:00
presentation-upload-token	Fix not clearing pods and token when removing a meeting	2018-09-19 14:48:15 -03:00
presentations	Fix not clearing pods and token when removing a meeting	2018-09-19 14:48:15 -03:00
screenshare	Linting.	2018-08-23 11:49:16 -04:00
slides	port flash code to js and implement initial work in zoom	2018-08-28 14:14:01 -03:00
users	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master	2018-11-01 14:00:54 +01:00
users-settings	configurable shortcuts available. close #6169	2018-10-31 15:51:56 -03:00
video/server	rename variable	2018-06-18 15:59:35 -03:00
voice-users	re-use function	2018-08-16 09:21:13 -03:00
whiteboard-multi-user	Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods	2018-07-24 17:20:37 -03:00