OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity
22,270 Commits
202 Branches
546 Tags
420 MiB
Commit Graph

22270 Commits (663ccb7796131b96fc9dfbe68285c1060e7d6dce)

Author SHA1 Message Date
Bruno Windels 663ccb7796 run i18n 2020-03-17 11:48:31 +01:00
Bruno Windels 26f2bcd073 Update src/components/views/room_settings/AliasSettings.js 
Co-Authored-By: J. Ryan Stinnett <jryans@gmail.com>
 2020-03-17 11:48:31 +01:00
Bruno Windels 048d3f0e42 fix style lint 2020-03-17 11:48:31 +01:00
Bruno Windels dd19f27964 more margin between published and local addresses 2020-03-17 11:48:31 +01:00
Bruno Windels a591e5016f tweak labels, etc 2020-03-17 11:48:31 +01:00
Bruno Windels 5537e6dcd4 change <details> appearance for local aliases 2020-03-17 11:48:31 +01:00
Bruno Windels 42ff9f2c9e make editable list look like something closer to design 2020-03-17 11:48:31 +01:00
Bruno Windels cb271fe027 avoid double margin-right for toggle 2020-03-17 11:48:31 +01:00
Bruno Windels 76b7194a4f add headers and copy to lessen confusion of new alias workings 2020-03-17 11:48:31 +01:00
Bruno Windels 57b2dd92f5 move room publish toggle below canonical alias 
also to own component to not contaminate alias settings too much
with this
 2020-03-17 11:48:31 +01:00
Bruno Windels 8d56fb4c35
Merge pull request #4211 from matrix-org/bwindels/viaserversfromroomdir-release 
Fix: best-effort to join room without canonical alias over federation from room directory
 2020-03-13 10:42:05 +00:00
Bruno Windels 6b44254b4c pass current server as via server to join room 2020-03-13 11:34:19 +01:00
RiotRobot 9b6986e862 v2.2.3-rc.1 2020-03-11 17:33:57 +00:00
RiotRobot 5d4651578f Prepare changelog for v2.2.3-rc.1 2020-03-11 17:33:57 +00:00
RiotRobot 15d5190b9b js-sdk rc.1 2020-03-11 16:18:08 +00:00
David Baker 53fabf61d6
Merge pull request #4200 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate
 2020-03-11 14:50:43 +00:00
David Baker 80e7cbf2e1 Translated using Weblate (Russian) 
Currently translated at 83.2% (1783 of 2144 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/
 2020-03-11 14:34:18 +00:00
Weblate 526136cc67 Merge branch 'origin/develop' into Weblate. 2020-03-11 11:30:21 +00:00
Bruno Windels 138e663498
Merge pull request #4198 from matrix-org/bwindels/dontenable4swhenacceptingverifreq 
Revert "enable 4s when accepting a verification request"
 2020-03-11 11:30:15 +00:00
Weblate 1157e2866d Merge branch 'origin/develop' into Weblate. 2020-03-11 09:21:07 +00:00
Michael Telatynski f9954a668c
Merge pull request #4197 from matrix-org/t3chguy/dont_remount_main_split 
Don't remount main split children on rhs collapse
 2020-03-11 09:21:01 +00:00
Bruno Windels 13a4f4190f Revert "also enable 4s when accepting a verification request" 
This reverts commit ab2e3a3465.
 2020-03-11 10:11:54 +01:00
Weblate 8dab4667f7 Merge branch 'origin/develop' into Weblate. 2020-03-11 09:04:19 +00:00
Bruno Windels 1ae4a1cd5b
Merge pull request #4195 from matrix-org/bwindels/alwayshavealabelforcanonaliasevent 
Add fallback label for canonical alias events that dont change anything
 2020-03-11 09:04:14 +00:00
Weblate 50d1b58d6b Merge branch 'origin/develop' into Weblate. 2020-03-11 09:03:44 +00:00
catborise 8e647e539f Translated using Weblate (Turkish) 
Currently translated at 78.3% (1678 of 2143 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-03-11 09:03:43 +00:00
Kévin C 58d3ad515f Translated using Weblate (French) 
Currently translated at 100.0% (2143 of 2143 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-03-11 09:03:41 +00:00
Jeff Huang 73980422e6 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2143 of 2143 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-03-11 09:03:40 +00:00
Bruno Windels 27db5d68be
Merge pull request #4196 from matrix-org/bwindels/verifdialogpromise 
Immediately switch to verification dialog when clicking [Continue] from new session dialog
 2020-03-11 09:03:31 +00:00
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