5078 Commits (51fb590c0e787c385bea1d595fa8bceea23c26e5)

 

All Branches   

Search

Author	SHA1	Message	Date
Erik Johnston	51fb590c0e	Use more efficient query form	9 years ago
Matthew Hodgson	5577a61090	throwaway 1-liner for generating password hashes	9 years ago
David Baker	86345a511f	Merge pull request #432 from matrix-org/pushrules_refactor ... Split out the push rule evaluator into a separate file	9 years ago
David Baker	a24eedada7	pep8	9 years ago
David Baker	4a728beba1	Split out the push rule evaluator into a separate file so it can be more readily reused. Should be functionally identical.	9 years ago
Mark Haines	019597555f	Merge pull request #431 from matrix-org/markjh/filter_inline ... Allow filter JSON object in the filter query parameter in /sync Documented by matrix-org/matrix-doc#224	9 years ago
Mark Haines	e4bfe50e8f	Allow filter JSON object in the filter query parameter in /sync ... Documented by matrix-org/matrix-doc#224	9 years ago
Daniel Wagner-Hall	0f826b0b0d	Merge pull request #430 from matrix-org/daniel/unstable ... Merge pull request #430 from matrix-org/daniel/unstable	9 years ago
Erik Johnston	7c2ff8c889	Merge pull request #405 from matrix-org/erikj/search-ts ... Change the result dict to be a list in /search response	9 years ago
Daniel Wagner-Hall	7a8ba4c9a0	Actually host r0 and unstable prefixes	9 years ago
Mark Haines	219027f580	Merge pull request #429 from matrix-org/markjh/db_counters ... Track the time spent in the database per request.	9 years ago
Mark Haines	6a5ff5f223	Track the time spent in the database per request. ... and track the number of transactions that request started.	9 years ago
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…	9 years ago
Mark Haines	d547afeae0	Merge remote-tracking branch 'origin/master' into develop	9 years ago
Mark Haines	dd108286df	Merge pull request #426 from OlegGirko/fix_mock_import ... Fix mock import in tests.	9 years ago
David Baker	266df8a9b8	Merge pull request #428 from matrix-org/pusher_api_log ... Add logging to pushers API to log the body of the request	9 years ago
David Baker	9c9b2829ae	also do more structured logging	9 years ago
David Baker	50e5886de1	pep8	9 years ago
David Baker	ba1d740239	Add logging to pushers API to log the body of the request	9 years ago
Mark Haines	a190b2e85e	Merge pull request #427 from matrix-org/markjh/log_context ... Add a setter for the current log context.	9 years ago
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.	9 years ago
Daniel Wagner-Hall	07d18dcab1	Merge pull request #424 from matrix-org/daniel/pushdictification ... Take object not bool Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212	9 years ago
Daniel Wagner-Hall	41905784f7	Take object not bool ... Allows bool as legacy fallback See https://github.com/matrix-org/matrix-doc/pull/212	9 years ago
Oleg Girko	4013216fcc	Fix mock import in tests. ... For some reason, one test imports Mock class from mock.mock rather than from mock. This change fixes this error. Signed-off-by: Oleg Girko <ol@infoserver.lv>	9 years ago
Matthew Hodgson	84f2ad5dea	Merge pull request #425 from MadsRC/develop ... Added installation instructions for postgres on CentOS 7	9 years ago
Mads R. Christensen	44b2bf91be	Added installation instructions for postgres on CentOS 7	9 years ago
Mark Haines	660dee94af	Only include the archived rooms if a include_leave flag in set in the filter	9 years ago
Mark Haines	262a97f02b	Merge pull request #422 from matrix-org/markjh/schema ... Bump schema version.	9 years ago
Mark Haines	bd0fa9e2d2	Merge pull request #421 from matrix-org/markjh/resource_metrics ... Add metrics to track the cpu on the main thread consumed by each type…	9 years ago
Mark Haines	d57c5cda71	Bump schema version. ... As we released version 26 in v0.11.1	9 years ago
Mark Haines	99e1d6777f	Add metrics to track the cpu on the main thread consumed by each type of request	9 years ago
Mark Haines	3c85a317d6	Merge pull request #420 from matrix-org/markjh/resource_usage ... Track the cpu used in the main thread by each logging context	9 years ago
Mark Haines	5231737369	Add comments to explain why we are hardcoding RUSAGE_THREAD	9 years ago
Mark Haines	d6059bdd2a	Fix warnings	9 years ago
Mark Haines	48a2526d62	Track the cpu used in the main thread by each logging context	9 years ago
Mark Haines	b29d2fd7f8	Merge pull request #419 from matrix-org/markjh/reuse_captcha_client ... Reuse the captcha client rather than creating a new one for each request	9 years ago
Daniel Wagner-Hall	edfcb83473	Flatten devices into a dict, not a list	9 years ago
Mark Haines	478b4e3ed4	Reuse the captcha client rather than creating a new one for each request	9 years ago
Erik Johnston	b8680b82c3	Merge pull request #414 from matrix-org/erikj/if_not_exists ... Older versions of SQLite don't like IF NOT EXISTS in virtual tables	9 years ago
Daniel Wagner-Hall	ac213c2e08	Merge pull request #415 from matrix-org/daniel/endpoints ... Merge pull request #415 from matrix-org/daniel/endpoints	9 years ago
Daniel Wagner-Hall	e880164c59	Merge pull request #418 from matrix-org/daniel/whois ... Merge pull request #418 from matrix-org/daniel/whois	9 years ago
Daniel Wagner-Hall	526bc33e02	Fix implementation of /admin/whois	9 years ago
David Baker	181616deed	Merge pull request #417 from matrix-org/fix_db_v15_postgres ... Fix schema delta 15 on postgres	9 years ago
David Baker	e515b48929	Just replace the table definition with the one from full_schema 16	9 years ago
David Baker	8810eb8c39	Fix schema delta 15 on postgres in the very unlikley event that anyone upgrades to 15...	9 years ago
Mark Haines	748c0f5efa	Merge pull request #416 from matrix-org/markjh/idempotent_state ... Make state updates in the C+S API idempotent	9 years ago
Mark Haines	491f3d16dc	Make state updates in the C+S API idempotent	9 years ago
Daniel Wagner-Hall	872c134807	Update endpoints to reflect current spec	9 years ago
Erik Johnston	f721fdbf87	Merge pull request #412 from matrix-org/erikj/search ... Search: Add prefix matching support	9 years ago
Erik Johnston	976cb5aaa8	Throw if unrecognized DB type	9 years ago