bcd48b9636
Fix adding rules without before/after & add the rule that we couldn't find to the error
2015-01-23 10:28:25 +00:00
6927b6b197
This really serves me right for ever making a map called 'map'.
2015-01-23 10:21:47 +00:00
0c4b696727
Merge branch 'develop' into pushers
2015-01-23 10:12:38 +00:00
3a243c53f4
Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is still presence-specific
2015-01-22 20:06:28 +00:00
cbb10879cb
Much merging of test case setUp() methods to make them much more
...
shareable
2015-01-22 20:06:28 +00:00
8a850573c9
As yet fairly untested GET API for push rules
2015-01-22 19:32:17 +00:00
673773b217
oops, this is not its own schema file
2015-01-22 18:27:07 +00:00
7ecb49ef25
Insufficient newlines
2015-01-22 17:53:30 +00:00
5c6189ea3e
Merge branch 'develop' into pushers
...
Conflicts:
synapse/rest/__init__.py
2015-01-22 17:46:16 +00:00
ede491b4e0
Oops: second part of commit dc938606
2015-01-22 17:38:53 +00:00
dc93860619
Add rest API & store for creating push rules
...
Also make unrecognised request error look more like synapse errors
because it makes it easier to throw them from within rest classes.
2015-01-22 17:37:12 +00:00
22f00a09dd
Merge pull request #30 from matrix-org/client_api_restructure
...
Move client v1 api rest servlets into a "client/v1" directory
2015-01-22 16:40:14 +00:00
53584420a5
Move client rest tests back under rest
2015-01-22 16:13:27 +00:00
97c68c508d
Move rest APIs back under the rest directory
2015-01-22 16:10:07 +00:00
1d2016b4a8
Move client v1 api rest servlets into a "client/v1" directory
2015-01-22 14:59:08 +00:00
16bfabb9c5
Fix manifest. Ignore contrib and docs directories when checking manifest against source control.
2015-01-22 14:32:51 +00:00
d00cca11b9
Add demo and scripts to python manifest
2015-01-22 14:28:07 +00:00
58691680b8
update .gitignore, set media-store-path in demo
2015-01-22 14:20:53 +00:00
d3d0713de5
Move experiments, graph and cmdclient into contrib
2015-01-22 11:57:54 +00:00
8907e143c1
Remove jsfiddles
2015-01-22 11:15:03 +00:00
f4ce61ed36
Move scripts into scripts
2015-01-22 11:14:14 +00:00
73315ce9de
Abstract out the room ID from presence tests, so it's stored in self
2015-01-21 20:01:57 +00:00
dbe71e670c
Use common base class for two Presence unit-tests, avoiding boilerplate copypasta
2015-01-21 16:58:16 +00:00
5d5932d493
use underscores everywhere, not camelcase.
2015-01-20 11:52:08 +00:00
afb714f7be
add instance_handles to pushers so we have a way to refer to them even if the push token changes.
2015-01-20 11:49:48 +00:00
dc70d1fef8
Only start the notifier timeout once we've had a chance to check for updates. Otherwise the timeout could fire while we are waiting for the database to return any updates it might have
2015-01-19 16:24:54 +00:00
42529cbced
Fix pyflakes errors
2015-01-19 15:33:04 +00:00
00e9c08609
Fix syntax
2015-01-19 15:30:48 +00:00
3e85e52b3f
Allow ':memory:' as the database path for sqlite3
2015-01-19 15:26:19 +00:00
5fed042640
Finish renaming "context" to "room_id" in federation codebase
2015-01-16 19:01:03 +00:00
2408c4b0a4
Fold _do_request_for_transaction into the methods that called it since it was a trivial wrapper around client.get_json
2015-01-16 19:01:03 +00:00
602684eac5
Split transport layer into client and server parts
2015-01-16 19:01:03 +00:00
2bdee98269
Remove temporary debug logging that was accidentally committed
2015-01-16 19:00:40 +00:00
2d2953cf5f
Require device language when adding a pusher.
...
Because this seems like it might be useful to do sooner rather
than later.
2015-01-16 11:24:10 +00:00
2ca2dbc821
Send room name and first alias in notification poke.
2015-01-15 16:56:18 +00:00
e3e2fc3255
Don't make the pushers' event streams cause people to appear online
2015-01-15 16:17:21 +00:00
2cb30767fa
Honour the 'rejected' return from push gateways
...
Add a timestamp to push tokens so we know the last time they we
got them from the device. Send it to the push gateways so it can
determine whether its failure is more recent than the token.
Stop and remove pushers that have been rejected.
2015-01-13 19:48:37 +00:00
34a5fbe2b7
Have /join/:room_id return the room ID in response anyway, for consistency of clients (SYN-234)
2015-01-13 17:29:24 +00:00
cf7e723808
Have MockClock detect attempts to cancel expired timers, to prevent a repeat of SYN-230
2015-01-13 16:58:36 +00:00
c2e7c84e58
Don't try to cancel already-expired timers - SYN-230
2015-01-13 16:58:36 +00:00
3891597eb3
Remove unused functions
2015-01-13 15:57:26 +00:00
fda63064fc
get_room_events isn't called anywhere
2015-01-13 14:43:26 +00:00
895fcb377e
Fix stream token ordering
2015-01-13 14:38:53 +00:00
c06a9063e1
Merge branch 'develop' into pushers
2015-01-13 13:15:51 +00:00
70d0a453f3
Split out function to decide whether to notify or a given event
2015-01-13 13:14:41 +00:00
38e3241eb7
Merge branch 'hotfixes-v0.6.1b' of github.com:matrix-org/synapse into develop
2015-01-13 10:01:22 +00:00
1d3d37937d
Bump version
2015-01-13 09:59:47 +00:00
39585bf556
Insert 'age' into top level when returning events to clients
2015-01-13 09:57:32 +00:00
02ffbb20d0
Use float rather than integer divisions to turn msec into sec - so timeouts under 1000msec will actually work
2015-01-12 19:09:14 +00:00
9c804bc3fd
Check that setting typing notification still works after explicit timeout at REST layer - SYN-230
2015-01-12 18:31:48 +00:00
David Baker