Matthew Hodgson
|
772ad4f715
|
stop generating default identicons. reverts most of 582019f870 and solves vector-web/vector-im#346
|
2015-12-17 23:04:20 +00:00 |
|
Daniel Wagner-Hall
|
8c5f252edb
|
Strip address and such out of 3pid invites
We're not meant to leak that into the graph
|
2015-12-17 18:09:51 +01:00 |
|
Richard van der Hoff
|
a64f9bbfe0
|
Fix 500 error when back-paginating search results
We were mistakenly adding pagination clauses to the count query, which then
failed because the count query doesn't join to the events table.
|
2015-12-17 12:50:46 +00:00 |
|
Daniel Wagner-Hall
|
2b0f8a9482
|
Fix typo
|
2015-12-16 17:59:44 +01:00 |
|
Daniel Wagner-Hall
|
0311612ce9
|
Give the IS a bunch more 3pid invite context
This allows it to form richer emails
|
2015-12-16 13:05:32 +00:00 |
|
Mark Haines
|
5fc03449c8
|
Merge pull request #440 from matrix-org/daniel/ise
Include errcode on Internal Server Error
|
2015-12-16 11:26:55 +00:00 |
|
Mark Haines
|
4fab578b43
|
Merge branch 'release-v0.12.0' into develop
|
2015-12-16 11:18:45 +00:00 |
|
Mark Haines
|
dcfc70e8ed
|
Allow users to change which account a 3pid is bound to
|
2015-12-15 17:02:21 +00:00 |
|
Mark Haines
|
63fdd9fe0b
|
Changelog and version bump for v0.12.0-rc2
|
2015-12-14 16:26:59 +00:00 |
|
Mark Haines
|
3ddf0b9722
|
Fix spacing
|
2015-12-14 15:20:59 +00:00 |
|
Mark Haines
|
2acae8300f
|
Fix logging to lie less
|
2015-12-14 15:19:37 +00:00 |
|
Mark Haines
|
dbe7892e03
|
Fix a race between started/stopped stream
|
2015-12-14 15:09:41 +00:00 |
|
Mark Haines
|
28c5181dfe
|
Add commentary for fix in PR#442
|
2015-12-14 14:50:51 +00:00 |
|
Mark Haines
|
15e9885197
|
Merge branch 'release-v0.12.0' into develop
|
2015-12-14 14:46:55 +00:00 |
|
Mark Haines
|
8505a4ddc3
|
Merge pull request #441 from matrix-org/markjh/fts_skip_invalid
Skip events that where the body, name or topic isn't a string
|
2015-12-14 14:42:35 +00:00 |
|
Mark Haines
|
070e28e203
|
Combine the prev content tests
|
2015-12-14 14:34:04 +00:00 |
|
Mark Haines
|
834924248f
|
Check whether prev_content or prev_sender is set before trying to rollback state
|
2015-12-14 14:09:21 +00:00 |
|
Mark Haines
|
98dfa7d24f
|
Skip events that where the body, name or topic isn't a string when back populating the FTS index
|
2015-12-14 13:55:46 +00:00 |
|
Daniel Wagner-Hall
|
338c0a8a69
|
Include errcode on Internal Server Error
|
2015-12-14 13:50:50 +00:00 |
|
Daniel Wagner-Hall
|
76e69cc8de
|
Fix typo
|
2015-12-14 12:38:55 +00:00 |
|
Mark Haines
|
bfc52a2342
|
Fix typo in sql for full text search on sqlite3
|
2015-12-14 11:38:11 +00:00 |
|
Mark Haines
|
deeebbfcb7
|
Merge branch 'release-v0.12.0' into develop
|
2015-12-12 14:21:49 +00:00 |
|
Mark Haines
|
1ee7280c4c
|
Do the /sync in parallel accross the rooms like /initialSync does
|
2015-12-11 16:48:20 +00:00 |
|
Erik Johnston
|
cde49d3d2b
|
Merge pull request #435 from matrix-org/erikj/search
Include approximate count of search results
|
2015-12-11 16:27:38 +00:00 |
|
Erik Johnston
|
d9a5c56930
|
Include approximate count of search results
|
2015-12-11 11:40:23 +00:00 |
|
Erik Johnston
|
51fb590c0e
|
Use more efficient query form
|
2015-12-11 11:12:57 +00:00 |
|
Mark Haines
|
515548a47a
|
Missing yield
|
2015-12-10 17:54:23 +00:00 |
|
Mark Haines
|
7d6b313312
|
Add caches for whether a room has been forgotten by a user
|
2015-12-10 17:49:34 +00:00 |
|
Paul "LeoNerd" Evans
|
99afb4b750
|
Ensure that the event that gets persisted is the one that was signed
|
2015-12-10 17:08:21 +00:00 |
|
Mark Haines
|
a8589d1ff3
|
Mark the version as a -rc1 release candidate
|
2015-12-10 11:39:00 +00:00 |
|
Mark Haines
|
05f6cb42db
|
Bump synapse version to v0.12.0
|
2015-12-09 17:48:02 +00:00 |
|
David Baker
|
a24eedada7
|
pep8
|
2015-12-09 15:57:42 +00:00 |
|
David Baker
|
4a728beba1
|
Split out the push rule evaluator into a separate file so it can be more readily reused. Should be functionally identical.
|
2015-12-09 15:51:34 +00:00 |
|
Mark Haines
|
e4bfe50e8f
|
Allow filter JSON object in the filter query parameter in /sync
Documented by matrix-org/matrix-doc#224
|
2015-12-09 12:56:50 +00:00 |
|
Daniel Wagner-Hall
|
0f826b0b0d
|
Merge pull request #430 from matrix-org/daniel/unstable
Merge pull request #430 from matrix-org/daniel/unstable
|
2015-12-09 11:34:22 +00:00 |
|
Erik Johnston
|
7c2ff8c889
|
Merge pull request #405 from matrix-org/erikj/search-ts
Change the result dict to be a list in /search response
|
2015-12-08 16:15:27 +00:00 |
|
Daniel Wagner-Hall
|
7a8ba4c9a0
|
Actually host r0 and unstable prefixes
|
2015-12-08 15:26:52 +00:00 |
|
Mark Haines
|
6a5ff5f223
|
Track the time spent in the database per request.
and track the number of transactions that request started.
|
2015-12-07 17:56:11 +00:00 |
|
Mark Haines
|
f7a1cdbbc6
|
Merge pull request #423 from matrix-org/markjh/archived_flag
Only include the archived rooms if a include_leave flag in set in the…
|
2015-12-07 13:16:03 +00:00 |
|
Mark Haines
|
d547afeae0
|
Merge remote-tracking branch 'origin/master' into develop
|
2015-12-07 13:13:43 +00:00 |
|
David Baker
|
9c9b2829ae
|
also do more structured logging
|
2015-12-07 12:01:00 +00:00 |
|
David Baker
|
50e5886de1
|
pep8
|
2015-12-07 11:57:48 +00:00 |
|
David Baker
|
ba1d740239
|
Add logging to pushers API to log the body of the request
|
2015-12-07 11:52:20 +00:00 |
|
Mark Haines
|
a190b2e85e
|
Merge pull request #427 from matrix-org/markjh/log_context
Add a setter for the current log context.
|
2015-12-07 11:00:12 +00:00 |
|
Mark Haines
|
3dd1630848
|
Add a setter for the current log context.
Move the resource tracking inside that setter so that it is easier
to make sure that the resource tracking isn't double counting the
resource usage.
|
2015-12-07 10:51:18 +00:00 |
|
Daniel Wagner-Hall
|
41905784f7
|
Take object not bool
Allows bool as legacy fallback
See https://github.com/matrix-org/matrix-doc/pull/212
|
2015-12-07 10:44:33 +00:00 |
|
Mark Haines
|
660dee94af
|
Only include the archived rooms if a include_leave flag in set in the filter
|
2015-12-04 17:32:09 +00:00 |
|
Mark Haines
|
262a97f02b
|
Merge pull request #422 from matrix-org/markjh/schema
Bump schema version.
|
2015-12-04 15:45:44 +00:00 |
|
Mark Haines
|
d57c5cda71
|
Bump schema version.
As we released version 26 in v0.11.1
|
2015-12-04 15:28:39 +00:00 |
|
Mark Haines
|
99e1d6777f
|
Add metrics to track the cpu on the main thread consumed by each type of request
|
2015-12-04 14:42:24 +00:00 |
|