30961182f2
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/state_ids
2016-08-26 09:48:13 +01:00
c1a133a6b6
Merge pull request #1043 from matrix-org/erikj/backfill_fix
...
Fix None check in backfill
2016-08-26 09:07:05 +01:00
778fa85f47
Make sync not pull out full state
2016-08-25 18:59:44 +01:00
1a1e198f72
Merge pull request #1044 from matrix-org/paul/third-party-lookup
...
Root the 3PE lookup API within /_matrix/app/unstable
2016-08-25 18:49:18 +01:00
7356d52e73
Fix up push to use get_current_state_ids
2016-08-25 18:35:49 +01:00
9459137f1e
Just sprintf the 'kind' argument into uri directly
2016-08-25 18:35:38 +01:00
1294d4a329
Move ThirdPartyEntityKind into api.constants so the expectation becomes that the value is significant
2016-08-25 18:34:47 +01:00
0e1900d819
Pull out full state less
2016-08-25 18:15:51 +01:00
e7af8be5ae
Root the 3PE lookup API within /_matrix/app/unstable instead of at toplevel
2016-08-25 18:06:29 +01:00
142983b4ea
APP_SERVICE_PREFIX is never used; don't bother
2016-08-25 18:06:05 +01:00
721414d98a
Add desc
2016-08-25 17:49:05 +01:00
a3dc1e9cbe
Replace context.current_state with context.current_state_ids
2016-08-25 17:32:22 +01:00
d9dcb2ba3a
Merge pull request #1041 from matrix-org/paul/third-party-lookup
...
Extend 3PE lookup APIs for metadata query
2016-08-25 17:06:53 +01:00
adf53f04ce
appease pep8
2016-08-25 16:00:31 +01:00
c435bfee9c
Don't need toplevel cache on 3PE lookup metadata any more
2016-08-25 15:57:07 +01:00
db7283cc6b
Implement a ResponseCache around 3PE lookup metadata lookups
2016-08-25 15:56:27 +01:00
d0b8d49f71
Kill PROTOCOL_META since I'm not using it any more
2016-08-25 15:45:28 +01:00
5474824975
Actually query over AS API for 3PE lookup metadata
2016-08-25 15:29:36 +01:00
17f4f14df7
Pull out event ids rather than full events for state
2016-08-25 13:42:44 +01:00
cd5b264b03
Fix None check in backfill
2016-08-25 10:39:19 +01:00
eb6a7cf3f4
Merge branch 'release-v0.17.1' of github.com:matrix-org/synapse into develop
2016-08-24 14:50:42 +01:00
60a015550a
Bump changelog and version
2016-08-24 14:31:13 +01:00
90d5983d7a
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.17.1
2016-08-24 14:28:57 +01:00
d89f8683dc
Merge pull request #1042 from matrix-org/erikj/preserve_log_contexts
...
Preserve some logcontexts
2016-08-24 13:52:41 +01:00
c20cb5160d
Remove tracer
2016-08-24 13:22:47 +01:00
fda97dd58a
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/preserve_log_contexts
2016-08-24 13:22:02 +01:00
8e1ed09dff
Move static knowledge of protocol metadata into AS handler; cache the result
2016-08-24 13:01:53 +01:00
965f33c901
Declare 'gitter' known protocol, with user lookup
2016-08-24 12:34:03 +01:00
9899824b85
Initial hack at the 3PN protocols metadata lookup API
2016-08-24 12:33:01 +01:00
9219139351
Preserve some logcontexts
2016-08-24 11:58:40 +01:00
63c19e1df9
Move 3PU/3PL lookup APIs into /thirdparty containing entity
2016-08-24 11:55:57 +01:00
3e86dcf1c0
Merge pull request #1040 from matrix-org/erikj/pagination
...
Add None checks to backfill
2016-08-24 10:59:55 +01:00
86bcf4d6a7
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/pagination
2016-08-24 10:38:21 +01:00
ba07d4a70e
Add None checks to backfill
2016-08-24 10:31:05 +01:00
928b2187ea
Merge pull request #1039 from matrix-org/kegan/join-with-custom-content
...
Pass through user-supplied content in /join/$room_id
2016-08-23 17:22:38 +01:00
4b31426a02
Pass through user-supplied content in /join/$room_id
...
It was always intended to allow custom keys on the join event, but this has
at some point been lost. Restore it.
If the user specifies keys like "avatar_url" then they will be clobbered.
2016-08-23 16:32:04 +01:00
122c7a43c9
Merge pull request #1038 from matrix-org/erikj/receved_txn_purge
...
Delete old received_transactions rows
2016-08-23 11:02:40 +01:00
14047126d8
Bump changelog and version
2016-08-22 18:26:07 +01:00
d143f211c8
Merge pull request #1028 from matrix-org/dbkr/notifications_api
...
Add the Notifications API
2016-08-22 18:23:24 +01:00
e9fe9af068
Merge pull request #1037 from matrix-org/markjh/add_stats_to_prometheus
...
Add usage stats to prometheus monitoring
2016-08-22 16:37:32 +01:00
aad8a1a825
Delete old received_transactions
2016-08-22 16:29:46 +01:00
689f4cb914
Update comment
2016-08-22 16:17:31 +01:00
c8f9b45bc2
Add usage stats to prometheus monitoring
2016-08-22 15:34:38 +01:00
e65bc7d315
Merge pull request #1031 from matrix-org/erikj/measure_notifier
...
Add more Measure blocks
2016-08-22 12:13:07 +01:00
33f3624ff7
Add exception logging. Fix typo
2016-08-22 10:49:31 +01:00
8c52160b07
Allow request handlers to override metric name
2016-08-22 10:44:45 +01:00
a093fab253
Use top level measure
2016-08-22 10:18:12 +01:00
6e80c03d45
Merge branch 'develop' into dbkr/notifications_api
2016-08-20 00:16:18 +01:00
6372efbdc3
Merge pull request #1032 from matrix-org/matthew/workerdoc
...
Matthew/workerdoc
2016-08-19 19:17:09 +01:00
58d6c93103
PR feedback
2016-08-19 19:16:55 +01:00
Erik Johnston