eb0462e89b
v2.2.0
2019-07-18 15:42:21 +01:00
80748d7d85
Prepare changelog for v2.2.0
2019-07-18 15:42:20 +01:00
6b86777e96
Upgrade lodash
2019-07-12 19:25:21 +01:00
efe64a4817
v2.2.0-rc.2
2019-07-12 17:25:20 +01:00
ad777f36b2
Prepare changelog for v2.2.0-rc.2
2019-07-12 17:25:20 +01:00
de77ad867c
Merge pull request #995 from matrix-org/jryans/v2.2.0/devices
...
Add a request method to /devices
2019-07-12 16:47:06 +01:00
9b35f86497
Add a request method to /devices
...
Turns out `HTTP /devices undefined` is invalid.
Regressed in https://github.com/matrix-org/matrix-js-sdk/pull/990
2019-07-12 16:38:43 +01:00
455c85fb69
v2.2.0-rc.1
2019-07-12 11:12:26 +01:00
2a2fed695b
Prepare changelog for v2.2.0-rc.1
2019-07-12 11:12:25 +01:00
a8d200dd02
Merge pull request #993 from matrix-org/travis/sas-is-done
...
End the verification timer when verification is done
2019-07-11 08:20:30 -06:00
34ae967cb8
Merge pull request #990 from matrix-org/travis/stably-use-stable-apis
...
Stabilize usage of stably stable APIs (in a stable way)
2019-07-11 08:20:14 -06:00
a67f14825e
Merge branch 'master' into develop
2019-07-11 10:36:44 +01:00
50c14d0ab8
v2.1.1
2019-07-11 10:34:58 +01:00
0edb6e6f6f
Prepare changelog for v2.1.1
2019-07-11 10:34:58 +01:00
36d0dacda1
Process ephemeral events outside timeline handling
2019-07-11 10:21:44 +01:00
83b74070aa
Merge pull request #987 from matrix-org/bwindels/include-orig-in-history
...
Expose original_event for /relations
2019-07-11 08:09:44 +00:00
f80af68686
End the verification timer when verification is done
...
Fixes https://github.com/matrix-org/matrix-js-sdk/issues/980
This also improves cleanliness in the tests to cancel/terminate timers when needed.
2019-07-10 14:51:12 -06:00
fe4ac06f43
Use the correct media endpoints
2019-07-10 13:24:11 -06:00
eaaa3e980a
Use unstable prefix for key backup
2019-07-10 13:17:31 -06:00
07629bfb9a
unstable -> stable
2019-07-10 13:11:46 -06:00
88fdeca2bf
Merge pull request #989 from matrix-org/travis/edu-timeline
...
Process ephemeral events outside timeline handling
2019-07-10 10:38:02 -06:00
a3c8eac38b
Process ephemeral events outside timeline handling
2019-07-10 10:26:21 -06:00
bd5380c0b4
Merge pull request #986 from matrix-org/bwindels/include-ssa-for-replace
...
Don't accept any locally known edits earlier than the last known server-side aggregated edit
2019-07-10 14:38:26 +00:00
de18283c3b
map, decrypt and return original_event if present
2019-07-09 17:52:58 +02:00
cc1c7561a3
Merge pull request #984 from matrix-org/bwindels/replace-server-date
...
Get edit date transparently from server aggregations or local echo
2019-07-09 15:03:02 +00:00
5d928f07a0
don't accept any edit earlier than the server-side set edit.
2019-07-09 15:06:07 +02:00
01b882480f
method to get edit date transparently from server aggregations or local echo
2019-07-09 11:29:19 +02:00
21d52fdbdd
Merge pull request #982 from matrix-org/travis/soft-logout-keys
...
Add a function to flag keys for backup without scheduling a backup
2019-07-08 11:48:09 -06:00
f9baff2a3a
Merge branch 'master' into develop
2019-07-08 10:46:33 +01:00
71eca4ffcc
v2.1.0
2019-07-08 10:44:47 +01:00
bc8dca5105
Prepare changelog for v2.1.0
2019-07-08 10:44:47 +01:00
3ae3dffff7
Lint
2019-07-08 10:37:24 +01:00
81c6023940
Fix exception whilst syncing
...
event.getPushRules() may return null (for better or worse...).
Use client.getPushRulesForEvent which will calculate them if they
haven't already been calculated.
Fixes https://github.com/vector-im/riot-web/issues/10269
2019-07-08 10:37:24 +01:00
3a0f27fa7e
Add a function to flag keys for backup without scheduling a backup
...
For https://github.com/vector-im/riot-web/issues/10263
Starting/scheduling the backup won't help us because the token would be invalid from a server perspective. Instead, we should update what needs to be done and return a count.
2019-07-05 13:50:11 -06:00
60e339bac0
Merge pull request #981 from matrix-org/jryans/reactions-send-marks-unread
...
Block read marker and read receipt from advancing into pending events
2019-07-05 17:55:52 +01:00
ecb88f45b7
Merge pull request #977 from matrix-org/jryans/upgrade-deps
...
Upgrade dependencies
2019-07-05 17:50:10 +01:00
24a869d15b
Update copyright header
2019-07-05 15:07:56 +01:00
1d427a1ea8
Block read marker and read receipt from advancing into pending events
...
This changes the methods that update the read marker and read receipts to
prevent advancing into pending events.
Part of https://github.com/vector-im/riot-web/issues/9952
2019-07-05 13:59:04 +01:00
90e25867ad
Merge pull request #976 from matrix-org/jryans/push-rule-reactions
...
Add default push rule to ignore reactions
2019-07-05 12:01:31 +01:00
2ae56e61cb
Merge pull request #979 from matrix-org/dbkr/fix_sync_exception
...
Fix exception whilst syncing
2019-07-05 11:08:00 +01:00
56c0830328
Lint
2019-07-05 10:32:33 +01:00
093f139d34
Fix exception whilst syncing
...
event.getPushRules() may return null (for better or worse...).
Use client.getPushRulesForEvent which will calculate them if they
haven't already been calculated.
Fixes https://github.com/vector-im/riot-web/issues/10269
2019-07-05 10:26:47 +01:00
1083efc212
Merge pull request #975 from matrix-org/travis/soft-logout-base
...
Include the error object when raising Session.logged_out
2019-07-04 09:57:22 -06:00
69773c2619
Upgrade dependencies
2019-07-04 15:04:34 +01:00
2525b5a5d8
Add default push rule to ignore reactions
...
This adds a default push rule to ignore reactions as proposed in
[MSC2153](https://github.com/matrix-org/matrix-doc/pull/2153 ). By adding it here
in the client directly, we can try out the idea early even if it hasn't appeared
in the user's HS yet.
Part of https://github.com/vector-im/riot-web/issues/10208
2019-07-04 14:41:04 +01:00
ff9c84ff94
Fix tests
2019-07-03 16:50:24 -06:00
3aa2bf8a76
Include the error object when raising Session.logged_out
...
Note: The `call` argument previously defined in the SDK was never actually populated, and appears to be a documentation error when the definition was copied from `Call.incoming` directly above it.
2019-07-03 16:42:33 -06:00
a229ece693
v2.1.0-rc.1
2019-07-03 16:40:08 +01:00
b435137332
Prepare changelog for v2.1.0-rc.1
2019-07-03 16:40:07 +01:00
2cdbc9f4db
Merge pull request #974 from matrix-org/travis/e2e-self-notif
...
Handle self read receipts for fixing e2e notification counts
2019-07-03 09:16:22 -06:00
RiotRobot