Stefan Parviainen 2c1618bc10 Fix conflict and update strings ...

Signed-off-by: Stefan Parviainen <pafcu@iki.fi>

2017-11-15 20:40:51 +01:00

..

AppsDrawer.js

showWidget->hideWidgetDrawer and remove logs

2017-10-26 11:27:58 -07:00

Autocomplete.js

Merge branch 'develop' into travis/granular-settings

2017-11-03 22:00:07 -06:00

AuxPanel.js

Fix conflict and update strings

2017-11-15 20:40:51 +01:00

EntityTile.js

Indicate admins in the group member list with a sheriff badge

2017-11-06 16:37:16 +00:00

EventTile.js

De-partify SenderProfile

2017-10-16 20:53:43 +02:00

ForwardMessage.js

Swap from ui_opacity to panel_disabled

2017-10-25 11:23:51 +01:00

LinkPreviewWidget.js

Use correct icon for group room deletion and make themeable

2017-10-26 14:05:58 +01:00

MemberDeviceInfo.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

MemberInfo.js

Attempt to clarify the affect that the users_default has on power levels

2017-11-13 17:03:48 +00:00

MemberList.js

undo bad merge

2017-10-14 17:14:57 +01:00

MemberTile.js

Indicate admins in the group member list with a sheriff badge

2017-11-06 16:37:16 +00:00

MessageComposer.js

Merge branch 'develop' into travis/granular-settings

2017-11-14 19:12:48 -07:00

MessageComposerInput.js

Merge branch 'develop' into travis/granular-settings

2017-11-07 14:55:12 -07:00

PinnedEventsPanel.js

Default to no read pins if there is no applicable account data

2017-11-07 11:14:27 -07:00

PinnedEventTile.js

yet more horrifically strict linting :/

2017-10-15 01:47:11 +01:00

PresenceLabel.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

ReadReceiptMarker.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

RoomDetailList.js

Disable RoomDetailList in GroupView when editing

2017-11-07 16:54:28 +00:00

RoomHeader.js

Merge branch 'develop' into travis/granular-settings

2017-11-07 14:55:12 -07:00

RoomList.js

Pass plain components, rather than functions returning them

2017-11-14 20:09:52 +01:00

RoomNameEditor.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

RoomPreviewBar.js

Refactor i18n stuff a bit

2017-11-13 20:19:33 +01:00

RoomSettings.js

Fix conflict and update strings

2017-11-15 20:40:51 +01:00

RoomTile.js

Convert synced settings to granular settings

2017-10-29 01:43:52 -06:00

RoomTopicEditor.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

SearchableEntityList.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

SearchResultTile.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

SimpleRoomHeader.js

Add rule to enforce spacing in curly brackets in JSX children

2017-09-28 11:21:06 +01:00

TopUnreadMessagesBar.js

Run eslint --fix

2017-10-11 17:56:17 +01:00

UserTile.js

Run eslint --fix

2017-10-11 17:56:17 +01:00