Erik Johnston
|
1bd540ef79
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/schema/im.sql
|
2015-01-30 15:16:38 +00:00 |
|
Erik Johnston
|
471c47441d
|
Merge pull request #37 from matrix-org/client_v2_filter
Client v2 filter
|
2015-01-30 14:56:08 +00:00 |
|
Erik Johnston
|
2aaedab203
|
Merge branch 'develop' of github.com:matrix-org/synapse into new_state_resolution
|
2015-01-30 14:09:32 +00:00 |
|
Erik Johnston
|
2ebf795c0a
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
Conflicts:
synapse/storage/__init__.py
synapse/storage/schema/delta/v12.sql
|
2015-01-30 11:10:37 +00:00 |
|
Mark Haines
|
93ed31dda2
|
Create a separate filter object to do the actual filtering, so that we can
split the storage and management of filters from the actual filter code
and don't have to load a filter from the db each time we filter an event
|
2015-01-29 17:45:07 +00:00 |
|
Erik Johnston
|
78015948a7
|
Initial implementation of auth conflict resolution
|
2015-01-29 16:52:33 +00:00 |
|
Mark Haines
|
33391db5f8
|
Merge in auth changes from develop
|
2015-01-29 15:54:54 +00:00 |
|
Mark Haines
|
9d8f798a3f
|
Merge changes from develop
|
2015-01-29 14:55:27 +00:00 |
|
Kegan Dougal
|
38b27bd2cb
|
Add filter_room_state unit tests.
|
2015-01-29 14:28:34 +00:00 |
|
Kegan Dougal
|
83172487b0
|
Add basic filtering public API unit tests. Use defers in the right places.
|
2015-01-29 12:20:59 +00:00 |
|
Kegan Dougal
|
5561a87920
|
Add more unit tests for the filter algorithm.
|
2015-01-29 12:06:16 +00:00 |
|
Kegan Dougal
|
777d9914b5
|
Implement filter algorithm. Add basic event type unit tests to assert it works.
|
2015-01-29 11:38:06 +00:00 |
|
Mark Haines
|
26c8fff19e
|
Merge pull request #36 from matrix-org/device_id_from_access_token
Extract the device id and token id from the access token when autheniticating users
|
2015-01-28 17:19:28 +00:00 |
|
Mark Haines
|
388581e087
|
Extract the id token of the token when authing users, include the token and device_id in the internal meta data for the event along with the transaction id when sending events
|
2015-01-28 16:58:23 +00:00 |
|
Kegan Dougal
|
c23e3db544
|
Add filter JSON sanity checks.
|
2015-01-28 16:45:18 +00:00 |
|
Mark Haines
|
c59bcabf0b
|
Return the device_id from get_auth_by_req
|
2015-01-28 15:43:41 +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 |
|
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 |
|
Paul "LeoNerd" Evans
|
b1503112ce
|
Initial trivial unittest of Filtering object
|
2015-01-27 15:56:14 +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 |
|
Paul "LeoNerd" Evans
|
37b8a71f10
|
Initial trivial REST test of v2_alpha filter API
|
2015-01-26 15:27:40 +00:00 |
|
Paul "LeoNerd" Evans
|
d07dfe5392
|
Create (empty) v2_alpha REST tests directory
|
2015-01-26 14:32:17 +00:00 |
|
Erik Johnston
|
9b1e552b51
|
Merge branch 'develop' of github.com:matrix-org/synapse into rejections
|
2015-01-23 15:51:48 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Erik Johnston
|
6dcade97be
|
Implement new state resolution algorithm
|
2015-01-21 16:27:04 +00:00 |
|
Mark Haines
|
5fed042640
|
Finish renaming "context" to "room_id" in federation codebase
|
2015-01-16 19:01:03 +00:00 |
|
Paul "LeoNerd" Evans
|
cf7e723808
|
Have MockClock detect attempts to cancel expired timers, to prevent a repeat of SYN-230
|
2015-01-13 16:58:36 +00:00 |
|
Mark Haines
|
3891597eb3
|
Remove unused functions
|
2015-01-13 15:57:26 +00:00 |
|
Paul "LeoNerd" Evans
|
9c804bc3fd
|
Check that setting typing notification still works after explicit timeout at REST layer - SYN-230
|
2015-01-12 18:31:48 +00:00 |
|
Paul "LeoNerd" Evans
|
db72a07ef5
|
Don't make @unittest.DEBUG print the huge amount of verbosity generated by the synapse.storage loggers
|
2015-01-12 18:16:27 +00:00 |
|
Paul "LeoNerd" Evans
|
968dc988f9
|
Check that setting typing notification still works after explicit timeout - SYN-230
|
2015-01-12 18:01:49 +00:00 |
|
Kegan Dougal
|
a09882de83
|
Update tests
|
2015-01-07 16:12:14 +00:00 |
|
Kegan Dougal
|
4640239d34
|
Mock ratelimiter to make tests pass.
|
2014-12-19 17:49:47 +00:00 |