0d872f5aa6
Merge pull request #50 from matrix-org/application-services
...
Application Services
2015-02-13 15:06:14 +00:00
4ebbaf0d43
Blunty replace json with simplejson
2015-02-11 14:23:10 +00:00
9978c5c103
Merge branch 'develop' into application-services
2015-02-11 10:03:24 +00:00
84a769cdb7
Fix code-style
2015-02-10 17:58:36 +00:00
b085fac735
Code-style fixes
2015-02-10 16:30:48 +00:00
53557fc532
Merge branch 'develop' into application-services
2015-02-09 15:20:56 +00:00
24cc6979fb
Log when we receive a request, when we send a response and how long it took to process it.
2015-02-09 13:46:22 +00:00
c3ae8def75
Grant ASes the ability to delete aliases in their own namespace.
2015-02-06 11:32:07 +00:00
e426df8e10
Grant ASes the ability to create alias in their own namespace.
...
Add a new errcode type M_EXCLUSIVE when users try to create aliases inside
AS namespaces, and when ASes try to create aliases outside their own
namespace.
2015-02-06 10:57:14 +00:00
0227618d3c
Add m.login.application_service registration procedure.
...
This allows known application services to register any user ID under their
own user namespace(s).
2015-02-05 17:29:27 +00:00
a93fa42bce
priority class now dealt with in namespaced rule_id
2015-02-05 15:45:16 +00:00
aaf50bf6f3
Give server default rules the 'default' attribute and fix various brokenness.
2015-02-05 15:11:38 +00:00
2df41aa138
Server default rules now of all kinds rather than all being at lowest prio.
2015-02-05 14:46:37 +00:00
f90782a658
namespace rule IDs to be unique within their scope and rule type.
2015-02-05 14:46:37 +00:00
2e77ba637a
More s/instance_handle/profile_tag/
2015-02-04 16:24:15 +00:00
dc7bb70f22
s/instance_handle/profile_tag/
2015-02-03 16:51:07 +00:00
b4b892f4a3
Spit out server default rules too.
2015-01-30 15:54:51 +00:00
6dc92d3427
Merge pull request #41 from matrix-org/client_v2_sync
...
Client v2 sync
2015-01-30 15:54:25 +00:00
4ffac34a64
Add glob asterisks when running rules.
...
Means that now you can't do exact matches even in override rules,
but I think we can live with that. Advantage is that you'll now
always get back what was put in to the API.
2015-01-30 15:03:56 +00:00
471c47441d
Merge pull request #37 from matrix-org/client_v2_filter
...
Client v2 filter
2015-01-30 14:56:08 +00:00
4a67834bc8
Pass client info to the sync_config
2015-01-30 11:50:15 +00:00
22dd1cde2d
Filter the recent events before applying the limit when doing an incremental sync with a gap
2015-01-30 11:32:35 +00:00
365a186729
Add basic filtering support
2015-01-29 18:11:28 +00:00
7ceda8bf3d
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-29 18:04:07 +00:00
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
4bdfce30d7
Renumber priority classes so we can use 0 for defaults.
2015-01-29 17:12:11 +00:00
e0d2c6889b
Allow kind to be set to null to delete a pusher.
2015-01-29 17:05:00 +00:00
722b65f461
Move typing notifs to an "emphermal" event list on the room object
2015-01-29 16:41:21 +00:00
8e571cbed8
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-29 16:18:59 +00:00
295322048d
Merge branch 'develop' into client_v2_filter
2015-01-29 16:18:34 +00:00
acb68a39e0
Code style fixes.
2015-01-29 16:12:40 +00:00
cf7c54ec93
Merge branch 'client_v2_filter' into client_v2_sync
2015-01-29 15:55:58 +00:00
33391db5f8
Merge in auth changes from develop
2015-01-29 15:54:54 +00:00
396a67a09a
Merge branch 'client_v2_filter' into client_v2_sync
...
Conflicts:
synapse/rest/client/v2_alpha/__init__.py
2015-01-29 14:58:00 +00:00
9d8f798a3f
Merge changes from develop
2015-01-29 14:55:27 +00:00
3dbce6f4a5
Add typing notifications to sync
2015-01-29 03:33:51 +00:00
b9c442c85c
Include transaction ids in unsigned section of events in the sync results for the clients that made those requests
2015-01-29 02:46:00 +00:00
8552ed8df2
Change uses of get_user_by_req because it returns a tuple now.
2015-01-28 18:04:40 +00:00
c81a19552f
Add ports back to demo/start.sh
2015-01-28 17:32:49 +00:00
9c61556504
Merge branch 'develop' into client_v2_sync
2015-01-28 17:29:30 +00:00
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
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
c23e3db544
Add filter JSON sanity checks.
2015-01-28 16:45:18 +00:00
c59bcabf0b
Return the device_id from get_auth_by_req
2015-01-28 15:43:41 +00:00
2cfdfee572
spaces
2015-01-28 14:41:51 +00:00
289a249874
Unnecessary newlines.
2015-01-28 14:39:03 +00:00
3cb5b73c0d
Unnecessary newline.
2015-01-28 14:37:55 +00:00
8807f4170e
Better style
2015-01-28 14:35:00 +00:00
032f8d4ed3
Another superfluous newline
2015-01-28 14:33:15 +00:00
d93ce29a86
Ah, the comma of doom.
2015-01-28 14:27:01 +00:00
Mark Haines