Commit graph

5878 commits

Author SHA1 Message Date
Krombel
653d5c7365 Translated using Weblate (German)
Currently translated at 99.6% (926 of 929 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-18 14:54:25 +00:00
David Baker
12d6722265 Re-run the fun 2017-10-18 15:48:33 +01:00
David Baker
474b0c96ad Merge pull request #1495 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk
Update from Weblate.
2017-10-18 15:19:24 +01:00
Weblate
15cadd864c Merge remote-tracking branch 'origin/develop' into develop 2017-10-18 14:18:25 +00:00
Luke Barnard
96cc74ab62 Attempt to relate a group to a room when adding it
So as to remove another step on "The Route To Flair" (the steps taken for a user to get flair to appear on their SenderProfile in a room).
2017-10-18 15:00:54 +01:00
Weblate
47dcf4849e Merge remote-tracking branch 'origin/develop' into develop 2017-10-18 09:13:05 +00:00
Walter
b211b9d344 Translated using Weblate (Russian)
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-18 09:13:04 +00:00
Luke Barnard
677c8e95ee Merge branch 'develop' into luke/groups-move-buttons 2017-10-18 10:31:54 +02:00
Weblate
dd33092985 Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 18:30:54 +00:00
David Baker
62a79d823d Merge pull request #1491 from matrix-org/luke/groups-fix-optional-profile-properties
Fix bug preventing partial group profile
2017-10-17 19:30:50 +01:00
Weblate
dc6f10ee7f Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 17:11:14 +00:00
Ramon Vilar
2b3a8cd365 Translated using Weblate (Catalan)
Currently translated at 4.5% (42 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ca/
2017-10-17 17:11:13 +00:00
Luke Barnard
df9e037bfc Default values when GETing instead of when POSTing 2017-10-17 18:11:00 +01:00
Luke Barnard
1b8c5b50db Don't show room IDs when picking rooms 2017-10-17 18:02:35 +01:00
Luke Barnard
3bbff627fc Fix bug preventing partial group profile
When updating the group profile, send empty strings instead of `null` as synapse does not expect `null`.
2017-10-17 17:26:34 +01:00
Luke Barnard
49b7525a67 Actually move the buttons in GroupView
- The "Leave" button is now in the top-right
 - The "Publish" button is not a checkbox
2017-10-17 16:10:34 +01:00
Luke Barnard
0415869b8c Add useful functions to GroupView to inspect user flags 2017-10-17 16:08:19 +01:00
Luke Barnard
626f007f4e Move membership section above long description textarea 2017-10-17 12:00:31 +01:00
Luke Barnard
7df3335570 Only show membership settings when editing 2017-10-17 11:59:52 +01:00
Luke Barnard
495465e865 Put invite accept/decline buttons in correct div to align them to the right 2017-10-17 11:59:16 +01:00
Weblate
68c02cad33 Merge remote-tracking branch 'origin/develop' into develop 2017-10-17 10:33:45 +00:00
Bamstam
ba160ffbd0 Translated using Weblate (German)
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-17 10:33:44 +00:00
Luke Barnard
85d99d429d Use correct logic operator 2017-10-17 09:49:39 +01:00
Szimszon
5686d8204a Translated using Weblate (Hungarian)
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-16 20:16:58 +00:00
Krombel
09070a7747 Translated using Weblate (German)
Currently translated at 99.8% (924 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-16 19:05:05 +00:00
Andrey
b7644a9595 Translated using Weblate (Russian)
Currently translated at 100.0% (925 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-16 17:28:06 +00:00
Luke Barnard
14eee9a37a Only show invited section if there are invited group members 2017-10-16 17:59:53 +01:00
Luke Barnard
0c34e943fb Merge branch 'develop' into luke/groups-are-communities 2017-10-16 17:34:06 +01:00
Weblate
8921eb903f Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 16:29:19 +00:00
Luke Barnard
760b3cc60a Merge pull request #1488 from matrix-org/luke/groups-invited-users
Show "Invited" section in the user list
2017-10-16 18:29:15 +02:00
Luke Barnard
9b08f4d11f Separate fetching indicator state 2017-10-16 17:21:05 +01:00
Weblate
88cc53f770 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 15:42:28 +00:00
Luke Barnard
008e8d4f54 Show "Invited" section in the user list 2017-10-16 16:38:32 +01:00
Luke Barnard
47ac0988ba Refactor class names for an entity tile being hovered over 2017-10-16 16:31:13 +01:00
Stefan Parviainen
9edcd0a9e5 Translated using Weblate (Finnish)
Currently translated at 78.8% (729 of 925 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2017-10-16 13:46:39 +00:00
Luke Barnard
eaa5dd5f22 Groups -> Communities in the UI
Translation files still need updating, and this would be much simpler with a script that could automate the tedium
2017-10-16 13:18:39 +01:00
Weblate
09b381bc82 Merge remote-tracking branch 'origin/develop' into develop 2017-10-16 09:17:50 +00:00
André Breda
b8aa9e8bc1 Translated using Weblate (Portuguese)
Currently translated at 94.3% (872 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
2017-10-16 09:17:50 +00:00
Bamstam
62897457fa Translated using Weblate (German)
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-16 09:17:50 +00:00
David Baker
e4a3309752 Merge pull request #1475 from matrix-org/luke/groups-room-directory-esque
Modify GroupView UI
2017-10-16 10:17:44 +01:00
Krombel
b230bb02b3 Translated using Weblate (German)
Currently translated at 99.8% (923 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 21:08:30 +00:00
Bamstam
b483b4f3a0 Translated using Weblate (German)
Currently translated at 99.7% (922 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:15:27 +00:00
Krombel
9a6bbf373b Translated using Weblate (German)
Currently translated at 99.6% (921 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:14:44 +00:00
Bamstam
851e278295 Translated using Weblate (German)
Currently translated at 99.4% (919 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:13:25 +00:00
Krombel
8f5cb598f0 Translated using Weblate (German)
Currently translated at 99.3% (918 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 20:12:33 +00:00
Andrey
bee1623ddc Translated using Weblate (Russian)
Currently translated at 100.0% (924 of 924 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-15 06:03:47 +00:00
Weblate
407233757e Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:47:19 +00:00
Matthew Hodgson
1d75d9e90d yet more horrifically strict linting :/ 2017-10-15 01:47:11 +01:00
Weblate
69881c4455 Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:19:14 +00:00
Matthew Hodgson
635996c083 more bizarrely strict linting :/ 2017-10-15 01:19:06 +01:00
Weblate
2f9e3104de Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:14:00 +00:00
Matthew Hodgson
247e32115f bizarrely strict linting :/ 2017-10-15 01:13:52 +01:00
Weblate
10019fb890 Merge remote-tracking branch 'origin/develop' into develop 2017-10-15 00:03:23 +00:00
Bamstam
b171636e1b Translated using Weblate (German)
Currently translated at 99.5% (917 of 921 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-15 00:03:22 +00:00
Matthew Hodgson
2b367edccf Merge pull request #1439 from turt2live/travis/pinned_messages
Message/event pinning
2017-10-15 01:03:18 +01:00
Weblate
dd948272c5 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:49:39 +00:00
Matthew Hodgson
40c682008b Merge pull request #1483 from turt2live/travis/fix-oct14
Remove duplicate declaration that breaks the build
2017-10-14 23:49:35 +01:00
Weblate
57296d03e8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:48:47 +00:00
Matthew Hodgson
67ba0e59a2 Merge pull request #1301 from zeroware/develop
Include magnet scheme in sanitize HTML params
2017-10-14 23:48:43 +01:00
Weblate
8f86a58261 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:45:53 +00:00
Matthew Hodgson
e57d9e686b Merge branch 'develop' into t3chguy/jump_to_rr 2017-10-14 23:45:17 +01:00
Weblate
a6a0fbfc91 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:43:16 +00:00
Matthew Hodgson
f32ba0b54c Merge pull request #1462 from pafcu/translation-fixes
Use standard subsitution syntax in _tJsx
2017-10-14 23:43:12 +01:00
Weblate
463e17b223 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:41:36 +00:00
Matthew Hodgson
71d25bf787 Merge pull request #1442 from turt2live/travis/no_grey
Don't suggest grey as a color scheme for a room
2017-10-14 23:41:32 +01:00
Travis Ralston
c55ffe1be7 Remove duplicate declaration that breaks the build
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:41:02 -06:00
Travis Ralston
8a641c7173 Hide message pinning behind a labs setting
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-14 16:40:10 -06:00
Travis Ralston
838b9957da Merge remote-tracking branch 'matrix-org/develop' into travis/pinned_messages 2017-10-14 16:33:46 -06:00
Weblate
3428c1c3d3 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 22:10:39 +00:00
Travis Ralston
c34b55c6c7 Merge branch 'develop' into travis/pinned_messages 2017-10-14 16:10:32 -06:00
Matthew Hodgson
d63a25a183 Merge branch 'develop' into t3chguy/hide_notification_body 2017-10-14 23:10:01 +01:00
Weblate
9051efeecf Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:44:35 +00:00
Matthew Hodgson
9f64261707 Merge branch 'develop' into travis/alone_warning 2017-10-14 22:43:36 +01:00
Weblate
dde0cc1baa Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:13:35 +00:00
Matthew Hodgson
3efa0d2a76 Merge pull request #1478 from turt2live/travis/unset-avatar
Buttons to remove room/self avatar
2017-10-14 22:13:32 +01:00
Matthew Hodgson
8d6f0db3e2 be explicit in remove button height 2017-10-14 22:13:00 +01:00
Weblate
538e0251ed Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:09:59 +00:00
Matthew Hodgson
0284a582a1 Merge pull request #1480 from matrix-org/t3chguy/fix_memberlist
T3chguy/fix memberlist
2017-10-14 22:09:55 +01:00
Weblate
fd6d1f0a75 Merge remote-tracking branch 'origin/develop' into develop 2017-10-14 21:06:20 +00:00
Andrey
6dad6da66e Translated using Weblate (Russian)
Currently translated at 94.8% (870 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-14 21:06:20 +00:00
Carlos Marques
8efeab924a Translated using Weblate (Portuguese)
Currently translated at 93.0% (853 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pt/
2017-10-14 21:06:19 +00:00
Bamstam
329e258122 Translated using Weblate (German)
Currently translated at 99.8% (916 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-14 21:06:19 +00:00
Michael Telatynski
c7c28c7ad2
make linter happy
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:53:08 +01:00
Michael Telatynski
c1edc0c32e
add option to disable BigEmoji
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 19:40:45 +01:00
Michael Telatynski
b0b7472901
undo bad merge
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:14:57 +01:00
Michael Telatynski
e79f9ef011
=== > ==
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:10:51 +01:00
Michael Telatynski
6ad8532bed
lowerCase query so that searching for Erik will actually find Erik..
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:09:58 +01:00
Michael Telatynski
a000439948
pass search query to filter fn in _updateList
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-10-14 17:09:30 +01:00
Travis Ralston
97ebd27175 Add missing translation
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 23:08:41 -06:00
Travis Ralston
6e7f0d649b Add option to unset your own avatar
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 21:13:47 -06:00
Travis Ralston
e5c8e3e7ad Add option to unset room avatar
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-13 20:57:15 -06:00
Luke Barnard
6f20445a42 Explain topic click stopPropagation 2017-10-13 17:57:28 +01:00
Luke Barnard
3468abc975 Use GeminiScrollbar instead of ScrollPanel 2017-10-13 17:49:52 +01:00
Szimszon
34e9b10e95 Translated using Weblate (Hungarian)
Currently translated at 100.0% (917 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-13 16:44:09 +00:00
Luke Barnard
4b24eab8fd Merge branch 'luke/groups-room-directory-esque' of github.com:matrix-org/matrix-react-sdk into luke/groups-room-directory-esque 2017-10-13 17:19:58 +01:00
Luke Barnard
aaf32ac9a0 Lint 2017-10-13 16:57:52 +01:00
Luke Barnard
83e7fc242a Merge branch 'develop' into luke/groups-room-directory-esque 2017-10-13 17:48:35 +02:00
Luke Barnard
77418f535e Modify GroupView UI
- Remove featured users/rooms
 - Add "Rooms" section to show all rooms in the group in a room-directory-esque list. This has a "+" button in "edit" mode.
 - Make the group view body scrollable
2017-10-13 16:46:33 +01:00
Weblate
a4cdbd5fd4 Merge remote-tracking branch 'origin/develop' into develop 2017-10-13 15:14:45 +00:00
Szimszon
f5abd1c2c8 Translated using Weblate (Hungarian)
Currently translated at 93.5% (858 of 917 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-13 15:14:44 +00:00