David Baker 40680d55e0 Fix merge fail		2017-05-26 17:55:48 +01:00
..
async-components/views/dialogs	Bulk change counterpart imports	2017-05-25 11:39:08 +01:00
autocomplete	Bulk change counterpart imports	2017-05-25 11:39:08 +01:00
components	Merge remote-tracking branch 'origin/develop' into dbkr/translations	2017-05-26 17:30:02 +01:00
i18n/strings	Mismatched oneUser / severalUsers	2017-05-26 17:16:23 +01:00
utils	Group e2e keys into blocks of 4 characters	2017-05-22 12:01:09 +01:00
wrappers	…
AddThreepid.js	Bulk change counterpart imports	2017-05-25 11:39:08 +01:00
Avatar.js	…
BasePlatform.js	…
CallHandler.js	Put back default strings on dialogs	2017-05-25 18:20:48 +01:00
ContentMessages.js	Put back default strings on dialogs	2017-05-25 18:20:48 +01:00
DateUtils.js	Fix merge fail	2017-05-26 17:55:48 +01:00
Entities.js	…
HtmlUtils.js	…
ImageUtils.js	…
Invite.js	…
KeyCode.js	…
Lifecycle.js	Bulk change counterpart imports	2017-05-25 11:39:08 +01:00
Login.js	…
Markdown.js	…
MatrixClientPeg.js	…
Modal.js	…
Notifier.js	Missed OKs	2017-05-25 18:23:15 +01:00
ObjectUtils.js	…
PageTypes.js	…
PasswordReset.js	Bulk change counterpart imports	2017-05-25 11:39:08 +01:00
PlatformPeg.js	…
Presence.js	…
Resend.js	…
RichText.js	…
Roles.js	Change to object literal	2017-05-25 17:17:37 +01:00
RoomListSorter.js	…
RoomNotifs.js	…
Rooms.js	…
RtsClient.js	…
ScalarAuthClient.js	…
ScalarMessaging.js	Hopefully sort out strings with appended '.'s	2017-05-25 19:21:18 +01:00
SdkConfig.js	…
Skinner.js	…
SlashCommands.js	Hopefully sort out strings with appended '.'s	2017-05-25 19:21:18 +01:00
TabComplete.js	…
TabCompleteEntries.js	…
TextForEvent.js	Hopefully get translations with '.'s sorted	2017-05-25 19:43:34 +01:00
Tinter.js	…
UiEffects.js	…
UnknownDeviceErrorHandler.js	…
Unread.js	…
UserActivity.js	…
UserSettingsStore.js	Fix tests	2017-05-26 11:58:45 +01:00
Velociraptor.js	…
VelocityBounce.js	…
WhoIsTyping.js	Bulk change counterpart imports	2017-05-25 11:39:08 +01:00
createRoom.js	Put back default strings on dialogs	2017-05-25 18:20:48 +01:00
dispatcher.js	…
email.js	…
extend.js	…
index.js	Squash merge https://github.com/matrix-org/matrix-react-sdk/pull/801	2017-05-23 15:16:31 +01:00
languageHandler.js	Add function to display i18n keys in UI	2017-05-26 15:29:11 +01:00
linkify-matrix.js	…
phonenumber.js	…
ratelimitedfunc.js	…