Mark Haines
|
4770cec7bc
|
Merge pull request #150 from matrix-org/notifier_unify
Make v1 and v2 client APIs interact with the notifier in the same way.
|
2015-05-14 14:16:59 +01:00 |
David Baker
|
92e1c8983d
|
Disallow whitespace in aliases here too
|
2015-05-14 13:21:55 +01:00 |
David Baker
|
0c894e1ebd
|
Throw error when creating room if alias contains whitespace #SYN-335
|
2015-05-14 13:11:28 +01:00 |
David Baker
|
c37a6e151f
|
Make shared secret registration work again
|
2015-05-14 12:03:13 +01:00 |
David Baker
|
7c549dd557
|
Add ID generator for push_rules_enable to #resolve SYN-378
|
2015-05-14 11:44:03 +01:00 |
Mark Haines
|
243c56e725
|
Merge branch 'develop' into notifier_unify
|
2015-05-14 11:36:23 +01:00 |
David Baker
|
47fb089eb5
|
Specify python 2.7 in the virtualenv setup (SYN-319) #resolved
|
2015-05-14 10:23:10 +01:00 |
Erik Johnston
|
80fd2b574c
|
Don't talk to yourself when backfilling
|
2015-05-12 16:19:46 +01:00 |
Erik Johnston
|
e122685978
|
You need to call contextmanager
|
2015-05-12 16:12:37 +01:00 |
Mark Haines
|
54ef09f860
|
Merge pull request #151 from matrix-org/revert-147-presence-performance
Revert "Improvement to performance of presence event stream handling"
|
2015-05-12 15:44:55 +01:00 |
Mark Haines
|
d7b3ac46f8
|
Revert "Improvement to performance of presence event stream handling"
|
2015-05-12 15:44:21 +01:00 |
Mark Haines
|
4429e4bf24
|
Merge branch 'develop' into notifier_unify
Conflicts:
synapse/notifier.py
|
2015-05-12 15:31:26 +01:00 |
Mark Haines
|
ec07dba29e
|
Merge pull request #143 from matrix-org/erikj/SYN-375
SYN-375 - Lots of unhandled deferred exceptions.
|
2015-05-12 15:25:54 +01:00 |
Mark Haines
|
c167cbc9fd
|
Merge pull request #147 from matrix-org/presence-performance
Improvement to performance of presence event stream handling
|
2015-05-12 15:24:54 +01:00 |
Mark Haines
|
a6fb2aa2a5
|
Merge pull request #144 from matrix-org/erikj/logging_context
Preserving logging contexts
|
2015-05-12 15:23:50 +01:00 |
Mark Haines
|
1fce36b111
|
Merge pull request #149 from matrix-org/erikj/backfill
Backfill support
|
2015-05-12 15:20:32 +01:00 |
Erik Johnston
|
8b28209c60
|
Err, delete the right stuff
|
2015-05-12 15:02:53 +01:00 |
Erik Johnston
|
30c72d377e
|
Newlines
|
2015-05-12 14:47:40 +01:00 |
Erik Johnston
|
e4eddf9b36
|
We do actually want to delete rows out of event_backward_extremities
|
2015-05-12 14:47:23 +01:00 |
Erik Johnston
|
c1779a79bc
|
Fix up _handle_prev_events to not try to insert duplicate rows
|
2015-05-12 14:41:50 +01:00 |
Erik Johnston
|
74850d7f75
|
Do state groups persistence /after/ checking if we have already persisted the event
|
2015-05-12 14:14:58 +01:00 |
Erik Johnston
|
07a1223156
|
s/backfil/backfill/
|
2015-05-12 14:09:54 +01:00 |
Erik Johnston
|
0d31ad5101
|
Typos everywhere
|
2015-05-12 14:02:01 +01:00 |
Erik Johnston
|
a0dfffb33c
|
And another typo.
|
2015-05-12 14:00:31 +01:00 |
Erik Johnston
|
6e5ac4a28f
|
Err, gatherResults doesn't take a dict...
|
2015-05-12 13:58:14 +01:00 |
Erik Johnston
|
8022b27fc2
|
Make distributer.fire work as it did
|
2015-05-12 13:14:48 +01:00 |
Erik Johnston
|
95dedb866f
|
Unwrap defer.gatherResults failures
|
2015-05-12 13:14:29 +01:00 |
Erik Johnston
|
da6a7bbdde
|
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/logging_context
|
2015-05-12 13:10:42 +01:00 |
Mark Haines
|
2551b6645d
|
Update the end_token correctly, otherwise the token doesn't advance and the client gets duplicate events
|
2015-05-12 11:54:18 +01:00 |
Mark Haines
|
5e4ba463b7
|
Merge branch 'develop' into notifier_unify
|
2015-05-12 11:41:53 +01:00 |
Mark Haines
|
51da995806
|
Merge pull request #148 from matrix-org/bugs/SYN-377
SYN-377: Make sure that the event is marked as persisted from the main thread.
|
2015-05-12 11:36:44 +01:00 |
Mark Haines
|
5002056b16
|
SYN-377: Make sure that the StreamIdGenerator.get_next.__exit__ is called from the main thread after the transaction completes, not from database thread before the transaction completes.
|
2015-05-12 11:20:40 +01:00 |
Erik Johnston
|
367382b575
|
Handle the case where the other side is unreachable when backfilling
|
2015-05-12 10:35:45 +01:00 |
Erik Johnston
|
4df11b5039
|
Make get_current_token accept a direction parameter, which tells whether the source whether we want a token for going 'forwards' or 'backwards'
|
2015-05-12 10:28:10 +01:00 |
Erik Johnston
|
84e6b4001f
|
Initial hack at wiring together pagination and backfill
|
2015-05-11 18:01:31 +01:00 |
Erik Johnston
|
17653a5dfe
|
Move storage.stream._StreamToken to types.RoomStreamToken
|
2015-05-11 18:01:01 +01:00 |
Mark Haines
|
e269c511f6
|
Don't bother passing the events to the notifier since it isn't using them
|
2015-05-11 15:01:51 +01:00 |
Mark Haines
|
5e3b254dc8
|
Use wait_for_events to implement 'get_events'
|
2015-05-11 14:37:33 +01:00 |
Erik Johnston
|
d244fa9741
|
Merge branch 'hotfixes-v0.9.0-r4' of github.com:matrix-org/synapse into develop
|
2015-05-11 13:34:31 +01:00 |
Erik Johnston
|
79b7154454
|
Merge pull request #146 from matrix-org/erikj/push_rules_fixes
Fix 500 on push rule updates.
|
2015-05-11 11:33:47 +01:00 |
Erik Johnston
|
4ef556f650
|
Bump version
|
2015-05-11 11:31:04 +01:00 |
Erik Johnston
|
b036596b75
|
Prefer to use _simple_*.
|
2015-05-11 11:24:01 +01:00 |
Erik Johnston
|
cd525c0f5a
|
push_rules table expects an 'id' field
|
2015-05-11 11:24:01 +01:00 |
Mark Haines
|
3c224f4d0e
|
SYN-376: Add script for converting server keys from v1 to v2
|
2015-05-11 11:00:17 +01:00 |
Erik Johnston
|
d38862a080
|
Merge branch 'master' of github.com:matrix-org/synapse into develop
|
2015-05-10 10:56:46 +01:00 |
David Baker
|
2640d6718d
|
Merge pull request #145 from matrix-org/hotfixes-v0.9.0-r3
Hotfixes v0.9.0 r3
|
2015-05-10 10:54:44 +01:00 |
Erik Johnston
|
de87541862
|
Bump version
|
2015-05-10 10:51:08 +01:00 |
Erik Johnston
|
22d2f498fa
|
Fix push rule bug: can't insert bool into small int column
|
2015-05-10 10:50:51 +01:00 |
Matthew Hodgson
|
d79ffa1898
|
typo
|
2015-05-09 14:45:37 +01:00 |
Erik Johnston
|
2236ef6c92
|
Fix up leak. Add warnings.
|
2015-05-08 19:53:34 +01:00 |