Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | crypto: aes: support NativeCrypto7.0.0-zion | Peter Cai | 2020-07-04 | 1 | -0/+12 |
* | Revert "crypto: wrap zerosalt in Buffer" | Peter Cai | 2020-07-04 | 1 | -1/+1 |
* | store: indexeddb: decrease saving interval | Peter Cai | 2020-06-30 | 1 | -1/+1 |
* | crypto: wrap zerosalt in Buffer | Peter Cai | 2020-06-29 | 1 | -1/+1 |
* | v7.0.0 | RiotRobot | 2020-06-23 | 1 | -1/+1 |
* | Prepare changelog for v7.0.0 | RiotRobot | 2020-06-23 | 1 | -0/+6 |
* | v7.0.0-rc.1 | RiotRobot | 2020-06-17 | 1 | -1/+1 |
* | Prepare changelog for v7.0.0-rc.1 | RiotRobot | 2020-06-17 | 1 | -0/+34 |
* | Merge branch 'master' into develop | RiotRobot | 2020-06-16 | 2 | -1/+8 |
|\ | |||||
| * | v6.2.2 | RiotRobot | 2020-06-16 | 1 | -1/+1 |
| * | Prepare changelog for v6.2.2 | RiotRobot | 2020-06-16 | 1 | -0/+7 |
| * | Merge pull request #1407 from matrix-org/jryans/1403-release | J. Ryan Stinnett | 2020-06-16 | 1 | -2/+8 |
| |\ | |||||
| | * | undo that because `{}` sux | Michael Telatynski | 2020-06-16 | 1 | -1/+8 |
| | * | clean up | Michael Telatynski | 2020-06-16 | 1 | -8/+1 |
| | * | Use existing session id for fetching flows as to not get a new session id | Michael Telatynski | 2020-06-16 | 1 | -2/+8 |
| |/ | |||||
* | | Merge pull request #1404 from matrix-org/t3chguy/push-rules-device | Michael Telatynski | 2020-06-16 | 1 | -27/+9 |
|\ \ | |||||
| * | | Fix tests | Michael Telatynski | 2020-06-14 | 1 | -0/+3 |
| * | | Remove support for unspecced device-specific push rules | Michael Telatynski | 2020-06-13 | 1 | -27/+6 |
* | | | Merge pull request #1403 from matrix-org/t3chguy/attemptAuth-existing-session | Michael Telatynski | 2020-06-12 | 1 | -2/+8 |
|\ \ \ | |/ / |/| | | |||||
| * | | undo that because `{}` sux | Michael Telatynski | 2020-06-12 | 1 | -1/+8 |
| * | | clean up | Michael Telatynski | 2020-06-12 | 1 | -8/+1 |
| * | | Use existing session id for fetching flows as to not get a new session id | Michael Telatynski | 2020-06-12 | 1 | -2/+8 |
|/ / | |||||
* | | Merge pull request #1400 from matrix-org/jryans/upgrade-deps-2020-06-05 | J. Ryan Stinnett | 2020-06-08 | 1 | -803/+840 |
|\ \ | |||||
| * | | Upgrade deps | J. Ryan Stinnett | 2020-06-08 | 1 | -803/+840 |
|/ / | |||||
* | | Merge branch 'master' into develop | RiotRobot | 2020-06-05 | 2 | -1/+8 |
|\ \ | |/ | |||||
| * | v6.2.1 | RiotRobot | 2020-06-05 | 1 | -1/+1 |
| * | Prepare changelog for v6.2.1 | RiotRobot | 2020-06-05 | 1 | -0/+7 |
| * | Merge pull request #1399 from matrix-org/bwindels/backupformatbug-rc | Bruno Windels | 2020-06-05 | 3 | -8/+182 |
| |\ | |||||
| | * | take into account key can be an object now | Bruno Windels | 2020-06-05 | 1 | -1/+1 |
| | * | fix type check in migration code | Bruno Windels | 2020-06-05 | 1 | -1/+1 |
| | * | Revert "remove key backup format migration" | Bruno Windels | 2020-06-05 | 3 | -8/+181 |
| | * | Revert "lint" | Bruno Windels | 2020-06-05 | 1 | -0/+1 |
| |/ | |||||
* | | Merge pull request #1398 from matrix-org/bwindels/backupformatbug | Bruno Windels | 2020-06-05 | 3 | -8/+182 |
|\ \ | |||||
| * | | take into account key can be an object now | Bruno Windels | 2020-06-05 | 1 | -1/+1 |
| * | | fix type check in migration code | Bruno Windels | 2020-06-05 | 1 | -1/+1 |
| * | | Revert "remove key backup format migration" | Bruno Windels | 2020-06-05 | 3 | -8/+181 |
| * | | Revert "lint" | Bruno Windels | 2020-06-05 | 1 | -0/+1 |
* | | | Merge pull request #1313 from matrix-org/bwindels/throwifcantdecrypt4s | Bruno Windels | 2020-06-05 | 1 | -0/+5 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update src/crypto/SecretStorage.js | Bruno Windels | 2020-04-09 | 1 | -1/+1 |
| * | | throw something more informative when we cant find a key to decrypt with | Bruno Windels | 2020-04-09 | 1 | -0/+5 |
* | | | Merge branch 'master' into develop | RiotRobot | 2020-06-04 | 2 | -1/+34 |
|\ \ \ | | |/ | |/| | |||||
| * | | v6.2.0 | RiotRobot | 2020-06-04 | 1 | -1/+1 |
| * | | Prepare changelog for v6.2.0 | RiotRobot | 2020-06-04 | 1 | -0/+6 |
| * | | v6.2.0-rc.1 | RiotRobot | 2020-06-02 | 1 | -1/+1 |
| * | | Prepare changelog for v6.2.0-rc.1 | RiotRobot | 2020-06-02 | 1 | -0/+27 |
* | | | Merge pull request #1394 from matrix-org/t3chguy/e2eedefault | Michael Telatynski | 2020-06-03 | 1 | -0/+30 |
|\ \ \ | |||||
| * | | | rename _clientWellKnownInterval to _clientWellKnownIntervalID | Michael Telatynski | 2020-06-03 | 1 | -3/+3 |
| * | | | Add js-sdk mechanism for polling client well-known for config | Michael Telatynski | 2020-06-01 | 1 | -0/+30 |
* | | | | Merge pull request #1388 from matrix-org/dbkr/timeouts | Michael Telatynski | 2020-06-03 | 2 | -19/+78 |
|\ \ \ \ | |||||
| * | | | | Test the verification request timeouts of 10m and 2m | Michael Telatynski | 2020-05-29 | 1 | -0/+36 |