mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-16 21:21:46 +03:00
Code Issues Projects Releases Packages Wiki Activity
22902 commits 219 branches 562 tags 474 MiB
Commit graph

22902 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael Telatynski
78ffb3ddf4 Don't remount main split children on rhs collapse 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
 2020-03-10 20:09:40 +00:00
Weblate
d219e989ac Merge branch 'origin/develop' into Weblate. 2020-03-10 18:03:09 +00:00
Bruno Windels
f22554e99a
Merge pull request #4194 from matrix-org/bwindels/enable4sonverify 
Enable 4S if needed when trying to verify or accepting verification
 2020-03-10 18:03:02 +00:00
Bruno Windels
91de7fd7b6 also allow passing a promise to a verif request to the verification dialog 2020-03-10 18:59:45 +01:00
Bruno Windels
5d7f2f96e7 add fallback label for canonical alias events that dont change anything 2020-03-10 18:45:51 +01:00
Bruno Windels
1eb5bdf847 use USK as we'll only have that around when using key sharing 2020-03-10 18:40:24 +01:00
Weblate
e6e253d13c Merge branch 'origin/develop' into Weblate. 2020-03-10 17:29:12 +00:00
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
Weblate
37e6fff410 Merge branch 'origin/develop' into Weblate. 2020-03-10 10:04:38 +00:00
J. Ryan Stinnett
b64faad4e5
Merge pull request #4190 from matrix-org/jryans/mark-as-read-dark 
Fix mark as read button for dark theme
 2020-03-10 10:04:32 +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
J. Ryan Stinnett
c541bc0705 Fix mark as read button for dark theme 
This changes the mark as read button to a mask image so that it can be themed
like other images.

Fixes https://github.com/vector-im/riot-web/issues/12640
 2020-03-09 17:34:17 +00: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
5eaf03c3da update e2e tests to expand local aliases when adding one 2020-03-09 17:03:50 +01:00
Bruno Windels
9961f810f1 update i18n 2020-03-09 16:54:00 +01:00
Bruno Windels
8ee714f86d show hand cursor over summary 2020-03-09 16:50:48 +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
769f1f4e00
Merge pull request #4185 from matrix-org/jryans/sharing-names 
Fix secret sharing names to match spec
 2020-03-09 13:48:11 +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