David Baker
|
69a75b7ebe
|
Add brackets to make get room name / alias work
|
2015-01-26 16:52:47 +00:00 |
|
Mark Haines
|
9b6aaf2074
|
Merge pull request #34 from matrix-org/remove_serialize_event_from_hs
Don't pass the HS to serialize_event just so that it can get the current time.
|
2015-01-26 16:23:48 +00:00 |
|
Mark Haines
|
e5725eb3b9
|
Remove unused import from server.py
|
2015-01-26 16:16:50 +00:00 |
|
Mark Haines
|
7f6f3f9d62
|
Pass the current time to serialize event, rather than passing an
HS and getting a clock from it and calling time_msec on the clock.
Remove the serialize_event method from the HS since it is no longer
needed.
|
2015-01-26 16:11:28 +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 |
|
Paul "LeoNerd" Evans
|
d07dfe5392
|
Create (empty) v2_alpha REST tests directory
|
2015-01-26 14:32:17 +00:00 |
|
Mark Haines
|
7b814d3f7f
|
Add client v2_alpha resource to synapse server resource tree
|
2015-01-23 18:55:19 +00:00 |
|
Paul "LeoNerd" Evans
|
85419e1257
|
Stop complaining about Synapse Angular SDK 0.6.1
|
2015-01-23 18:37:37 +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 |
|
Erik Johnston
|
30a89d2fdb
|
Update .gitignore
|
2015-01-23 15:51:32 +00:00 |
|
Mark Haines
|
bda5d7d14f
|
Merge pull request #33 from matrix-org/extract_rest_servlet_from_client_v1
Extract the client v1 base RestServlet to a separate class
|
2015-01-23 14:32:41 +00:00 |
|
Mark Haines
|
e0bf18addf
|
Add RestServlet base class in synapse/http/servlet.py
|
2015-01-23 14:16:28 +00:00 |
|
Mark Haines
|
4be637cb12
|
Extract the client v1 base RestServlet to a separate class
|
2015-01-23 14:09:51 +00:00 |
|
Mark Haines
|
f7cb604211
|
Merge pull request #32 from matrix-org/remove_parse_id_from_hs
Remove parse id from hs
|
2015-01-23 13:41:55 +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 |
|
Mark Haines
|
c4652d7772
|
Remove hs.parse_eventid
|
2015-01-23 13:25:07 +00:00 |
|
David Baker
|
6188c4f69c
|
make per-device rules work
|
2015-01-23 13:23:10 +00:00 |
|
Mark Haines
|
ada711504e
|
Replace hs.parse_roomalias with RoomAlias.from_string
|
2015-01-23 13:21:58 +00:00 |
|
Mark Haines
|
1c06c48ce2
|
Replace hs.parse_roomid with RoomID.from_string
|
2015-01-23 11:55:12 +00:00 |
|
Mark Haines
|
5759bec43c
|
Replace hs.parse_userid with UserID.from_string
|
2015-01-23 11:47:15 +00:00 |
|
David Baker
|
49fe31792b
|
Add slightly pedantic trailing slash error.
|
2015-01-23 11:19:02 +00:00 |
|
Mark Haines
|
7dfd99f163
|
Merge pull request #31 from matrix-org/client_api_resource
Merge rest servlets into the client json resource object
|
2015-01-23 10:55:18 +00:00 |
|
Mark Haines
|
7256def8e4
|
Merge rest servlets into the client json resource object
|
2015-01-23 10:37:38 +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 |
|