24 Commits

Author	SHA1	Message	Date
Erik Johnston	f6583796fe	Merge branch 'develop' of github.com:matrix-org/synapse into mysql	2015-03-20 16:31:48 +00:00
Erik Johnston	dc0c989ef4	Give sensible names for '_simple_...' transactions	2015-03-20 15:59:18 +00:00
Erik Johnston	d7a0496f3e	Convert storage layer to be mysql compatible	2015-03-19 15:59:48 +00:00
Paul "LeoNerd" Evans	59a5f012cc	Also give _execute() a description	2015-03-11 17:19:17 +00:00
David Baker	04f8478aaa	Add the master push rule for the break-my-push button. Allow server default rules to be disabled by default.	2015-03-10 17:26:25 +00:00
David Baker	2a45f3d448	Use if not results rather than len, as per feedback.	2015-03-04 14:17:59 +00:00
David Baker	6fab7bd2c1	s/user_name/user/ as per mjark's comment	2015-03-02 18:17:19 +00:00
David Baker	20436cdf75	Blank lines	2015-03-02 15:58:12 +00:00
David Baker	1959088156	Add API for getting/setting enabled-ness of push rules.	2015-02-26 18:07:44 +00:00
David Baker	944003021b	whitespace	2015-02-26 13:43:05 +00:00
David Baker	94fa334b01	Add enable/disable overlay for push rules (REST API not yet hooked up)	2015-02-25 19:17:07 +00:00
Erik Johnston	4ebbaf0d43	Blunty replace json with simplejson	2015-02-11 14:23:10 +00:00
Mark Haines	b085fac735	Code-style fixes	2015-02-10 16:30:48 +00:00
David Baker	aaf50bf6f3	Give server default rules the 'default' attribute and fix various brokenness.	2015-02-05 15:11:38 +00:00
Mark Haines	acb68a39e0	Code style fixes.	2015-01-29 16:12:40 +00:00
David Baker	d5bdf3c0c7	Allow the push rule delete method to take more specifiers.	2015-01-28 18:06:04 +00:00
David Baker	e78dd33292	Use %s instead of +	2015-01-28 14:52:58 +00:00
David Baker	93aac9bb7b	Newline	2015-01-28 14:51:01 +00:00
David Baker	445ad9941e	Redundant parens	2015-01-28 14:49:59 +00:00
David Baker	5f84ba8ea1	Add API to delete push rules.	2015-01-23 17:49:37 +00:00
David Baker	bcd48b9636	Fix adding rules without before/after & add the rule that we couldn't find to the error	2015-01-23 10:28:25 +00:00
David Baker	8a850573c9	As yet fairly untested GET API for push rules	2015-01-22 19:32:17 +00:00
David Baker	7ecb49ef25	Insufficient newlines	2015-01-22 17:53:30 +00:00
David Baker	dc93860619	Add rest API & store for creating push rules ... Also make unrecognised request error look more like synapse errors because it makes it easier to throw them from within rest classes.	2015-01-22 17:37:12 +00:00