Commit graph

6549 commits

Author SHA1 Message Date
Richard Lewis
eb8c15075a Fix url params parsing. 2017-11-07 11:58:38 +00:00
Luke Barnard
7a09127687 Alter group member api
To match https://github.com/matrix-org/synapse/pull/2647
2017-11-07 11:27:42 +00:00
Richard Lewis
70c4100350 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering 2017-11-07 11:04:05 +00:00
Luke Barnard
9019fee49e Adjust long desc placeholder text 2017-11-07 10:48:56 +00:00
Kévin C
b92156a1ff Translated using Weblate (French)
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/fr/
2017-11-07 10:47:23 +00:00
Weblate
5e9bb4353a Merge remote-tracking branch 'origin/develop' into develop 2017-11-07 10:25:54 +00:00
Luke Barnard
47bf991471
Merge pull request #1577 from matrix-org/dbkr/composer_at_room_pills
Room notifs in autocomplete & composer
2017-11-07 10:25:48 +00:00
David Baker
df5c6470e8 get dict syntax right 2017-11-06 22:01:23 +00:00
Luke Barnard
956c5ff343 Use a constant for easy reading of long desc placeholder 2017-11-06 18:52:55 +00:00
Luke Barnard
477051cfa6 Add placeholder for when a long desc hasn't been set
this is only visible to group admins.
2017-11-06 18:35:52 +00:00
Luke Barnard
137f1311b3 Add useful placeholder for the long description textarea 2017-11-06 18:35:23 +00:00
Luke Barnard
36cd22663a Open group settings when the group is created 2017-11-06 18:02:50 +00:00
Weblate
afc9c36e4e Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 18:02:44 +00:00
Matthew Hodgson
17ae37bd3b
Merge pull request #1579 from matrix-org/luke/fix-img-no-src-bug
Ignore img tags in HTML if src is not specified
2017-11-06 18:02:38 +00:00
Luke Barnard
d14f943629 Ignore img tags in HTML if src is not specified
This applies to HTML messages and group summaries.
2017-11-06 17:52:46 +00:00
Weblate
16771cac4f Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 17:16:39 +00:00
David Baker
029853d379
Merge pull request #1578 from matrix-org/luke/groups-admin-badges
Indicate admins in the group member list with a sheriff badge
2017-11-06 17:16:34 +00:00
David Baker
08d006d112 PR feedback 2017-11-06 17:15:09 +00:00
Luke Barnard
d6a6e59d6c Indicate admins in the group member list with a sheriff badge 2017-11-06 16:37:16 +00:00
David Baker
41e7496ff1 unused var 2017-11-06 15:25:25 +00:00
David Baker
adc4290451 Pillify room notif pills in composer 2017-11-06 15:11:42 +00:00
Weblate
706981688a Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 14:29:30 +00:00
Richard Lewis
f1db564506
Merge pull request #1533 from anoadragon453/develop
Remember whether widget drawer was hidden per-room
2017-11-06 14:29:25 +00:00
Weblate
0fdde954d4 Merge remote-tracking branch 'origin/develop' into develop 2017-11-06 13:02:51 +00:00
Walter
cb7b1268fe Translated using Weblate (Ukrainian)
Currently translated at 10.6% (98 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-11-06 13:02:51 +00:00
Luke Barnard
febeb0429e Throw an error when trying to create a group store with falsey groupId 2017-11-06 10:18:10 +00:00
Travis Ralston
781b94c8f4 Appease the linter
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 15:37:06 -07:00
Travis Ralston
10519f9465 Fix the tests
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 14:56:41 -07:00
Travis Ralston
f0000f7400 Update documentation
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 14:33:40 -07:00
Travis Ralston
50807d498a Use settings in slash commands too
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-05 13:06:55 -07:00
Travis Ralston
e31c89d360 Make the controller work for notifications
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 22:28:35 -07:00
Travis Ralston
7ce4316cc8 Initial support for notification settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 21:47:18 -07:00
Travis Ralston
8351ec7e73 Local echo on all setting levels
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 20:32:00 -07:00
Travis Ralston
3958e32672 Ensure blacklistUnverifiedDevices persists reloads
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 20:13:23 -07:00
Travis Ralston
45140cab69 Don't assume false means "use state"
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:42 -07:00
Travis Ralston
ef45d82ec6 Fix URL preview save calls
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:20 -07:00
Travis Ralston
b75be41f94 Fix split-brain for blacklistUnverifiedDevices
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:52:06 -07:00
Travis Ralston
cb17c0a379 Migrate blacklistUnverifiedDevicesPerRoom
This currently causes a split-brain scenario for the application due to the priority of each level. Granular settings assumes a simple override, however the crypto setting wants per room to be overriden with the global setting, regardless of the room setting. Some additional comments are needed on the intended behaviour.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 19:15:55 -07:00
Matthew Hodgson
68115f5b9c tint when theming correctly 2017-11-05 00:40:38 +00:00
Matthew Hodgson
8587b36715 Merge branch 'develop' into matthew/status 2017-11-04 23:51:26 +00:00
Matthew Hodgson
e72e30197a calculate new CSS tinting when we change theme 2017-11-04 23:50:57 +00:00
Matthew Hodgson
b2ddcb8027 tint the colours in the theme rather than hardcode vector green 2017-11-04 23:43:20 +00:00
Travis Ralston
c7eee36990 Fix lanugage detection
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:38:26 -06:00
Travis Ralston
4f1ad974fc Delay URL preview saving until the save button is pressed
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:32:13 -06:00
Travis Ralston
358298e4ee Support room color in settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 16:10:25 -06:00
Travis Ralston
bb5f7bed85 Check the correct event type for the room
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 15:48:24 -06:00
Travis Ralston
a8169a682c Throw errors if the setting isn't known
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 15:46:15 -06:00
Travis Ralston
257e1aabb8 Improve documentation of settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-04 15:44:01 -06:00
Weblate
ae844a048f Merge remote-tracking branch 'origin/develop' into develop 2017-11-04 15:42:03 +00:00
Matthew Hodgson
3fd5937687
Merge pull request #1571 from matrix-org/t3chguy/class-warning-thing
Fixes React warning
2017-11-04 15:41:57 +00:00
Travis Ralston
8282534f87 Add SettingsLevel enum; Move settings to own file.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 23:19:45 -06:00
Travis Ralston
893c39bfbe Merge branch 'develop' into travis/granular-settings 2017-11-03 22:00:07 -06:00
Travis Ralston
de6fc32a87 Show an indicator when there are any pins in the room
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 20:00:48 -06:00
Travis Ralston
a2b7f6d30e Merge remote-tracking branch 'matrix-org/develop' into travis/pinned-notice 2017-11-03 19:57:39 -06:00
Travis Ralston
5c37155730 Don't assume we have a valid event.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 18:18:09 -06:00
Travis Ralston
3656fdb571 Store read pinned events as an array to avoid racing saves.
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-11-03 18:12:57 -06:00
Weblate
107f83f84f Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 22:44:22 +00:00
Matthew Hodgson
d4adff3d25
Merge pull request #1575 from matrix-org/luke/fix-flair-store-again
Fix Flair not appearing due to missing this._usersInFlight
2017-11-03 22:44:16 +00:00
Kévin C
6ddbaebb65 Translated using Weblate (French)
Currently translated at 100.0% (923 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-03 19:54:40 +00:00
Luke Barnard
da23afdec2 Better comment on FlairStore _usersInFlight 2017-11-03 18:48:15 +00:00
Weblate
295bdae075 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 18:47:03 +00:00
Jan Kudrik
ed586bedbc Translated using Weblate (Czech)
Currently translated at 70.0% (647 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-11-03 18:47:02 +00:00
Luke Barnard
4d8f18742b Check against non-existant promise to resolve a user's groups 2017-11-03 18:43:43 +00:00
Luke Barnard
d64fc4c842 Fix Flair not appearing due to missing this._usersInFlight 2017-11-03 18:19:10 +00:00
Luke Barnard
58f1757f0c Handle rooms with no aliases or canonical alias 2017-11-03 17:52:36 +00:00
Luke Barnard
98312a4647 Use, if possible, a room's canonical or first alias when viewing the room
(Only affects rooms the user has never joined)
2017-11-03 17:37:13 +00:00
Szimszon
dad5023728 Translated using Weblate (Hungarian)
Currently translated at 100.0% (923 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-03 16:51:41 +00:00
Weblate
6796b5b70c Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 16:15:06 +00:00
Bamstam
04614de139 Translated using Weblate (German)
Currently translated at 100.0% (923 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-03 16:15:05 +00:00
Luke Barnard
abff4ee6b5
Merge pull request #1573 from matrix-org/luke/groups-add-style-to-create-group-dialog
Add CSS classes to group ID input in CreateGroupDialog
2017-11-03 16:14:59 +00:00
Luke Barnard
b88c13d527 Use prefixed class names to avoid collisions with other libraries 2017-11-03 16:02:41 +00:00
Luke Barnard
e84e4ed5f5 Add CSS classes to group ID input in CreateGroupDialog 2017-11-03 15:38:12 +00:00
Krombel
f96c0d8533 Translated using Weblate (German)
Currently translated at 100.0% (923 of 923 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-03 15:35:45 +00:00
Matthew Hodgson
6747390333 merge 2017-11-03 15:12:24 +00:00
David Baker
49ee78dab1 Merge remote-tracking branch 'origin/develop' into dbkr/composer_at_room_pills 2017-11-03 14:39:52 +00:00
Weblate
6a5162b047 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 14:30:06 +00:00
David Baker
43a23d7e89
Merge pull request #1568 from matrix-org/dbkr/autocomplete_provider_room
Give autocomplete providers the room they're in
2017-11-03 14:29:59 +00:00
Weblate
ec8afd185f Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 14:24:37 +00:00
David Baker
2c9a93a8ac
Merge pull request #1572 from matrix-org/dbkr/fix_multiple_pills
Fix multiple pills on one line
2017-11-03 14:24:33 +00:00
David Baker
802ab16746 Fix multiple pills on one line 2017-11-03 14:06:59 +00:00
Weblate
1cc65044d4 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 13:54:04 +00:00
Luke Barnard
d0b3368445
Merge pull request #1570 from matrix-org/luke/fix-groups-invites-appearance
Fix group invites such that they look similar to room invites
2017-11-03 13:53:58 +00:00
Michael Telatynski
b2cd65e182
Fixes React warning
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2017-11-03 12:30:58 +00:00
Luke Barnard
151f9917b1 Fix group invites such that they look similar to room invites
- Change GroupInviteTile to use RoomTile CSS
 - Give group invites their own sub list, with heading "Community Invites"
2017-11-03 12:19:37 +00:00
Weblate
41cd3f0412 Merge remote-tracking branch 'origin/develop' into develop 2017-11-03 12:03:18 +00:00
Szimszon
fefe157c56 Translated using Weblate (Hungarian)
Currently translated at 100.0% (922 of 922 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-03 12:03:17 +00:00
Bamstam
d43481d555 Translated using Weblate (German)
Currently translated at 99.8% (921 of 922 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-03 12:03:17 +00:00
Luke Barnard
71c59eff2c Add a GeminiScrollbar to Your Communities 2017-11-03 11:19:29 +00:00
Szimszon
b559e123d7 Translated using Weblate (Hungarian)
Currently translated at 100.0% (922 of 922 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-02 21:41:04 +00:00
Kévin C
d4668d6c11 Translated using Weblate (French)
Currently translated at 100.0% (922 of 922 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-02 19:12:48 +00:00
David Baker
112c74a255 Add NotifProvider to offer @room as a completion 2017-11-02 18:54:25 +00:00
Richard Lewis
853ada027d Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into rxl881/widgetrendering 2017-11-02 18:34:46 +00:00
Richard Lewis
0e854ee356 Fix loading and initialisation spinners. 2017-11-02 18:33:11 +00:00
David Baker
843d797ded Better type checking 2017-11-02 18:17:57 +00:00
David Baker
7f9967389d Pass room into Autocompleter 2017-11-02 18:15:26 +00:00
David Baker
6ad4bb80dd == 2017-11-02 18:14:46 +00:00
David Baker
3b58f0ca2a Ignore removed events 2017-11-02 18:14:21 +00:00
David Baker
ee43c635d1 phrasing 2017-11-02 18:11:18 +00:00
David Baker
42589281d1 comment stub method 2017-11-02 18:10:13 +00:00
David Baker
f7201e8dee Revert unintentional changes 2017-11-02 18:08:24 +00:00
David Baker
498b117d5a copyrights 2017-11-02 18:01:28 +00:00
David Baker
4953d4de4d Give autocomplete providers the room they're in
Removes the gut-wrenching that RoomView does to jam the user list
into the user autocomplete provider.
2017-11-02 17:51:08 +00:00
Richard Lewis
a52bb9d603 Pass URL to check. 2017-11-02 17:27:59 +00:00
Krombel
322cd6a2f8 Translated using Weblate (German)
Currently translated at 100.0% (922 of 922 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-02 16:35:11 +00:00
Weblate
7bbae89235 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 16:09:12 +00:00
David Baker
8800081cb9
Merge pull request #1567 from matrix-org/luke/fix-flair-store
Fix multiple requests for publicised groups of given user
2017-11-02 16:09:07 +00:00
Luke Barnard
21e09840dc Fix multiple requests for publicised groups of given user
Previously, a single user could end up in multiple batches, which would have been fine if the logic didn't assume otherwise. If a request took longer than 200ms, multiple batches would occur with intersecting sets of users, deleting promises that were then assumed to exist.

The logic now takes all "in flight" users to also not be "pending". Pending now means that the user will be processed in the next batch. "In flight" means the user is part of an ongoing batch.
2017-11-02 15:59:26 +00:00
Weblate
ff3a555802 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 15:38:08 +00:00
David Baker
7c17ad8509
Merge pull request #1566 from matrix-org/luke/groups-room-publicity
Add toggle to alter visibility of a room-group association
2017-11-02 15:38:03 +00:00
Luke Barnard
982e87e01c Communities are communities, wrap div for label alignment 2017-11-02 15:04:40 +00:00
Weblate
b13bff77cb Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 14:23:05 +00:00
Bamstam
d698f9f8fd Translated using Weblate (German)
Currently translated at 99.8% (918 of 919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-02 14:23:04 +00:00
David Baker
8895ab7e5b
Merge pull request #1564 from matrix-org/dbkr/pillify_at_room
Pillify room notifs in the timeline
2017-11-02 14:22:58 +00:00
Luke Barnard
bf77b51b5e Merge branch 'develop' into luke/groups-room-publicity 2017-11-02 13:39:33 +00:00
Luke Barnard
790db94fd7 Add toggle to alter the visibility of a room-group association 2017-11-02 13:31:11 +00:00
Weblate
8387fe7326 Merge remote-tracking branch 'origin/develop' into develop 2017-11-02 11:10:50 +00:00
Krombel
d9f19726a3 Translated using Weblate (German)
Currently translated at 99.8% (918 of 919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-02 11:10:49 +00:00
Luke Barnard
e909d859ab
Merge branch 'develop' into luke/groups-room-info 2017-11-02 10:56:33 +00:00
Weblate
7ff50d01b8 Merge remote-tracking branch 'origin/develop' into develop 2017-11-01 22:18:10 +00:00
Andrey
e68ab44596 Translated using Weblate (Russian)
Currently translated at 98.6% (907 of 919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-11-01 22:18:10 +00:00
Szimszon
9b5fd76dc7 Translated using Weblate (Hungarian)
Currently translated at 100.0% (919 of 919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-01 22:18:10 +00:00
Bamstam
b2ccf3fdf7 Translated using Weblate (German)
Currently translated at 96.5% (887 of 919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-11-01 22:18:09 +00:00
Matthew Hodgson
815b42f0ac
Merge pull request #1565 from matrix-org/matthew/group-promise-npe
turn NPE on flair resolution errors into a logged error
2017-11-01 22:18:05 +00:00
Matthew Hodgson
7d7cd30e46 turn NPE on flair resolution errors into a logged error 2017-11-01 22:10:03 +00:00
Szimszon
6586a6ff36 Translated using Weblate (Hungarian)
Currently translated at 100.0% (919 of 919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-11-01 20:44:43 +00:00
Kévin C
44e408ca91 Translated using Weblate (French)
Currently translated at 100.0% (919 of 919 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-11-01 19:59:55 +00:00
David Baker
4f8d6d8fbe Pillify room notifs in the timeline
This scans text nodes in the DOM for room notifications and turns
them into pills. Changes the pillification code around a bit so it
works with text nodes. Uses the push processor directly to test
the event against the room notifiation rule so we know whether
this event would actually trigger a room notification (needs to
hook into push at a lower level because otherwise our own room
notifications would not pillify since our own events never
generate notifications).

Requires https://github.com/matrix-org/matrix-js-sdk/pull/565
2017-11-01 19:42:47 +00:00
Luke Barnard
80f79e6b84 Generate translations 2017-11-01 17:58:45 +00:00
Weblate
fe495db6e2 Merge remote-tracking branch 'origin/develop' into develop 2017-11-01 17:44:09 +00:00
Luke Barnard
64a369216a Implement simple GroupRoomInfo
which replaces the "X" on the GroupRoomTile with "Remove from community" under Admin Tools.
2017-11-01 17:27:35 +00:00
Luke Barnard
0dcd52d88f Fix some react warnings firing 2017-11-01 17:12:22 +00:00
Matthew Hodgson
b3a7d25ef8 lint hell 2017-11-01 15:31:44 +00:00
Matthew Hodgson
64d8c81897 Merge branch 'develop' into matthew/status 2017-11-01 15:24:30 +00:00
Matthew Hodgson
1ae9103d78 evil evil hack to temporarily hide avatar changes in status autojoin rooms 2017-11-01 15:24:02 +00:00
Stefan Parviainen
e1e4fc2dac Make eslint happy
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 16:18:48 +01:00
Stefan Parviainen
15bafd6818 Convert from weblate to counterpart at runtime to make tests happy
Signed-off-by: Stefan Parviainen <pafcu@iki.fi>
2017-11-01 15:55:58 +01:00
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
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
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
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
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
Jan Kudrik
e174a0ea00 Translated using Weblate (Czech)
Currently translated at 68.0% (621 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-30 16:35:37 +00:00
David Baker
57d516f042 Don't refresh page on password change prompt
It's on the form submit but missing a preventDefault
2017-10-30 16:28:27 +00:00
Weblate
e5a88dc04e Merge remote-tracking branch 'origin/develop' into develop 2017-10-30 15:12:25 +00:00
Enrico Bacis
b43e1f1359 Translated using Weblate (Italian)
Currently translated at 5.2% (48 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
2017-10-30 15:12:24 +00:00
Bamstam
4b7e76a1e1 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 15:12:24 +00:00
Kévin C
0349155b06 Translated using Weblate (French)
Currently translated at 89.6% (818 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-10-30 15:12:24 +00:00
Jan Kudrik
cfdb615900 Translated using Weblate (Czech)
Currently translated at 67.6% (617 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-30 15:12:23 +00:00
Luke Barnard
14d600a69f Fix initial in GroupAvatar in GroupView 2017-10-30 15:04:12 +00:00
Travis Ralston
72517f95bb Don't explode if the SdkConfig isn't available
This can happen prior to logging in, for some reason.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 22:53:59 -06:00
Travis Ralston
99ee58d13a Don't break the room settings page
A later commit will make the URL preview settings behave like the rest of the settings page.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 22:18:03 -06:00
Travis Ralston
c056f4faa6 Make URL preview checkboxes pretty again
Works for all other settings too!

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 22:17:15 -06:00
Travis Ralston
b139c8d01c Generate unique IDs for SettingsCheckbox
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 22:16:46 -06:00
Travis Ralston
f44622b3d8 i18n for URL previews
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 21:50:22 -06:00
Travis Ralston
786bd87fec Support URL previews (with bugs)
Known issues at this point:
* The room-level setting accepts the current user's default, which is wrong
* The checkboxes on RoomSettings are not independent
* The checkboxes in RoomSettings need some layout fixes

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 21:48:29 -06:00
Travis Ralston
9fdc1be7bd Make getLevelAt() return more generic responses
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 20:44:00 -06:00
Travis Ralston
b5d5c81f32 Add a new component to back various settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 20:43:27 -06:00
Travis Ralston
52f227cb3b Drop the idea of "config" being automatically supported
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 17:08:39 -06:00
Travis Ralston
0d3f0eaf98 Convert local settings to granular settings
This breaks language selection.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:53:00 -06:00
Travis Ralston
b3d17a7b51 Support legacy settings on the device
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:08:45 -06:00
Travis Ralston
e8acb0e102 Use getValueAt()
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 16:02:51 -06:00
Travis Ralston
ae10a11ac4 Convert synced settings to granular settings
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-29 01:43:52 -06:00
Travis Ralston
bf815f4be9 Support labs features
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 20:21:50 -06:00
Travis Ralston
7dda5e9196 Appease the linter round 1
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 19:53:12 -06:00
Travis Ralston
23d159e21c Make reading settings synchronous
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 19:45:48 -06:00
Travis Ralston
989bdcf5fb Rebuild SettingsStore to be better supported
This does away with the room- and account-style settings, and just replaces them with `supportedLevels`. The handlers have also been moved out to be in better support of the other options, like SdkConfig and per-room-per-device.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 19:13:06 -06:00
Matthew Hodgson
672fbb2873 hopefully fix NPE on toLowerCase 2017-10-28 18:33:38 +01:00
Travis Ralston
c43bf336a9 Appease the linter
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 11:26:40 -06:00
Travis Ralston
e02dcae3b6 Change wording to better describe the class
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 11:26:40 -06:00
Travis Ralston
8c3e5ebbad Create GranularSettingStore
GranularSettingStore is a class to manage settings of varying granularity, such as URL previews at the device, room, and account levels.

Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-28 11:26:40 -06:00
grrgui
8a2155822f Translated using Weblate (French)
Currently translated at 89.6% (818 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2017-10-28 08:10:27 +00:00
David Baker
063ab7e9b7 Merge branch 'dbkr/try_lowercase_username' into matthew/status 2017-10-27 19:09:31 +01:00
David Baker
858c3a2548 Merge remote-tracking branch 'origin/develop' into matthew/status 2017-10-27 18:59:57 +01:00
David Baker
b437a2559d PR feedback 2017-10-27 18:59:13 +01:00
Weblate
94cf33d836 Merge remote-tracking branch 'origin/develop' into develop 2017-10-27 17:40:23 +00:00
Walter
d72f70dcfd Translated using Weblate (Ukrainian)
Currently translated at 11.1% (102 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-10-27 17:40:23 +00:00
David Baker
580d8dce19
Merge pull request #1549 from matrix-org/luke/groups-fix-mygroups-avatar-scale-method
Use "crop" method to scale group avatars in MyGroups
2017-10-27 18:40:19 +01:00
David Baker
5312a869e4 Try lowercase username on login
Fixes https://github.com/vector-im/riot-web/issues/5446
2017-10-27 18:36:59 +01:00
Luke Barnard
5209f29a5c Use "crop" method to scale group avatars in MyGroups 2017-10-27 18:27:54 +01:00
Stefan Parviainen
95b2392104 Merge branch 'develop' into departify 2017-10-27 19:23:13 +02:00
Weblate
8f19e4c55c Merge remote-tracking branch 'origin/develop' into develop 2017-10-27 17:01:36 +00:00
Walter
41257020c0 Translated using Weblate (Ukrainian)
Currently translated at 11.0% (101 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/uk/
2017-10-27 17:01:36 +00:00
Luke Barnard
27083df0f9
Merge pull request #1547 from matrix-org/dbkr/username_to_lower
Lowercase all usernames
2017-10-27 18:01:32 +01:00
David Baker
4eb8fe3e6a Lowercase all usernames
As synapse doesn't accept usernames with capitals in them now

Fixes https://github.com/vector-im/riot-web/issues/5445
2017-10-27 17:49:44 +01:00
Richard Lewis
3756ce606d Check URL prop updates and ensure that widgets are refreshed. 2017-10-27 17:49:14 +01:00
Weblate
6618687b36 Merge remote-tracking branch 'origin/develop' into develop 2017-10-27 15:42:51 +00:00
Krombel
138a61c9ac 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-27 15:42:51 +00:00
David Baker
2f3e0fb049 Lint 2017-10-27 16:29:56 +01:00
Bamstam
0dac8b0aa2 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-27 15:26:56 +00:00
David Baker
5d0b9d73b4 Fix prompt to re-use chat room
I managed to lose this when refactoring ChatInviteDialog in
https://github.com/matrix-org/matrix-react-sdk/pull/1300

Fixes https://github.com/vector-im/riot-web/issues/5119
2017-10-27 16:20:17 +01:00
Weblate
4c4a933a09 Merge remote-tracking branch 'origin/develop' into develop 2017-10-27 15:10:33 +00:00
Bamstam
a281a1d278 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-27 15:10:32 +00:00
Luke Barnard
175fadbb57 Add unregiseterListener to GroupStore 2017-10-27 15:08:38 +01:00
Krombel
be2935f814 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-27 14:06:54 +00:00
Bamstam
e2cd2e9524 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-27 14:04:58 +00:00
Krombel
e8db013d4b 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-27 14:01:40 +00:00
Bamstam
1a1874e1b5 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-27 14:00:53 +00:00
Krombel
3ceb63b97e 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-27 13:49:23 +00:00
Matthew Hodgson
5d0629ff73 resolve matrix.status.im v. matrix.org confusion 2017-10-27 14:23:16 +01:00
Richard Lewis
7662b5ac8f Unfinished, non-working changes to try and handle URL changes gracefully 2017-10-27 13:47:51 +01:00
Szimszon
86e587aefd Translated using Weblate (Hungarian)
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/hu/
2017-10-27 11:03:30 +00:00
Weblate
67ba28d268 Merge remote-tracking branch 'origin/develop' into develop 2017-10-27 10:48:31 +00:00
Szimszon
0d7c83f9c4 Translated using Weblate (Hungarian)
Currently translated at 99.5% (908 of 912 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2017-10-27 10:48:30 +00:00
Luke Barnard
5d0aa8d7f7 Handle 403 when inspecting invited users as non-member 2017-10-27 11:38:10 +01:00
Luke Barnard
e094c32c62 Simplify GroupStore listener registration 2017-10-27 11:38:10 +01:00
Matthew Hodgson
e3f896c5e0 don't forget login prompt class 2017-10-27 01:35:21 +01:00
Matthew Hodgson
1bf3ef6de4 fix password reset 2017-10-27 01:23:50 +01:00
Matthew Hodgson
0952befdea target blank for tg 2017-10-27 01:09:37 +01:00
Matthew Hodgson
015aed0597 hide optionality of email for status 2017-10-27 01:03:04 +01:00
Andrey
de2bad2af4 Translated using Weblate (Russian)
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/ru/
2017-10-26 19:15:43 +00:00
Andrew (anoa)
b4868a6846
showWidget->hideWidgetDrawer and remove logs
Signed-off-by: Andrew (anoa) <anoa@openmailbox.org>
2017-10-26 11:27:58 -07:00
Weblate
ea89c9b9a6 Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 17:38:34 +00:00
Jan Kudrik
6bac1ad755 Translated using Weblate (Czech)
Currently translated at 62.8% (573 of 911 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-26 17:38:33 +00:00
Michael Telatynski
1d5b4a9d50 Merge branch 'develop' into t3chguy/mention_user 2017-10-26 18:10:10 +01:00
Matthew Hodgson
655d0c615a remove spurious Sign In button and legacy Return to App buttons 2017-10-26 17:57:49 +01:00
Matthew Hodgson
14d9743e30 unbreak reg 2017-10-26 17:22:32 +01:00
Andrey
a0509d8b5d Translated using Weblate (Russian)
Currently translated at 100.0% (911 of 911 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-26 14:06:02 +00:00
Weblate
bd8097e44c Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 13:52:20 +00:00
David Baker
c8a489ca77 Merge pull request #1541 from matrix-org/luke/groups-only-show-settings-icon-to-members
Only show group settings cog to members
2017-10-26 14:52:16 +01:00
Luke Barnard
9643784f85 Only show group settings cog to members
Non-members have no settings to change.
2017-10-26 14:31:27 +01:00
Weblate
c5c74749b7 Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 13:23:11 +00:00
Luke Barnard
eec6ed36cd Use correct icon for group room deletion and make themeable
Also fix cancel icons to have class mx_filterFlipColor
2017-10-26 14:05:58 +01:00
Andrey
8a9750bccb Translated using Weblate (Russian)
Currently translated at 100.0% (910 of 910 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-26 10:44:03 +00:00
Weblate
d3af886093 Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 10:35:49 +00:00
David Baker
5871a74228 Merge pull request #1534 from matrix-org/t3chguy/invite_in_memberinfo
Add invite button to MemberInfo if user has left or wasn't in room
2017-10-26 11:35:45 +01:00
Andrey
3a8b036687 Translated using Weblate (Russian)
Currently translated at 100.0% (909 of 909 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-26 10:17:25 +00:00
Weblate
8fdc0432b0 Merge remote-tracking branch 'origin/develop' into develop 2017-10-26 09:36:11 +00:00
Andrey
93008272dd Translated using Weblate (Russian)
Currently translated at 100.0% (908 of 908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-26 09:36:11 +00:00
Andreas Marek
d0ba79996f Translated using Weblate (German)
Currently translated at 99.8% (907 of 908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-26 09:36:10 +00:00
Luke Barnard
591a7f4b86 Default to false 2017-10-26 10:06:04 +01:00
Luke Barnard
97b9cf6402 Actually use the synced setting 2017-10-26 09:58:46 +01:00
David Baker
e6c3483c8b Add correct telegram link 2017-10-26 09:58:05 +01:00
Matthew Hodgson
5c32b5b11a fix i18n 2017-10-26 02:10:03 +01:00
Matthew Hodgson
deb0f902e3 linting 2017-10-26 01:59:18 +01:00
Matthew Hodgson
1237de3ef0 Merge branch 'develop' into matthew/status 2017-10-26 01:47:22 +01:00
Matthew Hodgson
5a9dae5ff1 use generic 'text button' for delete buttons in UserSettings 2017-10-26 01:44:05 +01:00
Matthew Hodgson
ac7a94afb2 apply theme tint at launch 2017-10-26 01:43:42 +01:00
Matthew Hodgson
b3a8593468 make tinter coarsely theme aware 2017-10-25 22:48:27 +01:00
Andrey
935e6baf88 Translated using Weblate (Russian)
Currently translated at 100.0% (908 of 908 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
2017-10-25 17:52:03 +00:00
Travis Ralston
24000ee456 Re-add i18n for labs
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:23:04 -06:00
Travis Ralston
e773585a02 Merge remote-tracking branch 'matrix-org/develop' into travis/presence
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:39 -06:00
Travis Ralston
5c9970950b Undo i18n change to make merge easier
Signed-off-by: Travis Ralston <travpc@gmail.com>
2017-10-25 11:21:12 -06:00
Luke Barnard
3ae97348f8 Add option to mirror local video feed 2017-10-25 18:17:33 +01:00
Weblate
a382834e56 Merge remote-tracking branch 'origin/develop' into develop 2017-10-25 16:47:29 +00:00
Bamstam
841e274b07 Translated using Weblate (German)
Currently translated at 99.8% (906 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
2017-10-25 16:47:28 +00:00
Jan Kudrik
9b93804afa Translated using Weblate (Czech)
Currently translated at 60.1% (546 of 907 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
2017-10-25 16:47:28 +00:00
Luke Barnard
4cfbd66729 Merge pull request #1538 from matrix-org/luke/fix-redaction-sender-tooltip
Use the correct userId when displaying who redacted a message
2017-10-25 17:47:22 +01:00
Luke Barnard
cedc0b27a9 Handle redaction with no sender 2017-10-25 17:37:20 +01:00
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