David Baker
|
1d77969124
|
Unbreak bad presence merge - don't add these blocks together with an and: they're different things.
|
2015-01-27 15:58:27 +00:00 |
|
David Baker
|
b481889117
|
Support membership events and more camelcase/underscores
|
2015-01-26 17:27:28 +00:00 |
|
David Baker
|
69a75b7ebe
|
Add brackets to make get room name / alias work
|
2015-01-26 16:52:47 +00:00 |
|
David Baker
|
efac71d6ca
|
Pushers should only try & look for rejected devices in something that's a list or tuple.
|
2015-01-26 14:37:14 +00:00 |
|
David Baker
|
5f84ba8ea1
|
Add API to delete push rules.
|
2015-01-23 17:49:37 +00:00 |
|
David Baker
|
f21f9fa3c5
|
Use push settings!
|
2015-01-23 17:07:06 +00:00 |
|
David Baker
|
fc7a05c443
|
more pep8 suggestions
|
2015-01-23 13:36:01 +00:00 |
|
David Baker
|
b3f66ea6fb
|
more pep8
|
2015-01-23 13:28:00 +00:00 |
|
David Baker
|
d3e72b4d87
|
Make string format tuple an actual tuple
|
2015-01-23 13:25:58 +00:00 |
|
David Baker
|
98e1080555
|
redundant parens
|
2015-01-23 13:25:36 +00:00 |
|
David Baker
|
54c689c819
|
stray space
|
2015-01-23 13:25:14 +00:00 |
|
David Baker
|
6188c4f69c
|
make per-device rules work
|
2015-01-23 13:23:10 +00:00 |
|
David Baker
|
49fe31792b
|
Add slightly pedantic trailing slash error.
|
2015-01-23 11:19:02 +00:00 |
|
David Baker
|
f87586e661
|
right super() param
|
2015-01-23 10:32:40 +00:00 |
|
David Baker
|
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 |
|
David Baker
|
6927b6b197
|
This really serves me right for ever making a map called 'map'.
|
2015-01-23 10:21:47 +00:00 |
|
David Baker
|
0c4b696727
|
Merge branch 'develop' into pushers
|
2015-01-23 10:12:38 +00:00 |
|
Paul "LeoNerd" Evans
|
3a243c53f4
|
Rename MockedDatastoreTestCase to MockedDatastorePresenceTestCase since it is still presence-specific
|
2015-01-22 20:06:28 +00:00 |
|
Paul "LeoNerd" Evans
|
cbb10879cb
|
Much merging of test case setUp() methods to make them much more
shareable
|
2015-01-22 20:06:28 +00:00 |
|
David Baker
|
8a850573c9
|
As yet fairly untested GET API for push rules
|
2015-01-22 19:32:17 +00:00 |
|
David Baker
|
673773b217
|
oops, this is not its own schema file
|
2015-01-22 18:27:07 +00:00 |
|
David Baker
|
7ecb49ef25
|
Insufficient newlines
|
2015-01-22 17:53:30 +00:00 |
|
David Baker
|
5c6189ea3e
|
Merge branch 'develop' into pushers
Conflicts:
synapse/rest/__init__.py
|
2015-01-22 17:46:16 +00:00 |
|
David Baker
|
ede491b4e0
|
Oops: second part of commit dc938606
|
2015-01-22 17:38:53 +00:00 |
|
David Baker
|
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 |
|
Mark Haines
|
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 |
|
Mark Haines
|
53584420a5
|
Move client rest tests back under rest
|
2015-01-22 16:13:27 +00:00 |
|
Mark Haines
|
97c68c508d
|
Move rest APIs back under the rest directory
|
2015-01-22 16:10:07 +00:00 |
|
Mark Haines
|
1d2016b4a8
|
Move client v1 api rest servlets into a "client/v1" directory
|
2015-01-22 14:59:08 +00:00 |
|
Mark Haines
|
16bfabb9c5
|
Fix manifest. Ignore contrib and docs directories when checking manifest against source control.
|
2015-01-22 14:32:51 +00:00 |
|
Mark Haines
|
d00cca11b9
|
Add demo and scripts to python manifest
|
2015-01-22 14:28:07 +00:00 |
|
Mark Haines
|
58691680b8
|
update .gitignore, set media-store-path in demo
|
2015-01-22 14:20:53 +00:00 |
|
Mark Haines
|
d3d0713de5
|
Move experiments, graph and cmdclient into contrib
|
2015-01-22 11:57:54 +00:00 |
|
Mark Haines
|
8907e143c1
|
Remove jsfiddles
|
2015-01-22 11:15:03 +00:00 |
|
Mark Haines
|
f4ce61ed36
|
Move scripts into scripts
|
2015-01-22 11:14:14 +00:00 |
|
Paul "LeoNerd" Evans
|
73315ce9de
|
Abstract out the room ID from presence tests, so it's stored in self
|
2015-01-21 20:01:57 +00:00 |
|
Paul "LeoNerd" Evans
|
dbe71e670c
|
Use common base class for two Presence unit-tests, avoiding boilerplate copypasta
|
2015-01-21 16:58:16 +00:00 |
|
David Baker
|
5d5932d493
|
use underscores everywhere, not camelcase.
|
2015-01-20 11:52:08 +00:00 |
|
David Baker
|
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 |
|
Mark Haines
|
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 |
|
Mark Haines
|
42529cbced
|
Fix pyflakes errors
|
2015-01-19 15:33:04 +00:00 |
|
Mark Haines
|
00e9c08609
|
Fix syntax
|
2015-01-19 15:30:48 +00:00 |
|
Mark Haines
|
3e85e52b3f
|
Allow ':memory:' as the database path for sqlite3
|
2015-01-19 15:26:19 +00:00 |
|
Mark Haines
|
5fed042640
|
Finish renaming "context" to "room_id" in federation codebase
|
2015-01-16 19:01:03 +00:00 |
|
Mark Haines
|
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 |
|
Mark Haines
|
602684eac5
|
Split transport layer into client and server parts
|
2015-01-16 19:01:03 +00:00 |
|
Mark Haines
|
2bdee98269
|
Remove temporary debug logging that was accidentally committed
|
2015-01-16 19:00:40 +00:00 |
|
David Baker
|
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 |
|
David Baker
|
2ca2dbc821
|
Send room name and first alias in notification poke.
|
2015-01-15 16:56:18 +00:00 |
|
David Baker
|
e3e2fc3255
|
Don't make the pushers' event streams cause people to appear online
|
2015-01-15 16:17:21 +00:00 |