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

24597 commits

This branch
This branch
All branches
Author SHA1 Message Date
Weblate
fba28097e3 Merge branch 'origin/develop' into Weblate. 2020-05-06 23:03:48 +00:00
Travis Ralston
7f030a149e
Merge pull request #4557 from matrix-org/travis/3pid-loading 
Add a loading state for email addresses/phone numbers in settings
 2020-05-06 17:03:42 -06:00
Travis Ralston
9ae812c346 Add a loading state for email addresses/phone numbers in settings 
Fixes https://github.com/vector-im/riot-web/issues/13432
 2020-05-06 15:17:55 -06:00
Travis Ralston
e5da81b6ba Ensure key backup gets dealt with correctly during secret storage reset 
Fixes https://github.com/vector-im/riot-web/issues/13562

We only initialize a new key backup if the user requested one. If they've requested new keys but have not asked for keys to be backed up, we simply delete the now-invalid backup.

This also adds some logging to identify in rageshakes when someone resets their cross-signing, and when their key backup is being deleted.
 2020-05-06 14:42:03 -06:00
Travis Ralston
b8fd50c5e3 Appease the linter 2020-05-06 14:27:32 -06:00
Travis Ralston
17be9805e1 Set SSO dialog aesthetics for cross-signing setup 
Fixes https://github.com/vector-im/riot-web/issues/13042
 2020-05-06 14:24:37 -06:00
Travis Ralston
d31a0199bc Add default dialog aesthetics to avoid empty SSO dialogs in future 2020-05-06 14:24:16 -06:00
Szimszon
cff7ce3934 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2304 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-05-06 18:59:24 +00:00
Besnik Bleta
76a5c31338 Translated using Weblate (Albanian) 
Currently translated at 99.8% (2300 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-05-06 17:38:56 +00:00
Weblate
48e6810524 Merge branch 'origin/develop' into Weblate. 2020-05-06 17:27:06 +00:00
Travis Ralston
19bb678dd6
Merge pull request #4554 from nimbleape/pwa-taskbar-colour-follow-theme 
set the meta tag for theme-color to the same theme css background
 2020-05-06 11:27:01 -06:00
Weblate
a10136fb6d Merge branch 'origin/develop' into Weblate. 2020-05-06 17:16:48 +00:00
Besnik Bleta
7eea8277c5 Translated using Weblate (Albanian) 
Currently translated at 99.9% (2301 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2020-05-06 17:16:47 +00:00
Michael Telatynski
62bbf15efe
Merge pull request #4497 from matrix-org/t3chguy/invite_copy 
Update Invite Dialog copy to include email addresses
 2020-05-06 18:16:36 +01:00
Jorik Schellekens
bab7d5f461 Some lints 2020-05-06 17:25:54 +01:00
Weblate
9634992c5f Merge branch 'origin/develop' into Weblate. 2020-05-06 16:08:26 +00:00
call_xz
fe00c23be8 Translated using Weblate (Japanese) 
Currently translated at 55.2% (1272 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-05-06 16:08:26 +00:00
random
c42755c693 Translated using Weblate (Italian) 
Currently translated at 100.0% (2304 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/
 2020-05-06 16:08:25 +00:00
Tirifto
c750c28af9 Translated using Weblate (Esperanto) 
Currently translated at 100.0% (2304 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-05-06 16:08:25 +00:00
Jorik Schellekens
d62e6ed05d
Merge pull request #4546 from JorikSchellekens/joriks/font-scaling-regressions 
Fix slider toggle regression.
 2020-05-06 17:08:18 +01:00
Dan Jenkins
1767a611a6
set the meta tag for theme-color to the same theme css background 2020-05-06 16:23:06 +01:00
Weblate
f4c4120568 Merge branch 'origin/develop' into Weblate. 2020-05-06 12:52:56 +00:00
call_xz
d3a276c627 Translated using Weblate (Japanese) 
Currently translated at 54.9% (1266 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-05-06 12:52:56 +00:00
Zoe
14516d3e7e
Merge pull request #4552 from matrix-org/foldleft/fix-sublist-crash 
Fix a crash where a name could unexpectedly be an empty list
 2020-05-06 13:52:50 +01:00
Weblate
df13c0fa50 Merge branch 'origin/develop' into Weblate. 2020-05-06 12:06:37 +00:00
Michael Telatynski
854d27baf5
Merge pull request #4492 from ihatetothink/comunities-drag-from-context 
Solves communities can be dragged from context menu
 2020-05-06 13:06:30 +01:00
Weblate
457ec2d363 Merge branch 'origin/develop' into Weblate. 2020-05-06 10:41:06 +00:00
Imre Kristoffer Eilertsen
c74537383a Translated using Weblate (Norwegian Bokmål) 
Currently translated at 50.1% (1155 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/nb_NO/
 2020-05-06 10:41:06 +00:00
call_xz
3fd089d084 Translated using Weblate (Japanese) 
Currently translated at 54.9% (1264 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ja/
 2020-05-06 10:41:04 +00:00
Kévin C
85524a053e Translated using Weblate (French) 
Currently translated at 100.0% (2304 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2020-05-06 10:41:02 +00:00
Tirifto
b57bb6b291 Translated using Weblate (Esperanto) 
Currently translated at 99.4% (2291 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/eo/
 2020-05-06 10:41:02 +00:00
Jeff Huang
626a300916 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (2304 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/
 2020-05-06 10:40:54 +00:00
Bruno Windels
93f6737982
Merge pull request #4553 from matrix-org/bwindels/fixdefaultcomposeravatar 
Remove prefixes for composer avatar urls
 2020-05-06 10:40:48 +00:00
Bruno Windels
0c5c2501e6 remove prefixes as we're using data urls now 2020-05-06 12:23:03 +02:00
Weblate
b538fbf46e Merge branch 'origin/develop' into Weblate. 2020-05-05 18:56:18 +00:00
Balázs Meskó
26a42ce62e Translated using Weblate (Hungarian) 
Currently translated at 100.0% (2304 of 2304 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2020-05-05 18:56:18 +00:00
Michael Telatynski
d51a18ac49
Merge pull request #4541 from matrix-org/t3chguy/fix-reply-margin 
Fix reply RR spacing getting doubled
 2020-05-05 19:56:11 +01:00
Zoe
781cbea744 Fix a crash where a name could unexpectedly be an empty list 2020-05-05 15:39:37 +01:00
Weblate
59a535f4b9 Merge branch 'origin/develop' into Weblate. 2020-05-05 10:41:09 +00:00
RiotRobot
aa0c6f1f71 Reset matrix-js-sdk back to develop branch 2020-05-05 11:40:37 +01:00
Weblate
dfe302de67 Merge branch 'origin/develop' into Weblate. 2020-05-05 10:28:28 +00:00
RiotRobot
338486b561 Merge branch 'master' into develop 2020-05-05 11:27:52 +01:00
RiotRobot
854855a5aa v2.5.0 2020-05-05 11:10:36 +01:00
RiotRobot
e6c485c7e8 Prepare changelog for v2.5.0 2020-05-05 11:10:36 +01:00
RiotRobot
1423c2e4bc Upgrade matrix-js-sdk to 6.0.0 2020-05-05 11:04:24 +01:00
J. Ryan Stinnett
7b131d873d
Merge pull request #4551 from matrix-org/jryans/event-logging-rm-rc 
EventIndex: Reduce the logging the event index is producing.
 2020-05-05 10:53:15 +01:00
Damir Jelić
51a79a43e3 EventIndex: Remove an unused variable. 2020-05-05 10:49:40 +01:00
Damir Jelić
5aa645caf9 EventIndex: Reduce the logging the event index is producing. 2020-05-05 10:49:40 +01:00
J. Ryan Stinnett
16099f731d
Merge pull request #4550 from matrix-org/bwindels/unverif-session-copy-self-rc 
Differentiate copy for own untrusted device dialog
 2020-05-05 10:39:07 +01:00
Bruno Windels
ab82bf8048 differentiate copy for own untrusted device dialog 2020-05-05 11:31:15 +02:00