OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity
12,346 Commits
210 Branches
549 Tags
658 MiB
Commit Graph

12346 Commits (231d8fff6e93ef68b5e5bcd0b71809d2d0a96154)

Author SHA1 Message Date
Bruno Windels 231d8fff6e add new style vars from develop 2018-11-26 13:22:34 +01:00
Bruno Windels 67e0030ccd Merge branch 'develop' into experimental 2018-11-26 13:10:29 +01:00
David Baker 0c6e98548e
Merge pull request #2291 from matrix-org/dbkr/create_key_backup_async 
Make create key backup dialog async
 2018-11-23 11:19:23 +00:00
David Baker 4f8c4f1c6e Make create key backup dialog async 
So we can add zxcvbn to it without inflating the main bundle size
 2018-11-23 10:55:18 +00:00
David Baker a9ae7f3eef
Merge pull request #2288 from matrix-org/dbkr/fix_continue_disabled_download 
Forgot to enable continue button on download
 2018-11-23 07:46:03 +00:00
David Baker d443d6173d Forgot to enable continue button on download 2018-11-22 19:06:58 +00:00
David Baker 43013c65f6 Merge branch 'master' into develop 2018-11-22 16:55:46 +00:00
David Baker 60e22b7e0f v0.14.6 2018-11-22 16:54:53 +00:00
David Baker e27a4af817 Prepare changelog for v0.14.6 2018-11-22 16:54:21 +00:00
David Baker a25ae924b1 js-sdk v0.14.1 2018-11-22 16:49:20 +00:00
David Baker ab40a0b264 Actually add the dialog 2018-11-22 16:39:26 +00:00
David Baker a8db02ff02 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-22 16:39:20 +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
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
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
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
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
Travis Ralston 7dd610b41e
Merge pull request #2235 from MaxwellKepler/develop 
Added badge to non-autoplay GIFs
 2018-11-16 13:25:40 -07: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
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
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
Travis Ralston 8916c90fed Make the 'Accept' button for consent a little more friendly 
Part of https://github.com/vector-im/riot-web/issues/7700
 2018-11-15 20:26:37 -07:00
Richard van der Hoff 90f22c7b43 Support for m.login.sso 
Adds support for the m.login.sso login type, which is handled the same way as
CAS, and also makes it look a bit nicer.
 2018-11-15 19:05:39 +00:00
David Baker 8841108b6b v0.14.5-rc.2 2018-11-15 15:29:24 +00:00
David Baker 3f308c2382 Prepare changelog for v0.14.5-rc.2 2018-11-15 15:29:24 +00:00
David Baker 96ed7b123b js-sdk rc.1 2018-11-15 15:19:59 +00:00
David Baker fcf3172b18 v0.14.5-rc.1 2018-11-15 12:18:53 +00:00
David Baker f0fe1bd3a4 Prepare changelog for v0.14.5-rc.1 2018-11-15 12:18:53 +00:00
David Baker 43e4b05796 Merge remote-tracking branch 'origin/develop' into release-v0.14.5 2018-11-15 12:14:20 +00:00
David Baker 4ea1e4edec
Merge pull request #2278 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk 
Update from Weblate.
 2018-11-15 12:13:09 +00:00
Karol Kosek 41abc8dcdc Translated using Weblate (Polish) 
Currently translated at 93.5% (1194 of 1276 strings)

Translation: Riot Web/matrix-react-sdk
Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/pl/
 2018-11-15 12:02:34 +00:00