Commit graph

8383 commits

Author SHA1 Message Date
Stefan Parviainen
d6f1e12bee Fix merge conflict
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:50:45 +01:00
Weblate
ccf4150b43 Merge remote-tracking branch 'origin/develop' into develop 2017-11-01 11:44:33 +00:00
Bamstam
ec260fb70c Translated using Weblate (German)
Currently translated at 100.0% (913 of 913 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-01 11:44:32 +00:00
Luke Barnard
44aea85792
Merge pull request #1562 from matrix-org/luke/redact-group-ids
Redact group IDs from analytics
2017-11-01 11:44:27 +00:00
Luke Barnard
047bf6e4dd Redact group IDs from analytics 2017-11-01 11:30:25 +00:00
Bamstam
9ee7a2ea70 Translated using Weblate (German)
Currently translated at 100.0% (913 of 913 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-31 23:44:18 +00:00
Andrey
1faf6770b7 Translated using Weblate (Russian)
Currently translated at 100.0% (913 of 913 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-31 19:12:38 +00:00
Weblate
8cace59088 Merge remote-tracking branch 'origin/develop' into develop 2017-10-31 17:29:42 +00:00
Kévin C
33cffdae7a Translated using Weblate (French)
Currently translated at 91.3% (834 of 913 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-10-31 17:29:41 +00:00
Jan Kudrik
f4d277fbd0 Translated using Weblate (Czech)
Currently translated at 70.0% (640 of 913 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-31 17:29:41 +00:00
David Baker
273aae207a
Merge pull request #1560 from matrix-org/luke/groups-expose-ready-state
Display whether the group summary/room list is loading
2017-10-31 17:29:36 +00:00
Richard Lewis
17c0405862 Restructure to pass props from componentWillRecieveProps. 2017-10-31 16:31:46 +00:00
Luke Barnard
16dca08b77 Use constants instead of string literals 2017-10-31 16:13:13 +00:00
Szimszon
73f3aa8680 Translated using Weblate (Hungarian)
Currently translated at 100.0% (913 of 913 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-31 16:02:50 +00:00
Antoine Proulx
f1ac0f5c75 Translated using Weblate (French)
Currently translated at 89.5% (818 of 913 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-10-31 14:49:52 +00:00
Luke Barnard
5bfed67463 Merge branch 'luke/groups-expose-ready-state' of github.com:matrix-org/matrix-react-sdk into luke/groups-expose-ready-state 2017-10-31 14:25:10 +00:00
Luke Barnard
d6cbc44e0f If groupRoomsLoading, replace RoomDetailList entirely with Spinner 2017-10-31 14:21:00 +00:00
Weblate
13d418fd8e Merge remote-tracking branch 'origin/develop' into develop 2017-10-31 13:27:43 +00:00
David Baker
f24c64f071
Merge pull request #1558 from matrix-org/luke/fix-client-side-validation-group-id
Change client-side validation of group IDs to match synapse
2017-10-31 13:27:38 +00:00
Luke Barnard
45e15fd865
Merge branch 'develop' into luke/groups-expose-ready-state 2017-10-31 11:50:12 +00:00
Luke Barnard
302bd6c3e9 Escape dash in regex 2017-10-31 11:48:56 +00:00
Weblate
465b95defe Merge remote-tracking branch 'origin/develop' into develop 2017-10-31 11:47:23 +00:00
Luke Barnard
a7170ef73c
Merge pull request #1559 from matrix-org/luke/fix-block-group-settings-if-non-member
Prevent non-members from opening group settings
2017-10-31 11:47:18 +00:00
Luke Barnard
775468e71a Display whether the group summary/room list is loading
This uses a `ready` flag assigned to each fetching API used by the GroupServer. I've avoided making this generic for now for want of not doing so early.
2017-10-31 11:42:09 +00:00
Luke Barnard
20bf69c3c2 Prevent non-members from opening group settings 2017-10-31 10:54:44 +00:00
Richard Lewis
758df29b23 Fix onLoad on wrong element. 2017-10-31 10:43:17 +00:00
Richard Lewis
35b33263ea Use querystring lib 2017-10-31 10:37:40 +00:00
Luke Barnard
f53a12d904 Generate en_EN translations 2017-10-31 10:25:48 +00:00
Luke Barnard
53938f7998 Change client-side validation of group IDs to match synapse 2017-10-31 10:25:06 +00:00
Richard Lewis
6012b35acf Use querystring lib instead of URLSearchParams 2017-10-31 10:22:58 +00:00
Richard Lewis
355d69b024 Add querystring dep. already used by things like url_utils.js. 2017-10-31 10:15:30 +00:00
Richard Lewis
1cb878bb57 Formatting 2017-10-31 10:04:37 +00:00
Richard Lewis
648b295971 Removed comment 2017-10-31 10:04:02 +00:00
Travis Ralston
6f8523081b Some documentation
Far from complete, and probably needs a bit of work, but it's a start.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 21:09:24 -06:00
Travis Ralston
f070604350 Rename SettingsCheckbox to be a bit more generic
Splitting out the logic to two components doesn't make sense, but this isn't always a checkbox.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 20:08:27 -06:00
Travis Ralston
3efb0fdeeb Support default theme at config level
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 19:53:36 -06:00
Travis Ralston
9c846e4dd9 Fix URL preview options
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-30 19:49:44 -06:00
Weblate
c8b5a0068c Merge remote-tracking branch 'origin/develop' into develop 2017-10-30 18:23:15 +00:00
David Baker
deebd4cbcf
Merge pull request #1556 from matrix-org/luke/groups-disinvite
Alter UI for disinviting a group member
2017-10-30 18:23:11 +00:00
Luke Barnard
4e234cfc3b Alter UI for disinviting a group member
The same API as kicking is used for disinviting, so only cosmetic changes needed here.
2017-10-30 18:17:35 +00:00
Weblate
1c71b72ff8 Merge remote-tracking branch 'origin/develop' into develop 2017-10-30 18:03:28 +00:00
Bamstam
27558b7d4b Translated using Weblate (German)
Currently translated at 100.0% (912 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-30 18:03:27 +00:00
Luke Barnard
19b798be10
Merge pull request #1555 from matrix-org/luke/groups-fix-admin-tools
Only show admin tools to privileged users
2017-10-30 18:03:24 +00:00
Weblate
839d0dd5d5 Merge remote-tracking branch 'origin/develop' into develop 2017-10-30 17:28:06 +00:00
Bamstam
36d5c58426 Translated using Weblate (German)
Currently translated at 100.0% (912 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-30 17:28:06 +00:00
Luke Barnard
c655e82867
Merge pull request #1550 from matrix-org/dbkr/try_lowercase_username
Try lowercase username on login
2017-10-30 17:28:00 +00:00
David Baker
5ea19e2751 Log errors from other login attempts 2017-10-30 17:15:27 +00:00
David Baker
6874f313e3 log login errors 2017-10-30 17:04:21 +00:00
Luke Barnard
3e64333ada Only show admin tools to privileged users 2017-10-30 16:45:45 +00:00
Weblate
3be7dc854e Merge remote-tracking branch 'origin/develop' into develop 2017-10-30 16:35:38 +00:00