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

22312 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
191abb5b0d
Merge pull request #3892 from krkc/move-read-receipts-to-bottom 
Moved read receipts to the bottom of the EventTile.
 2020-03-05 17:24:51 -07:00
Travis Ralston
1975a8e082 Merge branch 'develop' into move-read-receipts-to-bottom 2020-03-05 17:13:24 -07:00
Weblate
82d4441184 Merge branch 'origin/develop' into Weblate. 2020-03-05 18:04:39 +00:00
Travis Ralston
74fcb103b1
Link to the right contributing guidelines 2020-03-05 11:04:33 -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
Bruno Windels
64b757e302
Merge pull request #4179 from matrix-org/bwindels/localechoforlegacyverif 
Add local echo when clicking "Manually Verify" in unverified session dialog
 2020-03-05 17:09:44 +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
Ben Parsons
a6882cece1 increase margin between Settings sections 2020-03-05 14:10:44 +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
Travis Ralston
d3439c8101
Merge pull request #4177 from matrix-org/travis/no-rooms-dm 
Fix not being able to start chats when you have no rooms
 2020-03-04 15:35:27 -07: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