mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web.git synced 2024-12-03 20:36:57 +03:00
Code Issues Projects Releases Packages Wiki Activity
12320 commits 217 branches 562 tags 468 MiB
Commit graph

12320 commits

This branch
This branch
All branches
Author SHA1 Message Date
Travis Ralston
6f0f930e0a Merge branch 'develop' into travis/well-known 2018-11-21 13:30:57 -07:00
Weblate
8b4702a365 Merge remote-tracking branch 'origin/develop' into develop 2018-11-21 18:53:44 +00:00
David Baker
23d935fd78 Let's use a version of node we can download rather than dig up 2018-11-21 18:53:18 +00:00
Weblate
0252cf4332 Merge remote-tracking branch 'origin/develop' into develop 2018-11-21 18:37:49 +00:00
David Baker
d714176fcd
Merge pull request #2169 from matrix-org/dbkr/e2e_backups 
Online incremental megolm backups (v2)
 2018-11-21 18:37:43 +00:00
David Baker
b529c98095
Merge pull request #2284 from matrix-org/dbkr/e2e_backups_download_recovery_key 
Add recovery key download button
 2018-11-21 18:25:33 +00:00
David Baker
db26513136
Merge pull request #2283 from matrix-org/dbkr/e2e_backups_passphrase 
Passphrase Support for e2e backups
 2018-11-21 18:25:09 +00:00
David Baker
3828798099 lint 2018-11-21 18:17:26 +00:00
David Baker
40ef2e0cf4 another missed translation 2018-11-21 18:08:44 +00:00
David Baker
1c06d781ae Missed translation 2018-11-21 18:06:37 +00:00
David Baker
08e2ba8c6c Don't allow enter to submit if field invalid 2018-11-21 18:02:58 +00:00
Weblate
c40f6095a0 Merge remote-tracking branch 'origin/develop' into develop 2018-11-21 17:49:02 +00:00
David Baker
3529482be5
Merge pull request #2286 from matrix-org/dbkr/async_dialog_promises 
Update async dialog interface to use promises
 2018-11-21 17:48:56 +00:00
David Baker
2ba4d8a2d9 Remove outdated logging & log on failure 2018-11-21 17:35:28 +00:00
David Baker
985966f8be Update async dialog interface to use promises 
Hopefully makes the syntax a bit nicer. Also uses ES6 async import
rather than require.ensure which is now deprecated. Also also
displays an error if the component fails to load rather than falling
over in a heap, which is nice.
 2018-11-21 16:56:44 +00:00
David Baker
ed5d87e797 Add recovery key download button 2018-11-21 13:57:31 +00:00
David Baker
6fe2c9c2bb Merge branch 'dbkr/e2e_backups' into dbkr/e2e_backups_passphrase 2018-11-20 18:10:57 +00:00
David Baker
8ccaf53d20 Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups 2018-11-20 18:08:39 +00:00
David Baker
63a7ff5273 lint 2018-11-20 16:20:31 +00:00
David Baker
132408cf02 Add e2e backup recovery with passphrase 2018-11-20 16:16:24 +00:00
David Baker
fbab8ceeef Passphrase based key backups 
Add passphrase support to backup creation stage
 2018-11-20 13:11:58 +00:00
Kévin C
3a91f00335 Translated using Weblate (French) 
Currently translated at 100.0% (1281 of 1281 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-11-20 07:56:43 +00:00
Weblate
fce5cb0df4 Merge remote-tracking branch 'origin/develop' into develop 2018-11-19 15:20:30 +00:00
David Baker
93cd3b4206 Merge branch 'master' into develop 2018-11-19 15:20:19 +00:00
David Baker
0165a33f9f v0.14.5 2018-11-19 15:19:17 +00:00
David Baker
df928218d1 Prepare changelog for v0.14.5 2018-11-19 15:19:16 +00:00
David Baker
179b64d185 released js-sdk 2018-11-19 15:16:18 +00:00
Szimszon
4e18635840 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1281 of 1281 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-11-19 13:32:47 +00:00
Weblate
0eeafa368d Merge remote-tracking branch 'origin/develop' into develop 2018-11-19 13:14:27 +00:00
Besnik Bleta
414ff55fe6 Translated using Weblate (Albanian) 
Currently translated at 99.0% (1269 of 1281 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-19 13:14:25 +00:00
Richard van der Hoff
c61031d3e1
Merge pull request #2279 from matrix-org/rav/sso_login_type 
Support for m.login.sso
 2018-11-19 14:14:21 +01:00
Szimszon
dbb8de50d0 Translated using Weblate (Hungarian) 
Currently translated at 100.0% (1281 of 1281 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/
 2018-11-17 19:00:30 +00:00
Besnik Bleta
9697d759c8 Translated using Weblate (Albanian) 
Currently translated at 99.2% (1272 of 1281 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-17 17:11:56 +00:00
Besnik Bleta
3ab8adc8e4 Translated using Weblate (Albanian) 
Currently translated at 97.9% (1255 of 1281 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-17 16:29:36 +00:00
Kévin C
e18dc4bcdd Translated using Weblate (French) 
Currently translated at 100.0% (1281 of 1281 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/
 2018-11-17 08:30:11 +00:00
Weblate
1d4f95ad78 Merge remote-tracking branch 'origin/develop' into develop 2018-11-16 20:25:45 +00:00
Travis Ralston
7dd610b41e
Merge pull request #2235 from MaxwellKepler/develop 
Added badge to non-autoplay GIFs
 2018-11-16 13:25:40 -07:00
Besnik Bleta
ed7ed063f8 Translated using Weblate (Albanian) 
Currently translated at 92.1% (1180 of 1281 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 20:01:43 +00:00
Weblate
94b39cd309 Merge remote-tracking branch 'origin/develop' into develop 2018-11-16 19:36:22 +00:00
Akarshan Biswas
2787ebcc72 Translated using Weblate (Hindi) 
Currently translated at 9.0% (116 of 1280 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
 2018-11-16 19:36:21 +00:00
Travis Ralston
2408eeeb3d
Merge pull request #2277 from matrix-org/travis/terms-auth-improvements 
Improve terms auth flow
 2018-11-16 12:36:17 -07:00
Travis Ralston
7df003ef74 Be more positive in property naming 2018-11-16 12:15:44 -07:00
Weblate
c4668dd1aa Merge remote-tracking branch 'origin/develop' into develop 2018-11-16 17:32:56 +00:00
Akarshan Biswas
ae6c46806c Translated using Weblate (Hindi) 
Currently translated at 4.1% (53 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hi/
 2018-11-16 17:32:55 +00:00
David Baker
e3e82fc9c9
Merge pull request #2282 from matrix-org/dbkr/crypto_db_version_upgrade 
Handle crypto db version upgrade
 2018-11-16 17:32:49 +00:00
Besnik Bleta
400ba219f1 Translated using Weblate (Albanian) 
Currently translated at 88.7% (1133 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 11:34:51 +00:00
David Baker
8281bdf875 Actually add the dialog 2018-11-16 11:33:09 +00:00
David Baker
e112641524 Handle crypto db version upgrade 
Display a dialog telling the user what the situation is with
options to sign out or continue withwout e2e.

Requires https://github.com/matrix-org/matrix-js-sdk/pull/785
 2018-11-16 11:31:46 +00:00
Besnik Bleta
69a3b89405 Translated using Weblate (Albanian) 
Currently translated at 84.9% (1084 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 10:16:33 +00:00
Besnik Bleta
2122bf8384 Translated using Weblate (Albanian) 
Currently translated at 81.8% (1045 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/sq/
 2018-11-16 09:20:39 +00:00