1
0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-10 07:22:27 +03:00
Commit Graph

2775 Commits

Author SHA1 Message Date
David Baker
8f318528f8 Merge branch 'master' into develop 2018-04-12 12:17:45 +01:00
David Baker
9696e70817 v0.10.1 v0.10.1 2018-04-12 12:06:25 +01:00
David Baker
85580acbff Prepare changelog for v0.10.1 2018-04-12 12:06:24 +01:00
David Baker
c45a5f7e84 Name param slightly more helpfully 2018-04-12 12:00:41 +01:00
David Baker
df74b0b038 Ignore inserts of dup inbound group sessions, pt 2
Stop the error from propagating to the txn error handler and
aborting the rest of the transaction.
2018-04-12 12:00:32 +01:00
David Baker
749e5b8458 Use the name of the error, not the request 2018-04-12 12:00:23 +01:00
David Baker
1255566324 Error message formatting 2018-04-12 12:00:11 +01:00
David Baker
a25da4ebf4 Ignore inserts of duplicate inbound group sessions
Rather than aborting the whole txn

This is causing e2e migration fails in the wild
2018-04-12 11:59:59 +01:00
David Baker
72835f3c5f lint 2018-04-12 11:59:46 +01:00
David Baker
c4f52f6256 Fix error logging 2018-04-12 11:59:32 +01:00
David Baker
3eb9505633 Log IDB errors 2018-04-12 11:58:33 +01:00
David Baker
543a0be1e4 Merge pull request #641 from matrix-org/dbkr/ignore_duplicate_inbound_group_session_2
Ignore inserts of dup inbound group sessions, pt 2
2018-04-12 11:25:54 +01:00
David Baker
5ef21c5075 Name param slightly more helpfully 2018-04-12 11:20:45 +01:00
David Baker
5c412cc0bd Ignore inserts of dup inbound group sessions, pt 2
Stop the error from propagating to the txn error handler and
aborting the rest of the transaction.
2018-04-12 11:15:39 +01:00
David Baker
346deb4b0d Use the name of the error, not the request 2018-04-11 18:57:52 +01:00
David Baker
6f8f30b018 Error message formatting 2018-04-11 18:56:17 +01:00
David Baker
b808757012 Merge pull request #639 from matrix-org/dbkr/ignore_duplicate_inbound_group_session
Ignore inserts of duplicate inbound group sessions
2018-04-11 18:31:43 +01:00
David Baker
5e491bb89a Ignore inserts of duplicate inbound group sessions
Rather than aborting the whole txn

This is causing e2e migration fails in the wild
2018-04-11 17:27:25 +01:00
David Baker
fc3cb0dd45 lint 2018-04-11 16:09:28 +01:00
David Baker
0846cb04af Fix error logging 2018-04-11 16:02:56 +01:00
David Baker
9708394846 Merge pull request #638 from matrix-org/dbkr/idb_log_error
Log IDB errors
2018-04-11 15:42:14 +01:00
David Baker
92e4396602 Log IDB errors 2018-04-11 15:37:28 +01:00
Luke Barnard
a5870b73a9 Merge branch 'master' into develop 2018-04-11 11:39:26 +01:00
Luke Barnard
77ff6b9088 v0.10.0 v0.10.0 2018-04-11 11:38:08 +01:00
Luke Barnard
425e74f297 Prepare changelog for v0.10.0 2018-04-11 11:38:08 +01:00
Luke Barnard
ffa184464e v0.10.0-rc.2 v0.10.0-rc.2 2018-04-09 15:29:09 +01:00
Luke Barnard
eca68e9e7f Prepare changelog for v0.10.0-rc.2 2018-04-09 15:29:09 +01:00
David Baker
dd1bc8ec9a Update to new join policy API (#636) 2018-04-09 14:58:13 +01:00
Luke Barnard
24dc1d6991 Add wrapped to set group is_joinable (#634)
which is exposed in the summary API under `summary.profile.is_joinable`.

If true, anyone can join the group. If false, an invite is required.
2018-04-09 14:58:06 +01:00
Luke Barnard
9f510b7eee Add wrapper for group join API (#633)
Needed for new "joinable" groups.
2018-04-09 14:57:57 +01:00
David Baker
730ca9b60b Update to new join policy API (#636) 2018-04-05 17:02:43 +01:00
Luke Barnard
1afaf903f9 Add wrapped to set group is_joinable (#634)
which is exposed in the summary API under `summary.profile.is_joinable`.

If true, anyone can join the group. If false, an invite is required.
2018-03-29 17:03:20 +01:00
Luke Barnard
d53cd41aa6 Add wrapper for group join API (#633)
Needed for new "joinable" groups.
2018-03-29 12:42:16 +01:00
David Baker
3e5ea745d2 Merge pull request #632 from matrix-org/dbkr/remove_ignore_call_log
Remove not very useful but veryv spammy log line
2018-03-27 18:28:08 +01:00
David Baker
c7052f7dc7 Remove not very useful but veryv spammy log line 2018-03-27 18:21:03 +01:00
Richard Lewis
56b01df85b Merge pull request #628 from matrix-org/rxl881/stickerEvent
Switch event type to m.sticker.
2018-03-22 10:16:40 +00:00
David Baker
aa18eeb7d6 v0.10.0-rc.1 v0.10.0-rc.1 2018-03-19 12:08:11 +00:00
David Baker
c18264c615 Prepare changelog for v0.10.0-rc.1 2018-03-19 12:08:11 +00:00
David Baker
11746290a9 Merge pull request #630 from matrix-org/dbkr/fix_repeat_state_events_on_unpeek
Fix duplicated state events in timeline from peek
2018-03-16 15:44:38 +00:00
David Baker
16c062c069 Start first incremental sync request early (#629)
* Start first incremental sync request early

So it can run while we process our sync data.
2018-03-16 15:22:06 +00:00
David Baker
64396de0dc Fix duplicated state events in timeline from peek
When joining a room we were peeking into, we duplicated all the
state events into the timeline. Put back the old behaviour of just
setting them as state events, with copious commentary on how wrong
this seems.
2018-03-15 17:35:18 +00:00
Richard Lewis
8ff78c5d60 Switch event type to m.sticker. 2018-03-12 13:56:50 +00:00
David Baker
349297e495 Merge pull request #627 from matrix-org/dbkr/indexeddb_worker_on_start
Create indexeddb worker when starting the store
2018-03-09 17:43:15 +00:00
David Baker
dc3ffb3b30 Fix jsdoc 2018-03-09 17:39:02 +00:00
David Baker
5c2dfb138a Hopefully clarify _startPromise 2018-03-09 17:35:03 +00:00
David Baker
0be679de42 Make local variable look less like a global 2018-03-09 17:31:08 +00:00
David Baker
8bd68e0f10 Create indexeddb worker when starting the store
Rather than when creating it, otherwise we could potentially end
up starting workers unnecessarily.
2018-03-09 16:53:27 +00:00
David Baker
df70e16b4d Merge pull request #626 from matrix-org/dbkr/fix_indexeddb_logging
Fix indexeddb logging
2018-03-09 10:29:53 +00:00
David Baker
b246545da5 Merge remote-tracking branch 'origin/develop' into dbkr/fix_indexeddb_logging 2018-03-09 10:21:00 +00:00
David Baker
3280cb648f Merge pull request #625 from matrix-org/dbkr/stop_spinner_of_doom
Don't do /keys/changes on incremental sync
2018-03-09 10:19:26 +00:00