Ilya Daynatovich 323684c5fe fix conflicts after rebase

2016-10-26 15:51:09 -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

Fixes comments from review.

2016-10-25 15:18:56 -05:00

gum_overlay

ref(Overlay): introduce base class

2016-10-21 13:50:08 -05:00

invite

Fixes comments from review.

2016-10-25 15:18:56 -05:00

overlay

ref(Overlay): introduce base class

2016-10-21 13:50:08 -05:00

recording

Removes translateString and use translateElement.

2016-10-21 12:11:22 -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

Removes translateString and use translateElement.

2016-10-21 12:11:22 -05:00

side_pannels

Merge branch 'master' into translations-update

2016-10-21 13:19:23 -05:00

toolbars

Merge pull request #1059 from BeatC/toolbar-animation

2016-10-26 11:52:01 -05:00

util

fix conflicts after rebase

2016-10-26 15:51:09 -05:00

videolayout

fix conflicts after rebase

2016-10-26 15:51:09 -05:00

welcome_page

ESLint

2016-10-03 11:12:27 -05:00

UI.js

Ongoing work on video thumbnail layout

2016-10-26 15:51:09 -05:00

UIErrors.js

Addresses comment about Feedback dependency

2016-08-26 16:07:20 -05:00