Commit graph

14801 commits

Author SHA1 Message Date
Weblate
202ae1b715 Merge branch 'origin/develop' into Weblate. 2019-09-17 17:17:43 +00:00
Matthew Hodgson
90691ada3c normalise translations 2019-09-17 17:51:03 +01:00
Matthew Hodgson
b2f44237b8 dangling comma 2019-09-17 17:36:29 +01:00
Matthew Hodgson
832123524d make the lifetimes of the RM configurable 2019-09-17 17:34:30 +01:00
Weblate
c060e58ea2 Merge branch 'origin/develop' into Weblate. 2019-09-17 14:44:47 +00:00
Valere
26b646613d Translated using Weblate (French)
Currently translated at 99.9% (1797 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-09-17 14:44:46 +00:00
J. Ryan Stinnett
4e42dbe418 Fix address type props to state conversion
The address picker recently started tracking props and state versions of valid
address types separately
(https://github.com/matrix-org/matrix-react-sdk/pull/3408), where props
represents the maximal set of possible types and the state is the current
available types right now (since it can change while the dialog is open).

For the case where there is no a IS, a regression was introduced by that PR by
mutating the props in place instead returning a modified copy for the state.

Regressed by https://github.com/matrix-org/matrix-react-sdk/pull/3408
Fixes https://github.com/vector-im/riot-web/issues/10878
2019-09-17 15:00:32 +01:00
Weblate
a2c60312ae Merge branch 'origin/develop' into Weblate. 2019-09-17 09:56:51 +00:00
Michael Telatynski
2a67970d32
Merge pull request #3445 from matrix-org/t3chguy/nvl/historical_preview
Only put a room in Historical if === 'leave' not peeked
2019-09-17 10:56:46 +01:00
RiotRobot
dd0ffa8e72 Merge branch 'master' into develop 2019-09-16 17:49:46 +01:00
Weblate
838b1859b9 Merge branch 'origin/develop' into Weblate. 2019-09-16 16:47:14 +00:00
Michael Telatynski
5d1056e1ef don't fire onFinished twice
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-16 18:20:31 +02:00
Michael Telatynski
597433d549 Reuse showRoom for onJoinClick so we join using alias if its available
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-16 18:20:24 +02:00
Weblate
da521796fd Merge branch 'origin/develop' into Weblate. 2019-09-16 16:13:32 +00:00
Bruno Windels
129d3693b2
Merge pull request #3444 from matrix-org/t3chguy/nvl/fix_room_directory
Reuse showRoom for onJoinClick so we join using alias if its available
2019-09-16 16:13:28 +00:00
Weblate
ffe84bfc61 Merge branch 'origin/develop' into Weblate. 2019-09-16 15:43:07 +00:00
Bruno Windels
deddf77a05
Merge pull request #3446 from matrix-org/bwindels/fixscalarurlcheck
Fix: make sure scalarUrls is never undefined
2019-09-16 15:43:03 +00:00
Szimszon
7316df70da Translated using Weblate (Hungarian)
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-09-16 13:28:15 +00:00
Bruno Windels
166364ba03 Fix: make sure scalarUrls is never undefined 2019-09-16 10:12:15 +02:00
Michael Telatynski
3fdaeea3a2 allow rooms we were banned from into Historical also
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 22:24:23 +01:00
Michael Telatynski
4fb4c5b744 Only put a room in Historical if === 'leave' not peeked
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 22:19:07 +01:00
Michael Telatynski
7f5d38772d don't fire onFinished twice
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 21:30:01 +01:00
Michael Telatynski
54d98c22ba Reuse showRoom for onJoinClick so we join using alias if its available
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-15 21:25:36 +01:00
송태섭
cd45c84b15 Translated using Weblate (Korean)
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-09-15 14:50:44 +00:00
Nikolay Boyadzhiev
5ee4950a47 Translated using Weblate (English (United States))
Currently translated at 42.0% (756 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/en_US/
2019-09-15 14:50:43 +00:00
Nikolay Boyadzhiev
354a1275dc Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-09-15 14:50:43 +00:00
Weblate
1d7d3b6357 Merge branch 'origin/develop' into Weblate. 2019-09-13 21:59:11 +00:00
Kévin C
6c72978192 Translated using Weblate (French)
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-09-13 21:59:11 +00:00
Jeff Huang
fcd5db0b2e Translated using Weblate (Chinese (Traditional))
Currently translated at 100.0% (1798 of 1798 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
2019-09-13 21:59:10 +00:00
Travis Ralston
e18b38c409
Merge pull request #3437 from matrix-org/travis/fix-deactivate
Wrap deactivation check with sanity conditions
2019-09-13 15:59:04 -06:00
Travis Ralston
3150d65bd7 De-async _calculateCanPermissions 2019-09-13 12:43:57 -06:00
Travis Ralston
d18d15311f Remove extraneous guard on deactivation check 2019-09-13 12:43:47 -06:00
Weblate
07357f7233 Merge branch 'origin/develop' into Weblate. 2019-09-13 14:45:27 +00:00
David Baker
7afd80e55b
Merge pull request #3408 from matrix-org/t3chguy/community_member_invite_IS_text
Fix identity server text in AddressPickerDialog
2019-09-13 15:45:22 +01:00
Weblate
7f4c0f10c0 Merge branch 'origin/develop' into Weblate. 2019-09-13 14:42:58 +00:00
Slavi Pantaleev
df80a0c5c1 Translated using Weblate (Bulgarian)
Currently translated at 100.0% (1797 of 1797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-09-13 14:42:58 +00:00
David Baker
05a26373e8
Merge pull request #3438 from matrix-org/travis/revoke-1
Change copy for sharing an email
2019-09-13 15:42:53 +01:00
Weblate
21d63e771d Merge branch 'origin/develop' into Weblate. 2019-09-13 13:08:47 +00:00
Slavi Pantaleev
08ae9ec7b2 Translated using Weblate (Bulgarian)
Currently translated at 99.8% (1794 of 1797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/bg/
2019-09-13 13:08:47 +00:00
Bruno Windels
40bd1845d2
Merge pull request #3441 from matrix-org/bwindels/fixroomdir-itemclick-bis
Fix: stop propagation click handler for <TR> doesn't run
2019-09-13 13:08:42 +00:00
Bruno Windels
6d13ea0043 stop propagation click handler for <TR> doesn't run 2019-09-13 14:07:36 +01:00
Michael Telatynski
c3d01715ff Improve ReportEventDialog as per PR feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-13 13:41:50 +01:00
Michael Telatynski
92af11bce7 fix indentation
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-13 13:40:31 +01:00
Michael Telatynski
fc49290459 Add way to report the content of a message
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-13 13:40:25 +01:00
Bruno Windels
f73f08e998 stop propagation click handler for <TR> doesn't run 2019-09-13 14:33:09 +02:00
David Baker
e548e4d7a5
Merge pull request #3436 from matrix-org/travis/deactivate-release
Fix synapse deactivate button for release
2019-09-13 13:26:19 +01:00
Bruno Windels
820869d99b fix clicking on room dir item 2019-09-13 11:00:55 +01:00
Weblate
08a761a1fc Merge branch 'origin/develop' into Weblate. 2019-09-13 09:55:41 +00:00
Bruno Windels
bf460dbd3d fix clicking on room dir item 2019-09-13 11:09:02 +02:00
Travis Ralston
f25529eed7 Change copy for sharing an email
Fixes https://github.com/vector-im/riot-web/issues/10758
2019-09-12 22:39:32 -06:00
Travis Ralston
27828a3785 Wrap deactivation check with sanity conditions
To ensure the matrixClient is not null (the problem) and that unexpected errors don't brick the app.

Fixes https://github.com/vector-im/riot-web/issues/10854
2019-09-12 18:31:58 -06:00
Travis Ralston
f4ebde1596 Wrap deactivation check with sanity conditions
To ensure the matrixClient is not null (the problem) and that unexpected errors don't brick the app.

Fixes https://github.com/vector-im/riot-web/issues/10854
2019-09-12 18:30:27 -06:00
Michael Telatynski
3fef6e6b22 Support Synapse deactivate on MemberInfo without Room (timeline pill)
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-12 18:28:16 -06:00
Bruno Windels
d64cd58e93 only hide x button when blurred && no more search term 2019-09-12 18:26:12 +01:00
Weblate
075db5d831 Merge branch 'origin/develop' into Weblate. 2019-09-12 16:03:47 +00:00
송태섭
bee3419401 Translated using Weblate (Korean)
Currently translated at 100.0% (1797 of 1797 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-09-12 15:56:49 +00:00
Bruno Windels
87f8000621 only hide x button when blurred && no more search term 2019-09-12 17:17:15 +02:00
Weblate
9fae9ef352 Merge branch 'origin/develop' into Weblate. 2019-09-12 14:11:36 +00:00
Michael Telatynski
f95ab2eeb1
Merge pull request #3290 from matrix-org/t3chguy/report_event
Add way to report the content of a message
2019-09-12 15:11:32 +01:00
Weblate
ac03c381e4 Merge branch 'origin/develop' into Weblate. 2019-09-12 13:19:06 +00:00
Bruno Windels
1806e83247
Merge pull request #3428 from matrix-org/bwindels/breadcrumbs-after-10
Breadcrumbs: only show after having joined at least 10 rooms
2019-09-12 13:19:02 +00:00
Bruno Windels
fb5a85db81 put min room count in constant 2019-09-12 15:12:18 +02:00
David Baker
ef7d8c42a8 Fix merge 2019-09-12 13:09:59 +01:00
Weblate
fcfe0248bb Merge branch 'origin/develop' into Weblate. 2019-09-12 12:09:21 +00:00
Bruno Windels
94bdedd25b show breadcrumbs only after having joined at least 10 rooms 2019-09-12 14:07:46 +02:00
RiotRobot
b0abb52518 Merge branch 'master' into develop 2019-09-12 13:07:27 +01:00
Weblate
9dfd68f273 Merge branch 'origin/develop' into Weblate. 2019-09-12 12:06:35 +00:00
Michael Telatynski
6dc69afe67 Merge branches 'develop' and 't3chguy/community_member_invite_IS_text' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/community_member_invite_IS_text 2019-09-12 12:53:32 +01:00
Michael Telatynski
b6309a4294 Improve ReportEventDialog as per PR feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-12 12:52:11 +01:00
Michael Telatynski
9a15d4cfc1 Merge branches 'develop' and 't3chguy/report_event' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/report_event
 Conflicts:
	src/i18n/strings/en_EN.json
2019-09-12 12:45:16 +01:00
Michael Telatynski
a40ecda993 Fix missed case of validAddressTypes being conditional
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-12 12:34:14 +01:00
Weblate
74b97c633b Merge branch 'origin/develop' into Weblate. 2019-09-12 11:29:07 +00:00
Michael Telatynski
d7bac95270
Merge pull request #3421 from matrix-org/t3chguy/nvl/fix_sso_flash
Hide the change HS url button on SSO login flow if custom urls disabled
2019-09-12 12:29:03 +01:00
Bruno Windels
122e15156a always show clear button in search box when focused 2019-09-12 12:21:18 +01:00
Michael Telatynski
7c54359d3a Hide the change HS url button on SSO login flow if custom urls disabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-12 12:17:52 +01:00
Michael Telatynski
5091658dc7 Update Copyright 2019-09-12 12:16:01 +01:00
Michael Telatynski
8eb8b00460 RoomDirectory: show spinner if loading more results
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-12 12:15:56 +01:00
Besnik Bleta
a4ab25e4bd Translated using Weblate (Albanian)
Currently translated at 99.8% (1788 of 1792 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-09-12 10:28:54 +00:00
Weblate
deabd4225d Merge branch 'origin/develop' into Weblate. 2019-09-12 09:30:05 +00:00
송태섭
562854ab66 Translated using Weblate (Korean)
Currently translated at 100.0% (1792 of 1792 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-09-12 09:30:04 +00:00
Besnik Bleta
589d4e98c1 Translated using Weblate (Albanian)
Currently translated at 98.5% (1765 of 1792 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
2019-09-12 09:30:04 +00:00
Michael Telatynski
d197fd90ad Merge branches 'develop' and 't3chguy/nvl/fix_sso_flash' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/nvl/fix_sso_flash 2019-09-12 10:25:54 +01:00
Bruno Windels
7c97078764 always show clear button in search box when focused 2019-09-12 11:12:06 +02:00
Michael Telatynski
a4a85dc541 Hide the change HS url button on SSO login flow if custom urls disabled
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 23:02:52 +01:00
Weblate
b1fd85d6fa Merge branch 'origin/develop' into Weblate. 2019-09-11 20:27:30 +00:00
Travis Ralston
ab6215f9aa
Merge pull request #3410 from matrix-org/t3chguy/disable_save_button_msg_edit_nochange
EditMessageComposer: disable Save button until a change has been made
2019-09-11 14:27:27 -06:00
Weblate
ccbfcaf818 Merge branch 'origin/develop' into Weblate. 2019-09-11 20:26:55 +00:00
Travis Ralston
9622ec9a1a
Merge pull request #3416 from matrix-org/t3chguy/nvl/room_directory_pagination_spinner
RoomDirectory: show spinner if loading more results
2019-09-11 14:26:51 -06:00
Weblate
9803c5deae Merge branch 'origin/develop' into Weblate. 2019-09-11 20:24:29 +00:00
Szimszon
b4c651023d Translated using Weblate (Hungarian)
Currently translated at 100.0% (1792 of 1792 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-09-11 20:24:29 +00:00
Michael Telatynski
9c1fb13d5f Apply PR feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 18:05:28 +01:00
Michael Telatynski
7c5e6ef2c5 regen 18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 18:05:26 +01:00
Michael Telatynski
7ddac8d475 Login: Add way to change HS from SSO Homeserver
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 18:04:11 +01:00
Michael Telatynski
c26d71b5aa Login: don't assume supported flows, prevent login flash on SSO servers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 18:04:11 +01:00
Bruno Windels
ac65b28954 PR feedback 2019-09-11 18:03:15 +01:00
Bruno Windels
0cba5da03d add redact recent messages button in member info 2019-09-11 18:03:09 +01:00
Bruno Windels
b67a2492b3 adapt design of room list in directory 2019-09-11 18:02:37 +01:00
Bruno Windels
9866efabe5 pr feedback 2019-09-11 17:58:14 +01:00
Bruno Windels
13a3cf3afe consistent naming
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-09-11 17:58:14 +01:00
Bruno Windels
cf8ca176e2 remove labels and add join/view & preview button instead in directory 2019-09-11 17:58:14 +01:00
Bruno Windels
ea7cbbc0ee keep filter field expanded if it has text in it 2019-09-11 17:57:40 +01:00
Bruno Windels
b9421e4269 make add room button go to create room dialog instead of room directory 2019-09-11 17:57:40 +01:00
Bruno Windels
31682b61ce make filter feed transparent when not focussed 2019-09-11 17:57:40 +01:00
Bruno Windels
b328fcb7e3 show shorter placeholder for filter feed when not focused 2019-09-11 17:57:40 +01:00
Bruno Windels
0fe31f843a hide explore button when focusing filter field 2019-09-11 17:57:40 +01:00
Bruno Windels
4ffa8c7b4a add explore button next to filter field 2019-09-11 17:57:40 +01:00
Travis Ralston
9e2cdecb9b Add a button to MemberInfo to deactivate a user
Part of https://github.com/vector-im/riot-web/issues/4125
2019-09-11 17:44:29 +01:00
Michael Telatynski
6f736e8407 Apply PR feedback
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:44:04 +01:00
Michael Telatynski
370d9d8336 regen 18n
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:44:04 +01:00
Michael Telatynski
76e4363452 Login: Add way to change HS from SSO Homeserver
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:44:04 +01:00
Michael Telatynski
f1ea5ff6f3 Login: don't assume supported flows, prevent login flash on SSO servers
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:44:04 +01:00
Michael Telatynski
792b70913c invert and rename changed to saveDisabled for clarity
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:37:11 +01:00
Michael Telatynski
2ff98b7c1f clear up ambiguity by poor naming
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:37:11 +01:00
Michael Telatynski
e3643bf17a EditMessageComposer: disable Save button until a change has been made
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:37:11 +01:00
Michael Telatynski
980e9839ac Update Copyright 2019-09-11 17:22:45 +01:00
Michael Telatynski
0d28cd5840 RoomDirectory: show spinner if loading more results
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
2019-09-11 17:22:45 +01:00
Weblate
bf665caac9 Merge branch 'origin/develop' into Weblate. 2019-09-11 16:15:00 +00:00
Michael Telatynski
81ea230a35
Merge pull request #3406 from matrix-org/t3chguy/reply_to_search_results
Fix replying from search results for this and all rooms
2019-09-11 17:14:55 +01:00
Weblate
16a329a26b Merge branch 'origin/develop' into Weblate. 2019-09-11 16:12:42 +00:00
Michael Telatynski
379fab8068
Merge pull request #3411 from matrix-org/t3chguy/synapse_deactivate_memberinfo_no_room
Support Synapse deactivate on MemberInfo without Room (timeline pill)
2019-09-11 17:12:38 +01:00
Weblate
f52fc4d6cd Merge branch 'origin/develop' into Weblate. 2019-09-11 15:56:23 +00:00
Kévin C
5a5db80e44 Translated using Weblate (French)
Currently translated at 100.0% (1792 of 1792 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-09-11 15:56:23 +00:00
J. Ryan Stinnett
f23f35bbe9
Merge pull request #3419 from matrix-org/jryans/settings-3pid-state
Lift 3PID state management up to Settings tab
2019-09-11 16:56:18 +01:00
J. Ryan Stinnett
c542ea5559 Force boolean value 2019-09-11 16:55:45 +01:00
Weblate
c6dd722f30 Merge branch 'origin/develop' into Weblate. 2019-09-11 15:39:09 +00:00
Kévin C
786fe68816 Translated using Weblate (French)
Currently translated at 100.0% (1790 of 1790 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-09-11 15:39:09 +00:00
J. Ryan Stinnett
db33c138aa Update all 3PID state in Settings when IS changes
This ensures we update all 3PID state (like bind status) whenever the IS
changes.
2019-09-11 16:21:42 +01:00
J. Ryan Stinnett
0b7995dc11 Improve terms handling for 3PID state gathering
This changes the 3PID state gathering (used in Settings) to ignore terms errors
(no modals will be shown) on the assumption that other UX handles this case.
2019-09-11 16:21:42 +01:00
J. Ryan Stinnett
f04c347df7 Lift 3PID state management up to Settings tab
This pulls the 3PID state management in Settings up to a single location so that
the Account and Discovery sections now work from a single list that updates
immediately.

Fixes https://github.com/vector-im/riot-web/issues/10519
2019-09-11 16:21:42 +01:00
Weblate
493ee1be00 Merge branch 'origin/develop' into Weblate. 2019-09-11 15:07:10 +00:00
Kévin C
b06a1b4b10 Translated using Weblate (French)
Currently translated at 100.0% (1788 of 1788 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
2019-09-11 15:07:10 +00:00
Tuomas Hietala
b40a56ea80 Translated using Weblate (Finnish)
Currently translated at 97.7% (1746 of 1788 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/
2019-09-11 15:07:09 +00:00
Bruno Windels
24c4a16da1 adapt design of room list in directory 2019-09-11 16:23:59 +02:00
Bruno Windels
77175fcbc4 pr feedback 2019-09-11 16:18:34 +02:00
Bruno Windels
094c9e3468
consistent naming
Co-Authored-By: Travis Ralston <travpc@gmail.com>
2019-09-11 14:15:46 +00:00
Bruno Windels
7754e08d84 remove labels and add join/view & preview button instead in directory 2019-09-11 15:45:51 +02:00
Weblate
1e49f5f56b Merge branch 'origin/develop' into Weblate. 2019-09-11 11:54:28 +00:00
Kenneth Larsson
3510d4a64f Translated using Weblate (Swedish)
Currently translated at 78.8% (1408 of 1786 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sv/
2019-09-11 11:54:28 +00:00
송태섭
fe3ff59011 Translated using Weblate (Korean)
Currently translated at 100.0% (1786 of 1786 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/
2019-09-11 11:54:24 +00:00
Szimszon
a5d6c88b6c Translated using Weblate (Hungarian)
Currently translated at 100.0% (1786 of 1786 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
2019-09-11 11:54:24 +00:00
Bruno Windels
62ddc1e544
Merge pull request #3412 from matrix-org/bwindels/explore-button
Add explore button in left panel to go show room directory
2019-09-11 11:54:18 +00:00
Bruno Windels
ad2e16d432 keep filter field expanded if it has text in it 2019-09-11 13:46:18 +02:00
Weblate
3d7c3667a4 Merge branch 'origin/develop' into Weblate. 2019-09-10 18:43:09 +00:00
Travis Ralston
7fcabd799d
Merge pull request #3415 from matrix-org/travis/min-updates
Only update m.accepted_terms if there were changes
2019-09-10 12:43:05 -06:00
Weblate
e229938fc2 Merge branch 'origin/develop' into Weblate. 2019-09-10 18:38:44 +00:00
Travis Ralston
ccd42900f7
Merge pull request #3414 from matrix-org/travis/address-picker-stack
Make uses of AddressPickerDialog static dialogs
2019-09-10 12:38:40 -06:00
Travis Ralston
b35d56167e const-antly annoying linter
although it's a valid complaint here
2019-09-10 11:16:45 -06:00
Travis Ralston
312143315b Only update m.accepted_terms if there were changes
Fixes https://github.com/vector-im/riot-web/issues/10744
2019-09-10 11:13:35 -06:00
Travis Ralston
4fbedec013 Make uses of AddressPickerDialog static dialogs
Fixes https://github.com/vector-im/riot-web/issues/10603

Static dialogs are ones that stay open underneath other dialogs, like the terms of service prompt. This is how user/room settings operate.
2019-09-10 11:01:20 -06:00
Weblate
a87ec80874 Merge branch 'origin/develop' into Weblate. 2019-09-10 16:55:53 +00:00