David Baker 7469a9ae2a Merge remote-tracking branch 'origin/develop' into dbkr/group_userlist

2017-07-25 17:20:16 +01:00

..

login

q(...) -> Promise.resolve

2017-07-12 18:05:08 +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

_loadGroupFromServer doesn't return a promise

2017-07-21 14:41:29 +01:00

InteractiveAuth.js

remove unused imports

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

LoggedInView.js

Add user list to groups

2017-07-25 15:56:16 +01:00

MatrixChat.js

replace q method calls with bluebird ones

2017-07-12 18:05:40 +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

MyGroups.js

PR feedback

2017-07-07 18:34:40 +01:00

NotificationPanel.js

Bulk change counterpart imports

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

RoomStatusBar.js

Remove references to tabComplete, which are now redundant

2017-07-13 10:16:59 +01:00

RoomView.js

Merge pull request #1213 from matrix-org/rav/bluebird

2017-07-13 12:06:11 +01:00

ScrollPanel.js

Manual fixup for remaining q incantaions

2017-07-12 18:05:40 +01:00

TimelinePanel.js

q(...) -> Promise.resolve

2017-07-12 18:05:08 +01:00

UploadBar.js

Translate src/components/structures

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

UserSettings.js

Implement disabled-by-default setting for auto-replacement of plaintext emojis

2017-07-13 17:37:43 +01:00