Luke Barnard 87609582c6 Merge branch 'develop' into rte-fixes2 ...

Conflicts:
	package.json
	src/autocomplete/CommandProvider.js
	src/autocomplete/UserProvider.js
	src/components/structures/RoomView.js
	src/components/structures/UserSettings.js
	src/components/views/rooms/MessageComposerInput.js

2017-06-23 15:30:06 +01:00

..

Autocomplete.js

Merge branch 'develop' into rte-fixes2

2017-06-23 15:30:06 +01:00

AuxPanel.js

Fix translations on conf call banner

2017-06-09 22:06:43 +01:00

EntityTile.js

Merge pull request #1056 from matrix-org/kegan/translation-tamarin

2017-06-08 15:06:26 +01:00

EventTile.js

Use 12h timestamps when enabled in RR

2017-06-22 08:54:34 -06:00

ForwardMessage.js

make forward_message be friendly with the RVS stuffs

2017-06-16 16:12:52 +01:00

LinkPreviewWidget.js

Don't show null URL previews

2017-05-08 14:01:44 +01:00

MemberDeviceInfo.js

Add remaining translations!

2017-06-08 14:08:51 +01:00

MemberInfo.js

hit MemberInfo with Gemini to fix vector-im/riot-web#4223

2017-06-08 17:26:40 +01:00

MemberList.js

i18n invited, and delete stale warning

2017-06-01 01:29:07 +01:00

MemberTile.js

Add remaining translations!

2017-06-08 14:08:51 +01:00

MessageComposer.js

Merge branch 'develop' into kegan/translation-tamarin

2017-06-08 14:19:56 +01:00

MessageComposerInput.js

Merge branch 'develop' into rte-fixes2

2017-06-23 15:30:06 +01:00

MessageComposerInputOld.js

Merge pull request #1021 from Bitim/feature/rtl-languages-support

2017-06-08 14:43:18 +01:00

PresenceLabel.js

remove unused imports

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

ReadReceiptMarker.js

Use 12h timestamps when enabled in RR

2017-06-22 08:54:34 -06:00

RoomHeader.js

Merge pull request #1056 from matrix-org/kegan/translation-tamarin

2017-06-08 15:06:26 +01:00

RoomList.js

Internationalise the drop targets

2017-06-19 17:49:22 +01:00

RoomNameEditor.js

Merge pull request #1056 from matrix-org/kegan/translation-tamarin

2017-06-08 15:06:26 +01:00

RoomPreviewBar.js

Review comments

2017-06-08 14:45:59 +01:00

RoomSettings.js

remove mx_filterFlipColor from verified e2e icon so its not purple :/

2017-06-13 17:42:30 +01:00

RoomTile.js

Better RTL support

2017-06-03 18:52:45 +03:00

RoomTopicEditor.js

Better RTL support

2017-06-03 18:52:45 +03:00

SearchableEntityList.js

Bulk change counterpart imports

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

SearchResultTile.js

Combine data-scroll-token and -contained-scroll-tokens

2017-05-04 10:00:13 +01:00

SimpleRoomHeader.js

Remove unused collapse_rhs

2017-06-16 15:47:40 +01:00

TabCompleteBar.js

Rejig tab complete to make it faster

2016-07-15 16:10:27 +01:00

TopUnreadMessagesBar.js

Add remaining translations!

2017-06-08 14:08:51 +01:00

UserTile.js

Fix a bunch of linting errors

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