Luke Barnard 619830617a Merge branch 'develop' into luke/ilag-i18n ...

In order to get ILAG internationalised

Conflicts:
	src/components/structures/LoggedInView.js
	src/components/structures/MatrixChat.js
	src/components/views/dialogs/ChatCreateOrReuseDialog.js
	src/components/views/dialogs/SetDisplayNameDialog.js
	src/createRoom.js
	src/i18n/strings/en_EN.json

2017-06-05 16:08:03 +01:00

..

login

Merge branch 'develop' into luke/ilag-i18n

2017-06-05 16:08:03 +01:00

ContextualMenu.js

Fix a bunch of linting errors

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

CreateRoom.js

Bulk change counterpart imports

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

FilePanel.js

More i18n strings (#963)

2017-05-30 15:09:57 +01:00

InteractiveAuth.js

Just return the promise if it's a bg request

2017-03-22 11:25:33 +00:00

LoggedInView.js

Merge branch 'develop' into luke/ilag-i18n

2017-06-05 16:08:03 +01:00

MatrixChat.js

Merge branch 'develop' into luke/ilag-i18n

2017-06-05 16:08:03 +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

Bulk change counterpart imports

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

RoomView.js

Introduce state peekLoading to avoid collision with roomLoading

2017-06-05 09:52:39 +01:00

ScrollPanel.js

Separate predicates for RM/RR

2017-05-09 17:36:19 +01:00

TimelinePanel.js

allow hiding redactions. no point onAccountData as it'd cause a full

2017-06-02 04:23:07 +01:00

UploadBar.js

Unregister the UploadBar event listener on unmount

2017-03-16 14:19:17 +00:00

UserSettings.js

Merge branch 'develop' into luke/ilag-i18n

2017-06-05 16:08:03 +01:00