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

21270 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
cf08aa2b0e Merge branch 'origin/develop' into Weblate. 2020-01-24 22:36:49 +00:00
catborise
662c723bf3 Translated using Weblate (Turkish) 
Currently translated at 73.7% (1515 of 2056 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/tr/
 2020-01-24 22:36:49 +00:00
Szimszon
95df8b9bb7 Translated using Weblate (Hungarian) 
Currently translated at 99.8% (2052 of 2056 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-01-24 22:36:47 +00:00
J. Ryan Stinnett
ee303b0d56
Merge pull request #3938 from matrix-org/jryans/webpack-warnings 
Resolve default export warnings from Webpack
 2020-01-24 22:36:39 +00:00
J. Ryan Stinnett
9991a544aa Resolve default export warnings from Webpack 
Webpack was printing several warnings about missing default exports,
particularly from components, where we auto-generate a default import via the
component index.

As part of this, the emoji picker recent handling (which is not a component) is
moved elsewhere to avoid the generated import.
 2020-01-24 22:26:34 +00:00
David Baker
3d7137d4ad Setup flow for cross-signing on login / registration 
Still outstanding:
 * Keep password from login / registration
 * Confirmation on skip button

Fixes https://github.com/vector-im/riot-web/issues/11902
 2020-01-24 19:11:57 +00:00
J. Ryan Stinnett
bf0e1efce8 Hide default encryption algorithm 
When the default encryption algorithm is used, we hide it to remove some jargon
from the app. For any other algorithm, we continue showing it and add
"unrecognised".

Fixes https://github.com/vector-im/riot-web/issues/8829
 2020-01-24 17:53:33 +00:00
J. Ryan Stinnett
2021498755 Update profile avatar letter size 
Fixes https://github.com/vector-im/riot-web/issues/12042
 2020-01-24 17:31:04 +00:00
Weblate
bf9d943a5c Merge branch 'origin/develop' into Weblate. 2020-01-24 16:49:36 +00:00
Travis Ralston
1986f13275
Merge pull request #3934 from matrix-org/travis/cross-signing-info 
Add null check for cross-signing info in verification panel
 2020-01-24 09:49:30 -07:00
Travis Ralston
540a7f5c02 less duplication 2020-01-24 09:41:47 -07:00
Michael Telatynski
b67256c7c2 post-merge fix 2020-01-24 16:41:43 +00:00
Travis Ralston
91d59556db Also check for our own key ID 2020-01-24 09:37:12 -07:00
Travis Ralston
f8e0dcf264 Add null check for cross-signing info in verification panel 2020-01-24 09:33:55 -07:00
Michael Telatynski
342fcb09c4 Merge branch 'develop' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/cs_verification_decoration 
 Conflicts:
	src/components/views/right_panel/VerificationPanel.js
	src/components/views/toasts/VerificationRequestToast.js
 2020-01-24 16:19:41 +00:00
Michael Telatynski
7a5e172b88 Apply a huge part of the decorations and copy 2020-01-24 16:16:46 +00:00
Weblate
f51d3b196d Merge branch 'origin/develop' into Weblate. 2020-01-24 15:57:49 +00:00
Travis Ralston
169ca4a4da
Merge pull request #3926 from matrix-org/travis/event-tile-trace 
Add trace logging to figure out which component is causing weird events
 2020-01-24 08:57:43 -07:00
Weblate
72f24b127d Merge branch 'origin/develop' into Weblate. 2020-01-24 15:57:33 +00:00
Travis Ralston
9722b34c35
Merge pull request #3906 from matrix-org/travis/user-lists-labs 
Remove user lists feature flag, making it the default
 2020-01-24 08:57:27 -07:00
Weblate
5ccf5573da Merge branch 'origin/develop' into Weblate. 2020-01-24 15:57:24 +00:00
Travis Ralston
ddafd010ee
Merge pull request #3925 from matrix-org/travis/invite-polish 
Last bit of polish for user lists
 2020-01-24 08:57:18 -07:00
Travis Ralston
abc2808b62 Fix i18n post-merge 2020-01-24 08:57:03 -07:00
Travis Ralston
5f2df15987
Merge branch 'develop' into travis/invite-polish 2020-01-24 08:56:18 -07:00
Weblate
72e7ac4a7a Merge branch 'origin/develop' into Weblate. 2020-01-24 15:55:45 +00:00
Travis Ralston
eb2402609a
Merge pull request #3871 from matrix-org/travis/qr-verif-rp 
QR code verification
 2020-01-24 08:55:40 -07:00
Damir Jelić
9f3e5ab1db ManageEventIndexDialog: Remove an unused import. 2020-01-24 16:52:26 +01:00
Damir Jelić
3208ac60c7 ManageEventIndexDialog: Override the Disable button class to be danger. 2020-01-24 16:47:29 +01:00
Damir Jelić
5d3b916a89 DialogButtons: Allow setting the cancel button class with a prop. 2020-01-24 16:46:46 +01:00
Damir Jelić
cd225943ea EventIndexPanel: Shorten a overly long line. 2020-01-24 16:22:09 +01:00
Damir Jelić
ddea7415c7 EventIndexPanel: Use formatCountLong to format the event and room counts. 2020-01-24 16:15:06 +01:00
Damir Jelić
2d8477aaa6 FormattingUtils: Add a formatCountLong method. 2020-01-24 16:13:55 +01:00
Weblate
36b8ab0bf0 Merge branch 'origin/develop' into Weblate. 2020-01-24 15:09:36 +00:00
David Baker
9887ba13b5
Merge pull request #3933 from matrix-org/dbkr/stop_giving_jeff_bezos_all_our_money 
Do less unnecessary work on CI
 2020-01-24 15:09:31 +00:00
David Baker
26aaa58e3c Comments are great 2020-01-24 14:58:46 +00:00
David Baker
b17f38856c More quote failing 2020-01-24 14:56:00 +00:00
David Baker
de5c47960c quotes 2020-01-24 14:51:11 +00:00
David Baker
19c49eedec reskindex for tests 2020-01-24 14:36:12 +00:00
David Baker
57ee99d6f7 chmod 2020-01-24 14:30:41 +00:00
Damir Jelić
47999c2e46 EventIndexPanel: Add a separate message for the case where Seshat is missing. 2020-01-24 15:26:54 +01:00
Damir Jelić
2252f48e04 DisableEventIndexDialog: Use a self-closing tag for the buttons. 2020-01-24 15:26:24 +01:00
Damir Jelić
97d55f63a3 DisableEventIndexDialog: Remove the incorrect class on the dialog. 2020-01-24 15:26:09 +01:00
David Baker
5536384866 Do less unnecessary work on CI 
We were checking out & installing the develop js-sdk explicitly
in cases where we didn't need it at all. We were babeling the src
folder many, many times over (in some cases twice in the same job)
and never using the output at all.
 2020-01-24 14:21:28 +00:00
Weblate
4243e2e713 Merge branch 'origin/develop' into Weblate. 2020-01-24 14:19:57 +00:00
David Baker
75f5326db2
Merge pull request #3932 from matrix-org/dbkr/reenable_stylelint 
Re-enable stylelint on CI
 2020-01-24 14:19:53 +00:00
David Baker
098d097922 Re-enable stylelint on CI 2020-01-24 14:03:31 +00:00
Weblate
5ed599f6d7 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:54:56 +00:00
Zoe
543be90eda
Merge pull request #3931 from matrix-org/foldleft/12035-room-decoration-design-pass 
Design pass for room icons
 2020-01-24 13:54:51 +00:00
Damir Jelić
cbfde4d78f Merge branch 'poljar/seshat-filepanel' into develop 2020-01-24 14:44:24 +01:00
Weblate
b0bfef3b47 Merge branch 'origin/develop' into Weblate. 2020-01-24 13:44:01 +00:00