Luke Barnard
5990e41bd7
Use the correct userId when displaying who redacted a message
2017-10-25 17:24:45 +01:00
Stefan Parviainen
53e983f9c7
Fix merge conflict
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-25 18:19:27 +02:00
Andrey
45632b4191
Translated using Weblate (Russian)
...
Currently translated at 100.0% (907 of 907 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-25 15:48:44 +00:00
Michael Telatynski
fd7e057ec0
Merge branch 'develop' into t3chguy/invite_in_memberinfo
2017-10-25 16:33:50 +01:00
Weblate
f8229b7d59
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 14:52:56 +00:00
David Baker
8ed3474b64
Merge pull request #1529 from matrix-org/luke/fix-can-edit-editable-item-lists
...
Only show editing UI for aliases/related_groups for users /w power
2017-10-25 15:52:51 +01:00
Weblate
379dbe2ff5
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 14:47:22 +00:00
Luke Barnard
39fa866d68
Merge pull request #1535 from matrix-org/luke/fix-interactable-greyed-ui
...
Swap from `ui_opacity` to `panel_disabled`
2017-10-25 15:47:18 +01:00
Luke Barnard
b1f2a6c1e9
Dramatically simplify use of mx_fadable
...
by applying it to parent elements of things that need to be faded.
2017-10-25 15:15:49 +01:00
Weblate
9149475f1d
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 13:25:55 +00:00
David Baker
19364c25ee
Merge pull request #1536 from matrix-org/luke/fix-room-address-picker-default-name
...
Fix room address picker tiles default name
2017-10-25 14:25:51 +01:00
Weblate
0592f36d2b
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 13:10:06 +00:00
Luke Barnard
fbe0cc4927
Merge pull request #1531 from matrix-org/t3chguy/hide_level_change_on_50
...
T3chguy/hide level change on 50
2017-10-25 14:09:59 +01:00
Weblate
feff4e85d4
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 13:07:34 +00:00
Luke Barnard
813d0cd64c
Merge pull request #1537 from matrix-org/t3chguy/missing_date_sep
...
fix missing date sep caused by hidden event at start of day
2017-10-25 14:07:28 +01:00
Michael Telatynski
f3c8951d4e
remove unused lastPresenceTs
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 12:56:23 +01:00
Michael Telatynski
1bbc26a27f
fix missing date sep caused by hidden event at start of day
...
if first event in day was hidden, the date sep would go missing as the next event would compare its date to the hidden one instead of the one before it
due to naive N-1 check rather than a previous valid event comparison, now fixed by comparing date against the first event in MELS instead.
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 12:52:51 +01:00
Luke Barnard
27f845a7aa
Match on any alias
2017-10-25 12:42:58 +01:00
Luke Barnard
7029ab07fc
If no canonical alias, use first alias (and fallback to Unnamed)
2017-10-25 12:38:39 +01:00
Weblate
4775fffad9
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 11:09:22 +00:00
Luke Barnard
37b55984ec
Fix group Leave button tooltip
2017-10-25 12:09:13 +01:00
Luke Barnard
2f8f2ce76e
Swap from `ui_opacity` to `panel_disabled`
...
to simplify the process of disabling panels in the UI.
2017-10-25 11:23:51 +01:00
Weblate
dd4e1fd3b6
Merge remote-tracking branch 'origin/develop' into develop
2017-10-25 09:45:57 +00:00
Bamstam
1476af9c8f
Translated using Weblate (German)
...
Currently translated at 100.0% (905 of 905 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-25 09:45:57 +00:00
Richard Lewis
fd85c74bc5
Merge pull request #1520 from matrix-org/rxl881/deleteWidget
...
Add a delete confirmation dialog for widgets
2017-10-25 10:45:52 +01:00
Richard Lewis
2e3bdfd55d
Fix string indentation.
2017-10-25 10:45:17 +01:00
Michael Telatynski
b3463146ba
Add invite button to MemberInfo if user has left or wasn't in room
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-25 01:00:13 +01:00
Andrew (anoa)
9821f0d459
Fix linting
...
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-24 16:42:06 -07:00
Andrew (anoa)
f032284eff
Remember whether widget drawer was hidden per-room
...
Fixes #4850
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-24 16:28:10 -07:00
Bamstam
f64a5a3abd
Translated using Weblate (German)
...
Currently translated at 100.0% (905 of 905 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-24 22:12:53 +00:00
Ruben Barkow
afdc6b523e
Translated using Weblate (German)
...
Currently translated at 99.7% (903 of 905 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-24 22:12:19 +00:00
Michael Telatynski
5514d81683
Add Mention button to MemberInfo
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 23:01:40 +01:00
Michael Telatynski
c896dfb17b
delint
...
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 22:21:33 +01:00
Michael Telatynski
f813a752e7
only show change power level option in MemberInfo if we can actually
...
send m.room.power_level AND are lower PL than them
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-24 22:12:48 +01:00
Stefan Parviainen
88fd60066f
Fix typo
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 20:07:57 +02:00
Szimszon
b0d4fb09c6
Translated using Weblate (Hungarian)
...
Currently translated at 100.0% (905 of 905 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-24 17:48:58 +00:00
Stefan Parviainen
bc034f3083
Update strings
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 19:34:32 +02:00
Stefan Parviainen
b5024cca75
Further simplify MemberEventListSummary a bit
...
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-10-24 19:34:08 +02:00
Luke Barnard
e9ce7f97f5
canSetRelatedRooms -> canSetRelatedGroups
2017-10-24 17:57:26 +01:00
Stefan Parviainen
6406fc3865
Use plurals in WhoIsTyping
2017-10-24 18:32:50 +02:00
Stefan Parviainen
4ff369c884
Merge branch 'develop' into departify
2017-10-24 18:27:24 +02:00
Weblate
b2d5f4ce80
Merge remote-tracking branch 'origin/develop' into develop
2017-10-24 15:41:57 +00:00
Jan Kudrik
5d53f30619
Translated using Weblate (Czech)
...
Currently translated at 57.2% (518 of 905 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-24 15:41:56 +00:00
Luke Barnard
0463f0e581
Merge pull request #1530 from matrix-org/luke/fix-room-tile-highlighted-viewing-groups
...
When dispatching view_[my_]group[s], reset RoomViewStore
2017-10-24 16:41:52 +01:00
Luke Barnard
7b666af24c
When dispatching view_[my_]group[s], reset RoomViewStore
...
so that RoomTiles are not highlighted when the user is looking at MyGroups or GroupView
2017-10-24 16:32:52 +01:00
Andrey
2b0cb7e28e
Translated using Weblate (Russian)
...
Currently translated at 100.0% (905 of 905 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-24 15:26:51 +00:00
Luke Barnard
640d88f25d
Typo
2017-10-24 16:21:18 +01:00
Luke Barnard
ee7ebc425c
Only show editing UI for aliases/related_groups for users /w power
2017-10-24 16:19:09 +01:00
Weblate
cd3d6f9642
Merge remote-tracking branch 'origin/develop' into develop
2017-10-24 14:51:21 +00:00
Jan Kudrik
825e7eb8ab
Translated using Weblate (Czech)
...
Currently translated at 56.0% (507 of 905 strings)
Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-24 14:51:20 +00:00