yanas c3e0d7ff56 Fix conflicts.		2016-11-03 14:42:23 -05:00
..
audio_levels	Fixes audio level algorithm.	2016-09-29 00:22:05 -05:00
authentication	Merge branch 'master' into translations-update	2016-10-21 13:19:23 -05:00
avatar	fix(Avatar): Avatar to return the local avatar when jid is null	2016-10-12 17:02:50 -05:00
etherpad	Adds an id to etherpad iframe.	2016-10-13 15:46:44 -05:00
feedback	Reports to close callback whether feedback is submitted.	2016-11-01 13:10:58 -05:00
gum_overlay	Added app substitution	2016-11-01 11:30:01 +02:00
invite	Fixes password set remotely text.	2016-10-31 14:40:46 -05:00
overlay	Rearrange overlay layout	2016-10-31 17:35:22 +02:00
recording	fix(Recording): broken stop recording dialog	2016-10-26 16:10:45 -05:00
reload_overlay	Merge branch 'master' into translations-update	2016-10-24 14:40:50 -05:00
ring_overlay	style(RingOverlay): Rename onAvatarDisplayed to onAvatarVisible	2016-10-19 15:58:36 -05:00
shared_video	Fixes undefined error and shared video.	2016-10-27 14:08:06 -05:00
side_pannels	Disables loading side panels when they are disabled.	2016-11-02 16:14:36 -05:00
toolbars	Restyled toolbar splitter	2016-11-02 12:13:30 +02:00
util	show/hide menu if elem hovered	2016-11-03 15:40:43 +02:00
videolayout	Fix conflicts.	2016-11-03 14:42:23 -05:00
welcome_page	ESLint	2016-10-03 11:12:27 -05:00
UI.js	Rename classname; Refactor click on video method	2016-11-03 12:13:03 +02:00
UIErrors.js	Addresses comment about Feedback dependency	2016-08-26 16:07:20 -05:00