Stefan Parviainen 2c1618bc10 Fix conflict and update strings ...

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

2017-11-15 20:40:51 +01:00

..

login

Fix conflict and update strings

2017-11-15 20:40:51 +01:00

ContextualMenu.js

Support more positioning options on context menus

2017-10-14 21:43:47 -06:00

CreateRoom.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

FilePanel.js

Refactor i18n stuff a bit

2017-11-13 20:19:33 +01:00

GroupView.js

Pass plain components, rather than functions returning them

2017-11-14 20:09:52 +01:00

InteractiveAuth.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

LoggedInView.js

Merge branch 'develop' into travis/granular-settings

2017-11-07 14:55:12 -07:00

MatrixChat.js

Merge pull request #1516 from turt2live/travis/granular-settings

2017-11-15 10:55:55 +00:00

MessagePanel.js

Convert synced settings to granular settings

2017-10-29 01:43:52 -06:00

MyGroups.js

Refactor i18n stuff a bit

2017-11-13 20:19:33 +01:00

NotificationPanel.js

Dramatically simplify use of mx_fadable

2017-10-25 15:15:49 +01:00

RoomStatusBar.js

Refactor i18n stuff a bit

2017-11-13 20:19:33 +01:00

RoomView.js

Merge branch 'develop' into travis/granular-settings

2017-11-07 14:55:12 -07:00

ScrollPanel.js

Modify GroupView UI

2017-10-13 16:46:33 +01:00

TimelinePanel.js

Convert synced settings to granular settings

2017-10-29 01:43:52 -06:00

UploadBar.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

UserSettings.js

Split out avatar and display name hiding

2017-11-13 12:58:10 -07:00