David Baker 75ef80ecd4 Merge remote-tracking branch 'origin/develop' into erikj/group_server

2017-06-23 09:51:24 +01:00

..

login

Fix race in registration for pusher config

2017-06-19 10:22:18 +01:00

ContextualMenu.js

Fix a bunch of linting errors

2017-01-20 14:22:27 +00:00

CreateRoom.js

fix missing translations and typos in i18n

2017-06-07 18:24:35 +01:00

FilePanel.js

Translate src/components/structures

2017-06-07 11:40:46 +01:00

GroupView.js

Add basic group view

2017-06-05 17:10:08 +01:00

InteractiveAuth.js

remove unused imports

2017-06-02 21:35:55 +01:00

LoggedInView.js

Merge remote-tracking branch 'origin/develop' into erikj/group_server

2017-06-23 09:51:24 +01:00

MatrixChat.js

Merge remote-tracking branch 'origin/develop' into erikj/group_server

2017-06-23 09:51:24 +01:00

MessagePanel.js

don't lose date seperator when the first event of the new day is redacted

2017-06-02 04:39:44 +01:00

NotificationPanel.js

Bulk change counterpart imports

2017-05-25 11:39:08 +01:00

RoomStatusBar.js

Translate src/components/structures

2017-06-07 11:40:46 +01:00

RoomView.js

Merge branch 'develop' into t3chguy/fix_forwarding

2017-06-19 01:53:35 +01:00

ScrollPanel.js

Revert "Save scroll state immediately before updating"

2017-06-19 13:19:17 +01:00

TimelinePanel.js

Add some logging around switching rooms

2017-06-07 22:41:02 +01:00

UploadBar.js

Translate src/components/structures

2017-06-07 11:40:46 +01:00

UserSettings.js

Merge pull request #1019 from matrix-org/t3chguy/updating_stuff

2017-06-22 17:36:55 +01:00