e555bc6551
Merge branch 'rav/refactor_device_query' into develop
2016-08-03 14:26:01 +01:00
a843868fe9
E2eKeysHandler: minor tweaks
...
PR feedback
2016-08-03 14:24:33 +01:00
f5da3bacb2
Merge pull request #975 from matrix-org/erikj/multi_event_persist
...
Ensure we only persist an event once at a time
2016-08-03 14:10:36 +01:00
97f072db74
Print status code in federation_client.py
2016-08-03 13:46:56 +01:00
80ad710217
Remove other bit of deduplication
2016-08-03 13:25:59 +01:00
4fec5e57be
Default device_display_name to null
...
It turns out that it's more useful to return a null device display name (and
let clients decide how to handle it: eg, falling back to device_id) than using
a constant string like "unknown device".
2016-08-03 11:53:00 +01:00
a8a32d2714
Ensure we only persist an event once at a time
2016-08-03 11:23:39 +01:00
921f17f938
Merge branch 'develop' into rav/refactor_device_query
2016-08-03 11:12:47 +01:00
9a2f296fa2
Factor out some of the code shared between the sytest scripts ( #974 )
...
* Factor out some of the code shared between the different sytest jenkins scripts
* Exclude jenkins from the MANIFEST
* Fix dendron build
* Missing new line
* Poke jenkins
* Export the PORT_BASE and PORT_COUNT
* Poke jenkins
2016-08-02 20:42:30 +01:00
58c9653c6b
Don't infer paragrahs from newlines
2016-08-02 18:50:24 +01:00
6b58ade2f0
Comment on why we clone
2016-08-02 18:41:22 +01:00
9e66c58ceb
Spelling.
2016-08-02 18:37:31 +01:00
f83f5fbce8
Make it actually compile
2016-08-02 18:32:42 +01:00
aecaec3e10
Change the way we summarize URLs
...
Using XPath is slow on some machines (for unknown reasons), so use a
different approach to get a list of text nodes.
Try to generate a summary that respect paragraph and then word
boundaries, adding ellipses when appropriate.
2016-08-02 18:25:53 +01:00
1efee2f52b
E2E keys: Make federation query share code with client query
...
Refactor the e2e query handler to separate out the local query, and then make
the federation handler use it.
2016-08-02 18:12:00 +01:00
06f812b95c
Merge pull request #971 from matrix-org/erikj/fed_state
...
Fix response cache
2016-08-02 17:07:32 +01:00
c9154b970c
Don't double wrap 200
2016-08-02 16:45:53 +01:00
b3d5c4ad9d
Fix response cache
2016-08-02 16:42:21 +01:00
7b0f6293f2
Merge pull request #940 from matrix-org/erikj/fed_state_cache
...
Cache federation state responses
2016-08-02 15:21:37 +01:00
fcde5b2a97
Print authorization header for federation_client.py
2016-08-02 15:06:17 +01:00
342e072024
Merge pull request #967 from matrix-org/erikj/fed_reader
...
Split out the federation reading portions into a separate.
2016-08-02 13:59:47 +01:00
55e8a87888
Change default jenkins port base and count
2016-08-02 13:41:17 +01:00
26a8c1d7ab
Merge pull request #968 from matrix-org/dbkr/fix_add_email_on_register
...
Fix adding emails on registration
2016-08-02 10:32:17 +01:00
54de6a812a
Merge branch 'develop' into dbkr/fix_add_email_on_register
2016-08-02 10:18:15 +01:00
733bf44290
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
2016-08-02 09:56:31 +01:00
f14cd95342
Merge pull request #970 from matrix-org/erikj/clock
...
Ignore AlreadyCalled errors on timer cancel
2016-08-02 09:50:37 +01:00
986615b0b2
Move e2e query logic into a handler
2016-08-01 18:02:07 +01:00
bfeaab6dfc
missing --upgrade
2016-08-01 17:12:02 +01:00
b260f92936
Ignore AlreadyCalled errors on timer cancel
2016-07-31 16:00:12 +01:00
271d3e7865
Fix adding emails on registration
...
Synapse was not adding email addresses to accounts registered with an email address, due to too many different variables called 'result'. Rename both of them. Also remove the defer.returnValue() with no params because that's not a thing.
2016-07-29 15:25:24 +01:00
18b7eb830b
Merge pull request #958 from matrix-org/paul/SYN-738
...
Forbid non-ASes from registering users whose names begin with '_'
2016-07-29 14:10:45 +01:00
74106ba171
Make jenkins dendron test federation read apis
2016-07-29 11:45:03 +01:00
2a9ce8c422
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
2016-07-29 11:33:46 +01:00
cbea0c7044
Merge pull request #964 from matrix-org/erikj/fed_join_fix
...
Handle the case of missing auth events when joining a room
2016-07-29 11:33:16 +01:00
5aa024e501
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
2016-07-29 11:24:56 +01:00
c51a52f300
Mention that func will fetch auth events
2016-07-29 11:17:04 +01:00
3d13c3a295
Update docstring
2016-07-29 10:45:05 +01:00
a679a01dbe
Merge pull request #966 from matrix-org/markjh/fix_push
...
Create separate methods for getting messages to push
2016-07-29 10:13:01 +01:00
8dad08a950
Fix SQL to supply arguments in the same order
2016-07-29 09:57:13 +01:00
0a7d3cd00f
Create separate methods for getting messages to push
...
for the email and http pushers rather than trying to make a single
method that will work with their conflicting requirements.
The http pusher needs to get the messages in ascending stream order, and
doesn't want to miss a message.
The email pusher needs to get the messages in descending timestamp order,
and doesn't mind if it misses messages.
2016-07-28 20:24:24 +01:00
ec8b217722
Add destination retry to slave store
2016-07-28 17:35:53 +01:00
328ad6901d
Merge pull request #965 from matrix-org/kegan/comment-push-actions-fn
...
Comment get_unread_push_actions_for_user_in_range function
2016-07-28 17:27:28 +01:00
76b89d0edb
Add slace storage functions for public room list
2016-07-28 17:03:40 +01:00
370135ad0b
Comment get_unread_push_actions_for_user_in_range function
2016-07-28 16:47:37 +01:00
0fcbca531f
Add get_auth_chain to slave store
2016-07-28 16:36:28 +01:00
1e2740caab
Handle the case of missing auth events when joining a room
2016-07-28 16:08:33 +01:00
6ede23ff1b
Add more key storage funcs into slave store
2016-07-28 15:41:26 +01:00
591ad2268c
Merge pull request #963 from matrix-org/erikj/admin_docs
...
Add some basic admin API docs
2016-07-28 15:19:30 +01:00
3c3246c078
Use correct path
2016-07-28 15:08:37 +01:00
5fb41a955c
Merge branch 'release-v0.17.0' of github.com:matrix-org/synapse into develop
2016-07-28 14:56:32 +01:00
Richard van der Hoff