David Baker
|
2cfdfee572
|
spaces
|
2015-01-28 14:41:51 +00:00 |
|
David Baker
|
289a249874
|
Unnecessary newlines.
|
2015-01-28 14:39:03 +00:00 |
|
David Baker
|
3cb5b73c0d
|
Unnecessary newline.
|
2015-01-28 14:37:55 +00:00 |
|
David Baker
|
8807f4170e
|
Better style
|
2015-01-28 14:35:00 +00:00 |
|
David Baker
|
032f8d4ed3
|
Another superfluous newline
|
2015-01-28 14:33:15 +00:00 |
|
David Baker
|
d93ce29a86
|
Ah, the comma of doom.
|
2015-01-28 14:27:01 +00:00 |
|
David Baker
|
6741c3dbd9
|
Brackets are nicer
|
2015-01-28 14:26:03 +00:00 |
|
David Baker
|
4fbf2328c2
|
Unnecessary new line
|
2015-01-28 14:24:28 +00:00 |
|
David Baker
|
30fbba168b
|
Easy on the newlines
|
2015-01-28 14:23:16 +00:00 |
|
David Baker
|
dd3abbd61f
|
2015
|
2015-01-28 14:22:39 +00:00 |
|
David Baker
|
6fde707add
|
doc style fix
|
2015-01-28 14:14:49 +00:00 |
|
David Baker
|
5f2665320f
|
It is 2015
|
2015-01-28 14:11:45 +00:00 |
|
David Baker
|
20c47383dc
|
Oops, bad merge: needed to change the base class of the rest servlets too.
|
2015-01-28 14:10:46 +00:00 |
|
David Baker
|
03149ad23a
|
More code style things
|
2015-01-28 14:01:24 +00:00 |
|
David Baker
|
e1ca0f1396
|
Brackets rather than slashes at end
|
2015-01-28 13:58:32 +00:00 |
|
David Baker
|
6df6f5e084
|
Redundant bracketing & missed space
|
2015-01-28 13:56:35 +00:00 |
|
David Baker
|
ca7240a2f0
|
Update copyright
|
2015-01-28 13:17:55 +00:00 |
|
David Baker
|
fb532d8425
|
Unused import
|
2015-01-28 13:06:09 +00:00 |
|
David Baker
|
c291a4d522
|
Merge branch 'develop' into pushers
Conflicts:
synapse/handlers/events.py
synapse/server.py
|
2015-01-28 12:51:05 +00:00 |
|
David Baker
|
273b12729b
|
Reset badge count to zero when last active time is bumped
|
2015-01-28 11:55:49 +00:00 |
|
David Baker
|
e32ded7b3e
|
Add matrix.org as a trusted ID server because it's now passed through on ports 80/443 and the web client defaults to that now. Fixes email validation (including signing up with an email address).
|
2015-01-28 10:09:54 +00:00 |
|
Mark Haines
|
e020574d65
|
Fix Formatting
|
2015-01-27 20:19:36 +00:00 |
|
Mark Haines
|
b19cf6a105
|
Wait for events if the incremental sync is empty and a timeout is given
|
2015-01-27 20:09:52 +00:00 |
|
Paul "LeoNerd" Evans
|
8398f19bce
|
Created schema delta
|
2015-01-27 19:00:09 +00:00 |
|
Paul "LeoNerd" Evans
|
06cc147012
|
Initial stab at real SQL storage implementation of user filter definitions
|
2015-01-27 18:46:03 +00:00 |
|
Paul "LeoNerd" Evans
|
0c14a699bb
|
More unit-testing of REST errors
|
2015-01-27 18:07:21 +00:00 |
|
Paul "LeoNerd" Evans
|
54e513b4e6
|
Move storage of user filters into real datastore layer; now have to mock it out in the REST-level tests
|
2015-01-27 17:48:13 +00:00 |
|
Mark Haines
|
a56008842b
|
Start implementing incremental initial sync
|
2015-01-27 16:24:22 +00:00 |
|
Paul "LeoNerd" Evans
|
059651efa1
|
Have the Filtering API return Deferreds, so we can do the Datastore implementation nicely
|
2015-01-27 16:17:56 +00:00 |
|
David Baker
|
f7c4daa8f9
|
Oops, remove debugging
|
2015-01-27 16:08:47 +00:00 |
|
David Baker
|
5eacaeb4a7
|
or of course we could just return the deferred
|
2015-01-27 16:05:23 +00:00 |
|
David Baker
|
eba89f093f
|
Need a defer.inlineCallbacks here as we yield in it: otherwise nothing in the cb gets executed.
|
2015-01-27 16:00:07 +00:00 |
|
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 |
|
Paul "LeoNerd" Evans
|
b1503112ce
|
Initial trivial unittest of Filtering object
|
2015-01-27 15:56:14 +00:00 |
|
Paul "LeoNerd" Evans
|
05c7cba73a
|
Initial trivial implementation of an actual 'Filtering' object; move storage of user filters into there
|
2015-01-27 14:28:56 +00:00 |
|
Paul "LeoNerd" Evans
|
f9958f3404
|
Use new V2AlphaRestTestCase
|
2015-01-27 13:17:25 +00:00 |
|
Paul "LeoNerd" Evans
|
0484d7f6e9
|
Merge branch 'develop' into client_v2_filter
|
2015-01-27 13:11:03 +00:00 |
|
Paul "LeoNerd" Evans
|
57d2bfca3f
|
Initial cut of a shared base class for REST unit tests
|
2015-01-27 13:09:57 +00:00 |
|
Paul "LeoNerd" Evans
|
39c1892b22
|
Minor changes to v2_alpha filter REST test to allow the setUp method to be shareable
|
2015-01-27 13:03:31 +00:00 |
|
Mark Haines
|
436513068d
|
Start implementing the non-incremental sync portion of the v2 /sync API
|
2015-01-26 18:53:31 +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 |
|
Mark Haines
|
3186c5bdbc
|
Merge branch 'develop' into client_v2_sync
|
2015-01-26 16:32:40 +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 |
|
Mark Haines
|
0cfb4591a7
|
Add handler for /sync API
|
2015-01-26 15:46:31 +00:00 |
|
Paul "LeoNerd" Evans
|
37b8a71f10
|
Initial trivial REST test of v2_alpha filter API
|
2015-01-26 15:27:40 +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
|
8d7accb28f
|
Initial minimal attempt at /user/:user_id/filter API - in-memory storage, no actual filter implementation
|
2015-01-26 14:33:30 +00:00 |