PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
7253 commits 1 branch 0 tags 338 MiB
Commit graph

7253 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Luke Barnard
e9ce7f97f5 canSetRelatedRooms -> canSetRelatedGroups 2017-10-24 17:57:26 +01: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
David Baker
f7dce8ec70 Merge pull request #1528 from matrix-org/luke/groups-settings-privileged-only 
Prevent editing of UI requiring user privilege if user unprivileged
 2017-10-24 15:51:16 +01:00
Weblate
dc7037b4fa Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 14:31:54 +00:00
David Baker
9e54002983 Merge pull request #1526 from matrix-org/luke/fix-group-rooms-guest-can-join- 
Use the correct property of the API room objects
 2017-10-24 15:31:49 +01:00
Luke Barnard
459ffc47d6 Prevent editing of UI requiring user privilege if user unprivileged 2017-10-24 15:25:35 +01:00
Weblate
78f1f5bae8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 13:40:30 +00:00
David Baker
8b4b3565a7 Merge pull request #1527 from matrix-org/dbkr/geni18n-no-other 
Don't include the |other in the translation value
 2017-10-24 14:40:25 +01:00
David Baker
8447d15013 Don't include the |other in the translation value 2017-10-24 14:26:30 +01:00
Weblate
433d62e48c Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 12:56:47 +00:00
David Baker
def3bcce5f Merge pull request #1525 from matrix-org/dbkr/rerun_i18n 
Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521
 2017-10-24 13:56:42 +01:00
Luke Barnard
e955d27b5f Use the correct property of the API room objects 2017-10-24 13:47:10 +01:00
David Baker
f9c45d2c45 Re-run gen-i18n after fixing https://github.com/matrix-org/matrix-react-sdk/pull/1521 2017-10-24 13:40:44 +01:00
Weblate
e9eb4a4647 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:18:07 +00:00
David Baker
ba46faf1b1 Merge pull request #1522 from matrix-org/luke/fix-group-react-warnings 
Fix some react warnings in GroupMemberList
 2017-10-24 11:18:03 +01:00
Weblate
870babb71e Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:15:55 +00:00
David Baker
93fca8439e Merge pull request #1521 from matrix-org/dbkr/geni18n-addplural 
Fix bug with gen-i18n/js when adding new plurals
 2017-10-24 11:15:51 +01:00
Weblate
7a9908da60 Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 10:05:18 +00:00
David Baker
f29f627c31 Merge pull request #1524 from matrix-org/luke/groups-store-true-global 
Make GroupStoreCache global for cross-package access
 2017-10-24 11:05:14 +01:00
Luke Barnard
d1db0d6426 Deduplicate members, key by userId 2017-10-24 10:50:31 +01:00
Weblate
436fc95cdb Merge remote-tracking branch 'origin/develop' into develop 2017-10-24 09:40:42 +00:00
Tirifto
2e7df425b9 Translated using Weblate (Esperanto) 
Currently translated at 4.5% (41 of 905 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2017-10-24 09:40:41 +00:00
Luke Barnard
353744b7f7 Merge pull request #1523 from matrix-org/luke/fix-group-rooms 
Add fields needed by RoomDetailList to groupRoomFromApiObject
 2017-10-24 10:40:37 +01:00
Luke Barnard
3ae31dd426 Make GroupStoreCache global for cross-package access 2017-10-24 10:39:47 +01:00
David Baker
46e9d4197a Use the 'and' feature! 2017-10-24 10:21:41 +01:00
Luke Barnard
e419446081 Add fields needed by RoomDetailList to groupRoomFromApiObject 
and also alter props API for RDL to match the returned rooms.
(This doesn't affect RoomDirectory - this does not use RDL (yet))
 2017-10-24 10:13:38 +01:00