OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,404 Commits
229 Branches
566 Tags
473 MiB
Commit Graph

17915 Commits (fb462585280a1f4dff9b0a3b64154b068e52791c)

Author SHA1 Message Date
Besnik Bleta 84f6bf06dd Translated using Weblate (Albanian) 
Currently translated at 99.7% (2133 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-10 17:29:12 +00:00
Travis Ralston f33c930c41 Revert "Merge pull request #3892 from krkc/move-read-receipts-to-bottom" 
This reverts commit 191abb5b0d.
 2020-03-10 11:28:52 -06:00
Weblate cdb14f38b3 Merge branch 'origin/develop' into Weblate. 2020-03-10 15:59:49 +00:00
Travis Ralston a808b05026
Merge pull request #4193 from MarcoZehe/FixExtraneousTabStopOnTree 
Remove extraneous tab stop from room tree view.
 2020-03-10 09:59:44 -06:00
Bruno Windels e34a37102a move i18n strings around as script desires 2020-03-10 16:56:20 +01:00
Bruno Windels ab2e3a3465 also enable 4s when accepting a verification request 2020-03-10 16:54:49 +01:00
Bruno Windels ddbfe4e1fa enable 4S if needed when trying to verify 2020-03-10 16:31:40 +01:00
Weblate 4bb05e8dec Merge branch 'origin/develop' into Weblate. 2020-03-10 15:30:29 +00:00
Travis Ralston 9b62cc964b
Merge pull request #4191 from matrix-org/travis/remove-v1-identity 
Remove v1 identity server fallbacks
 2020-03-10 09:30:24 -06:00
Marco Zehe 3bff5c55cf Remove extraneous tab stop from room tree view. 
This was introduced some time ago when the room list became scrollable. Divs with overflow:scroll; become focusable for the keyboard in Firefox, but since we have keyboard handling for the whole compound widget, we don't need that tab stop on the tree view container div. Putting tabindex="-1" on it fixes it.

Signed-off-by: Marco Zehe <marcozehe@mailbox.org>
 2020-03-10 16:24:42 +01:00
Weblate 9d19f0f34c Merge branch 'origin/develop' into Weblate. 2020-03-10 12:45:21 +00:00
Bruno Windels c5e62ec0ef
Merge pull request #4187 from matrix-org/bwindels/altaliases 
Allow editing of alt_aliases according to MSC2432
 2020-03-10 12:45:16 +00:00
Weblate 6eea3d4641 Merge branch 'origin/develop' into Weblate. 2020-03-10 12:43:20 +00:00
Bruno Windels db9895f223
Merge pull request #4189 from matrix-org/bwindels/aliasesintimeline 
Update timeline rendering of aliases
 2020-03-10 12:43:14 +00:00
Travis Ralston 4cdfda3c7d Remove v1 identity server fallbacks 
For https://github.com/vector-im/riot-web/issues/10443
 2020-03-09 17:05:13 -06:00
Bruno Windels 378939bed7 add timeline text descriptions for modifying alt_aliases 2020-03-09 18:24:48 +01:00
Bruno Windels 0d8b4ac194 remove timeline tiles for m.room.aliases events 2020-03-09 18:23:32 +01:00
Weblate dc8e9cfb10 Merge branch 'origin/develop' into Weblate. 2020-03-09 16:27:12 +00:00
David Baker b1ad0b8d77
Merge pull request #4188 from matrix-org/dbkr/remove_version_link 
Un-linkify version in settings
 2020-03-09 16:27:07 +00:00
David Baker 650d3d0e2d Un-linkify version in settings 
Probably a bit confusing while our changelogs are mostly in react-sdk,
and ended up linking to version 0.0.0 in nightly builds.
 2020-03-09 16:17:25 +00:00
Weblate f100eeac6f Merge branch 'origin/develop' into Weblate. 2020-03-09 16:15:45 +00:00
catborise 5d9f9db3fa Translated using Weblate (Turkish) 
Currently translated at 77.3% (1655 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-03-09 16:15:45 +00:00
Tirifto bc34dfa60a Translated using Weblate (Esperanto) 
Currently translated at 86.1% (1845 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-03-09 16:15:44 +00:00
J. Ryan Stinnett d2cd64d9d3
Merge pull request #4186 from matrix-org/jryans/mjolnir-stop 
Make Mjolnir stop more robust
 2020-03-09 16:15:32 +00:00
Bruno Windels 9961f810f1 update i18n 2020-03-09 16:54:00 +01:00
Bruno Windels dcbbf31f04 fix lint 2020-03-09 16:50:34 +01:00
Bruno Windels f7cb633e3d only load local aliases on mount when you can edit the canonical alias 2020-03-09 16:43:52 +01:00
Bruno Windels 053ba1110a make pressing enter not reload riot when editable list is in form 2020-03-09 16:32:31 +01:00
Bruno Windels 7079d70f18 hide local aliases by default 2020-03-09 16:32:13 +01:00
Bruno Windels 08a31886a7 make domain postfix optional (not needed for alt aliases) 2020-03-09 16:31:30 +01:00
Bruno Windels eb539537f2 add recommendations for alt aliases 2020-03-09 16:31:07 +01:00
Bruno Windels 38e99f3a68 add editable list for alt aliases 2020-03-09 16:29:04 +01:00
Bruno Windels ee9558cb0b change state from domainToAliases to local and alt aliases 2020-03-09 16:28:33 +01:00
J. Ryan Stinnett c425d7f02f Make Mjolnir stop more robust 
Since Mjolnir is a shared instance, we need to be a bit more careful about
clearing internal state than we do for components. This clears watcher and
dispatcher refs in case `stop` is called multiple times (which can happen in
prod as well as tests).
 2020-03-09 15:24:56 +00:00
Weblate da13b8a9be Merge branch 'origin/develop' into Weblate. 2020-03-09 13:48:19 +00:00
random 2377405773 Translated using Weblate (Italian) 
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-03-09 13:48:19 +00:00
J. Ryan Stinnett 47b1552ccc Fix secret sharing names to match spec 
When sharing keys, we should use `m.cross_signing` prefix.

Part of https://github.com/vector-im/riot-web/issues/12661
 2020-03-09 13:36:02 +00:00
Weblate 5beeb4805c Merge branch 'origin/develop' into Weblate. 2020-03-09 09:55:44 +00:00
Zoe 49fe1887df
Merge pull request #4172 from matrix-org/foldleft/secret-requests 
Share secrets with another device on request
 2020-03-09 09:55:38 +00:00
Weblate 81bbc1f5bf Merge branch 'origin/develop' into Weblate. 2020-03-09 08:35:30 +00:00
catborise 0c4aac91a4 Translated using Weblate (Turkish) 
Currently translated at 77.0% (1650 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-03-09 08:35:30 +00:00
@a2sc:matrix.org 291e5152e8 Translated using Weblate (German) 
Currently translated at 78.2% (1674 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-09 08:35:26 +00:00
Tentarial 0cf5594b97 Translated using Weblate (German) 
Currently translated at 78.2% (1674 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-09 08:35:26 +00:00
Kévin C b6a0921bff Translated using Weblate (French) 
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-09 08:35:25 +00:00
Nathan Follens 0e7428f44c Translated using Weblate (Dutch) 
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-03-09 08:35:24 +00:00
Stanislav Lukeš 7cf4b1238d Translated using Weblate (Czech) 
Currently translated at 99.9% (2141 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/cs/
 2020-03-09 08:35:24 +00:00
Jeff Huang 84f7dc9660 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-09 08:35:23 +00:00
Bruno Windels 1e95048018
Merge pull request #4181 from matrix-org/bwindels/bringbacklegacyverififnoxsignkeys 
Fall back to to_device verification if other user hasn't uploaded cross-signing keys
 2020-03-09 08:35:13 +00:00
Aaron Raimist f9f87defa4 Only show old room name if it exists 2020-03-07 12:36:24 -06:00
@a2sc:matrix.org 212c970d91 Translated using Weblate (German) 
Currently translated at 77.5% (1659 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-07 09:43:12 +00:00
Tentarial f2f8e5e2f6 Translated using Weblate (German) 
Currently translated at 77.5% (1659 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-07 09:43:11 +00:00
@a2sc:matrix.org 36de51d034 Translated using Weblate (German) 
Currently translated at 77.4% (1657 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-07 09:41:31 +00:00
Tentarial 47d73e3a64 Translated using Weblate (German) 
Currently translated at 77.4% (1657 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-07 09:41:31 +00:00
@a2sc:matrix.org 356120f0da Translated using Weblate (German) 
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-07 09:41:16 +00:00
natowi dd0d98b997 Translated using Weblate (German) 
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-07 09:41:15 +00:00
Krombel 69bfabdcf8 Translated using Weblate (German) 
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-07 09:41:15 +00:00
Bamstam c0abae2928 Translated using Weblate (German) 
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-07 09:41:14 +00:00
Tentarial 832f904cdb Translated using Weblate (German) 
Currently translated at 77.3% (1656 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/de/
 2020-03-07 09:41:14 +00:00
Aaron Raimist 7850c506b7
When room name is changed, show both the old and new name 
Signed-off-by: Aaron Raimist <aaron@raim.ist>
 2020-03-06 22:21:38 -06:00
Travis Ralston 661508ddf8 Order theme names in the dropdown 2020-03-06 17:52:16 -07:00
Travis Ralston 6aeca7b853 UX polish for custom themes 2020-03-06 17:43:10 -07:00
Travis Ralston 65d7bb2ef9 Merge branch 'develop' into travis/poc/theme-command 2020-03-06 17:33:22 -07:00
Weblate 584fb4e905 Merge branch 'origin/develop' into Weblate. 2020-03-06 21:35:07 +00:00
MamasLT 0be4a15bb2 Translated using Weblate (Lithuanian) 
Currently translated at 43.5% (932 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/lt/
 2020-03-06 21:35:07 +00:00
Szimszon b138f1921f Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-03-06 21:35:05 +00:00
Osoitz 7a640522fe Translated using Weblate (Basque) 
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eu/
 2020-03-06 21:35:05 +00:00
Travis Ralston e4d323d2f2 Disable edits on redacted events 
Fixes https://github.com/vector-im/riot-web/issues/12633
 2020-03-06 14:23:20 -07:00
Weblate c8b815d27f Merge branch 'origin/develop' into Weblate. 2020-03-06 16:47:24 +00:00
Besnik Bleta a8a499ce7d Translated using Weblate (Albanian) 
Currently translated at 99.7% (2135 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-06 16:47:23 +00:00
Bruno Windels 4fd1d8a5e7
Merge pull request #4180 from matrix-org/bwindels/toastwithoutxsign 
Use crypto.verification.request even when xsign is disabled
 2020-03-06 16:47:17 +00:00
Bruno Windels b312e73510 Merge branch 'bwindels/toastwithoutxsign' into bwindels/bringbacklegacyverififnoxsignkeys 2020-03-06 17:44:23 +01:00
Bruno Windels 1f9bd55f3b revert to legacy user verification (over to_device) without xsign keys 2020-03-06 17:37:01 +01:00
Bruno Windels b0617f10e8 stick to IncomingSasDialog as VerificationRequestDialog doesn't show sender yet, makes e2e tests fail 2020-03-06 17:22:56 +01:00
Bruno Windels f8ef5bb6a5 check .started first as it can be both .started and pending 2020-03-06 17:20:08 +01:00
Bruno Windels a7de575316 use crypto.verification.request even when xsign is disabled 2020-03-06 16:50:39 +01:00
Weblate e435f46993 Merge branch 'origin/develop' into Weblate. 2020-03-06 15:28:37 +00:00
Kévin C 778251680d Translated using Weblate (French) 
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-06 15:28:37 +00:00
Nathan Follens 38ee5c09e4 Translated using Weblate (Dutch) 
Currently translated at 99.9% (2141 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-03-06 15:28:37 +00:00
Jeff Huang 02d76bdef5 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-06 15:28:36 +00:00
Damir Jelić 69389823f7 ManageEventIndexDialog: Reword and move the crawler state around a bit. 
This reflects now the latests design on Figma.
 2020-03-06 16:07:10 +01:00
Damir Jelić 364899b27d ManageEventIndexDialog: Show how many rooms are done instead being processed. 2020-03-06 15:44:23 +01:00
Damir Jelić bff3f3e632 Revert "ManageEventIndexDialog: Reword the status for the currently indexing rooms." 
This reverts commit 7d6569a0b87c48733dbddec3c2662325977d0234.
 2020-03-06 15:44:23 +01:00
Damir Jelić 8fe54e5dca ManageEventIndexDialog: Reword the status for the currently indexing rooms. 2020-03-06 15:44:23 +01:00
Weblate eeef56c22d Merge branch 'origin/develop' into Weblate. 2020-03-06 00:24:59 +00:00
Szimszon e900fe04e8 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2142 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-03-06 00:24:59 +00:00
Besnik Bleta a275d296fe Translated using Weblate (Albanian) 
Currently translated at 99.7% (2135 of 2142 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-06 00:24:58 +00:00
Travis Ralston 1975a8e082 Merge branch 'develop' into move-read-receipts-to-bottom 2020-03-05 17:13:24 -07:00
Weblate 3fbdf567be Merge branch 'origin/develop' into Weblate. 2020-03-05 18:01:18 +00:00
Travis Ralston fcc28c4d4d
Merge pull request #4159 from mstriemer/mark-as-read-button 
Include a mark as read X under the scroll to unread button
 2020-03-05 11:01:12 -07:00
Weblate a524f76a08 Merge branch 'origin/develop' into Weblate. 2020-03-05 17:38:06 +00:00
Travis Ralston 3527fae275
Merge pull request #4178 from n0emis/crosssigning-presence 
Show the room presence indicator, even when cross-singing is enabled
 2020-03-05 10:38:01 -07:00
Weblate d54abc0c86 Merge branch 'origin/develop' into Weblate. 2020-03-05 17:09:50 +00:00
Besnik Bleta 597343018d Translated using Weblate (Albanian) 
Currently translated at 99.7% (2134 of 2141 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-05 17:09:50 +00:00
Travis Ralston e9657cea70 Merge branch 'develop' into travis/poc/theme-command 2020-03-05 09:49:32 -07:00
Bruno Windels 7d051d6a1d await request promise inside encryption panel to show spinner 2020-03-05 17:44:35 +01:00
Weblate 96b8a6160e Merge branch 'origin/develop' into Weblate. 2020-03-05 14:47:09 +00:00
J. Ryan Stinnett 3c2f4a5c42
Merge pull request #4129 from matrix-org/benp/add-security-disclosure-link 
link to matrix.org/security-disclosure-policy in help screen
 2020-03-05 14:47:02 +00:00
Ben Parsons d28d330b33 run yarn i18n 2020-03-05 14:33:40 +00:00
Ben Parsons ce84967225 update Security Disclosure Policy link text 2020-03-05 14:18:12 +00:00
Zoe 26177a19d5 access cross-signing callbacks via method 2020-03-05 10:49:06 +00:00
Weblate 2ae881237e Merge branch 'origin/develop' into Weblate. 2020-03-05 09:24:15 +00:00
Jeff Huang cc26dc157b Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-05 09:24:15 +00:00
Bruno Windels 5df35ea432
Merge pull request #4174 from matrix-org/bwindels/showverifyifuserhasxsignkeys 
only show verify button if user has uploaded cross-signing keys
 2020-03-05 09:24:09 +00:00
Bruno Windels a5cd0a7d5f indent by 4 spaces 2020-03-05 11:09:45 +01:00
Weblate 76de422803 Merge branch 'origin/develop' into Weblate. 2020-03-04 22:35:39 +00:00
Travis Ralston 9836a7a655
Merge pull request #4176 from matrix-org/travis/linkify-rooms 
Fix room alias references in topics
 2020-03-04 15:35:34 -07:00
Weblate bc9ea1de39 Merge branch 'origin/develop' into Weblate. 2020-03-04 22:35:33 +00:00
Simeon Keske cf1d9cc8b5
make the linter happy 2020-03-04 22:46:07 +01:00
Simeon Keske 98f0a2ab67
show the room presence indicator, even when cross-singing is enabled 2020-03-04 22:30:24 +01:00
Travis Ralston 4a976acb84 Add a null check to getUniqueRoomsWithIndividuals 
Fixes https://github.com/vector-im/riot-web/issues/12611
 2020-03-04 14:18:56 -07:00
Travis Ralston c6af591c6e Ensure linkified topics in the room directory also work 
We weren't passing the options object down to linkifyString.

Fixes https://github.com/vector-im/riot-web/issues/12606
 2020-03-04 14:14:03 -07:00
Travis Ralston d820356990 Convert alias links in room header topics to local permalinks 
Fixes https://github.com/vector-im/riot-web/issues/12605
 2020-03-04 13:56:58 -07:00
Weblate ab20600f9d Merge branch 'origin/develop' into Weblate. 2020-03-04 19:59:14 +00:00
Travis Ralston 7aba168c34
Merge pull request #4170 from matrix-org/travis/sso-register-dev 
Disable registration flows on SSO servers
 2020-03-04 12:59:08 -07:00
Travis Ralston 2204785026 Simplify SSO step checking 2020-03-04 12:26:08 -07:00
Weblate 7ea9f5e3cd Merge branch 'origin/develop' into Weblate. 2020-03-04 19:24:37 +00:00
Travis Ralston 68258d8e89
Merge pull request #4160 from matrix-org/travis/filter-blank 
Don't group blank membership changes
 2020-03-04 12:24:31 -07:00
Weblate ee42f35f09 Merge branch 'origin/develop' into Weblate. 2020-03-04 19:24:04 +00:00
Besnik Bleta 830c6e7cc8 Translated using Weblate (Albanian) 
Currently translated at 99.5% (2129 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-03-04 19:24:04 +00:00
Travis Ralston 8e3fea9d0f Use an algorithmic comparator for room list ops 
Not all algorithms are timestamp based.
 2020-03-04 12:09:05 -07:00
Travis Ralston 80b44f0292 Always calculate the category of a room 
All the update triggers for the RoomListStore go through the `setRoomCategory` function, so by returning early we're not actually calculating where a room should be in the list.
 2020-03-04 12:05:47 -07:00
Travis Ralston b06a82ee80 Use textForEvent to determine if an event is worth rendering 2020-03-04 11:44:12 -07:00
Travis Ralston 3842bce74d Fix SSO for new approach 2020-03-04 11:41:16 -07:00
Bruno Windels 8a964dbff0 avoid ref by getting count in setter callback 2020-03-04 17:19:54 +01:00
Bruno Windels afc7273d10 use pendingUpdateCount rather, so we don't show multiple spinners 2020-03-04 16:58:04 +01:00
Bruno Windels 29af8add5d only show verify button if user has uploaded cross-signing keys 2020-03-04 16:10:06 +01:00
Zoe 4396d85d1f Share secrets with another device on request 2020-03-04 14:58:42 +00:00
Weblate 0e042f66c5 Merge branch 'origin/develop' into Weblate. 2020-03-04 14:54:40 +00:00
J. A. Durieux c8cd9b4437 Translated using Weblate (Dutch) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-03-04 14:43:33 +00:00
J. Ryan Stinnett 7ad8eeb906 Fix composer touch bar flickering on keypress in Chrome 
This changes our selection state handling to leave things alone if the browser's
state already matches what we want. This avoids strange side effects like the
touch bar flickering on each key press in Chrome.

Fixes https://github.com/vector-im/riot-web/issues/9299
 2020-03-04 14:35:11 +00:00
Weblate 2aae6276f7 Merge branch 'origin/develop' into Weblate. 2020-03-04 11:41:48 +00:00
Nathan Follens 141989a51f Translated using Weblate (Dutch) 
Currently translated at 100.0% (2140 of 2140 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nl/
 2020-03-04 11:41:48 +00:00
RiotRobot 1d4f77dacc Merge branch 'master' into develop 2020-03-04 11:40:35 +00:00
Bruno Windels 070b430702 also use relative scrolling when eh ... doing relative scrolling 2020-03-04 10:26:27 +00:00
Bruno Windels 462c3411b2 add comment how offset from bottom is calculated 2020-03-04 10:26:27 +00:00
Bruno Windels 91aa8d4a3a use relative scrolling to compensate when changing height 2020-03-04 10:26:27 +00:00
Travis Ralston 93c696f15e Appease the linter 2020-03-03 23:26:35 -07:00
Travis Ralston 3cff6d7239 Appease the linter 2020-03-03 23:26:20 -07:00
Travis Ralston e83a4ddbe5 i18n 2020-03-03 23:24:56 -07:00
Travis Ralston e265c92b6e Redirect registration requests to Login when the server supports SSO 
For https://github.com/vector-im/riot-web/issues/12362
 2020-03-03 23:24:50 -07:00
Travis Ralston bcfe1fcac5 Wire up 'create account' to the SSO button when SSO is used 
For https://github.com/vector-im/riot-web/issues/12362
 2020-03-03 23:23:53 -07:00
Travis Ralston a12786c171 i18n 2020-03-03 23:23:12 -07:00
Travis Ralston 04c54dc5a0 Redirect registration requests to Login when the server supports SSO 
For https://github.com/vector-im/riot-web/issues/12362
 2020-03-03 23:19:36 -07:00
Travis Ralston 8234b4d656 Wire up 'create account' to the SSO button when SSO is used 
For https://github.com/vector-im/riot-web/issues/12362
 2020-03-03 23:11:29 -07:00
Weblate 43f445d8f7 Merge branch 'origin/develop' into Weblate. 2020-03-03 22:27:53 +00:00
Michael Telatynski f08d034f84
Merge pull request #4158 from matrix-org/t3chguy/sso 
riot-desktop open SSO in browser so user doesn't have to auth twice
 2020-03-03 22:27:48 +00:00
Travis Ralston 846170b371 Revert "Fix downloading files in electron not being sent into browser" 
This reverts commit d89b8b5148.
 2020-03-03 13:33:07 -07:00
Weblate 863d66cc08 Merge branch 'origin/develop' into Weblate. 2020-03-03 18:03:40 +00:00
J. Ryan Stinnett ffde56d804
Merge pull request #4165 from matrix-org/jryans/lock-auth-success 
Lock login and registration buttons after submit
 2020-03-03 18:03:34 +00:00
J. Ryan Stinnett 191dcaab82 Explain why not busy is ignored 2020-03-03 17:41:28 +00:00