3645 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mark Haines	31e262e6b4	Copyright notice	2015-04-24 10:36:51 +01:00
Mark Haines	eede182df7	Merge branch 'develop' into key_distribution	2015-04-24 10:35:49 +01:00
Mark Haines	4e2f8b8722	Copyright notices	2015-04-24 10:35:29 +01:00
Mark Haines	c8c710eca7	Move the key related config parser into a separate file	2015-04-24 10:22:22 +01:00
Mark Haines	149ed9f151	Better help for the old-signing-key option	2015-04-24 10:07:55 +01:00
David Baker	f7a79a37be	pep8	2015-04-24 09:42:37 +01:00
David Baker	6532b6e607	Merge branch 'develop' into csauth ... Conflicts: synapse/http/server.py	2015-04-24 09:37:54 +01:00
David Baker	74270defda	No commas here, otherwise our error string constants become tuples.	2015-04-24 09:28:57 +01:00
Paul "LeoNerd" Evans	e1e5e53127	Remove users from the remote_offline_serials list (and clean up empty elements) when they go online again	2015-04-23 19:01:37 +01:00
Paul "LeoNerd" Evans	b3bda8a75f	Don't let the remote offline serial list grow arbitrarily large	2015-04-23 18:40:47 +01:00
Paul "LeoNerd" Evans	8a785c3006	Store a list of the presence serial number at which remote users went offline, so that when we delete them from the cachemap, we can still synthesize OFFLINE events for them (SYN-261)	2015-04-23 18:40:19 +01:00
Paul "LeoNerd" Evans	191f7f09ce	Generate presence event-stream JSON structures directly	2015-04-23 18:27:25 +01:00
David Baker	03eb4adc6e	Dedicated error code for failed 3pid auth verification	2015-04-23 18:20:17 +01:00
Mark Haines	4bbf7156ef	Update to match the specification for key/v2	2015-04-23 16:39:13 +01:00
Paul "LeoNerd" Evans	6d15401341	Mumble ReST mumble `fixed-width` mumble	2015-04-23 16:16:08 +01:00
Paul "LeoNerd" Evans	8c78414284	Formatting / wording fixes to metrics doc	2015-04-23 16:14:08 +01:00
Matthew Hodgson	6c99491347	prometheus/metrics howto from Leo	2015-04-23 16:08:08 +01:00
David Baker	0eb61a3d16	Remove ultimately unused feature of saving params from the first call in the session: it's probably too open to abuse.	2015-04-23 14:44:12 +01:00
David Baker	a2c10d37d7	Add an error code to 'missing token' response.	2015-04-23 13:23:44 +01:00
David Baker	2e0d9219b9	Remove now-redundant email config	2015-04-23 11:45:29 +01:00
Mark Haines	f30d47c876	Implement remote key lookup api	2015-04-22 14:21:08 +01:00
Paul "LeoNerd" Evans	a16eaa0c33	Neater fetching of user's auth level in a room - squash to int() at access time (SYN-353)	2015-04-22 14:20:04 +01:00
Paul "LeoNerd" Evans	f43063158a	Appease pep8	2015-04-22 13:12:11 +01:00
Kegsay	7c50e3b816	Add info on breaking AS API changes	2015-04-22 08:38:26 +01:00
Paul "LeoNerd" Evans	2808c040ef	Also remember to check 'invite' level for changes	2015-04-21 21:13:14 +01:00
Paul "LeoNerd" Evans	48b6ee2b67	Create an 'invite' powerlevel when making new rooms	2015-04-21 21:07:35 +01:00
Paul "LeoNerd" Evans	bc41f0398f	Initial implementation of an 'invite' power_level	2015-04-21 20:56:08 +01:00
Paul "LeoNerd" Evans	d3309933f5	Much neater fetching of defined powerlevels from m.room.power_levels state event	2015-04-21 20:53:23 +01:00
Paul "LeoNerd" Evans	b568c0231c	Remove debugging print statement accidentally committed	2015-04-21 20:21:14 +01:00
Paul "LeoNerd" Evans	3a7d7a3f22	Sanitise a user's powerlevel to an int() before numerical comparison, because otherwise Python is "helpful" with it (SYN-351)	2015-04-21 20:18:29 +01:00
Mark Haines	3ba522bb23	Merge branch 'develop' into key_distribution	2015-04-21 17:10:25 +01:00
Mark Haines	6080830bef	Bump syutil version to 0.0.5	2015-04-21 17:04:06 +01:00
Mark Haines	8b183781cb	Merge pull request #128 from matrix-org/unify_http_wrappers ... Unify http wrappers	2015-04-21 17:01:04 +01:00
Mark Haines	1f651ba6ec	Merge pull request #127 from matrix-org/bugs/SYN-350 ... SYN-350: Don't ratelimit the events generated during create room	2015-04-21 16:52:59 +01:00
Mark Haines	812a99100b	Set a version_string in BaseMediaResource so that the request_handler wrapper works	2015-04-21 16:43:58 +01:00
Mark Haines	1967650bc4	Combine the request wrappers in rest/media/v1 and http/server into a single wrapper decorator	2015-04-21 16:35:53 +01:00
Mark Haines	1ebff9736b	Split out the JsonResource request logging and error handling into a separate wrapper function	2015-04-21 16:07:20 +01:00
Mark Haines	24d21887ed	SYN-350: Don't ratelimit the individual events generated during room creation	2015-04-21 14:14:19 +01:00
Mark Haines	db8d4e8dd6	Merge branch 'develop' into key_distribution	2015-04-20 16:24:21 +01:00
Mark Haines	2f9157b427	Implement v2 key lookup	2015-04-20 16:23:47 +01:00
David Baker	91c8f828e1	pep8	2015-04-17 19:56:04 +01:00
David Baker	8db6832db8	Password reset, finally.	2015-04-17 19:53:47 +01:00
David Baker	117f35ac4a	Add endpoint to get threepids from server	2015-04-17 17:20:18 +01:00
David Baker	4eea5cf6c2	pep8	2015-04-17 16:46:45 +01:00
David Baker	f96ab9d18d	make add3pid servlet work	2015-04-17 16:44:49 +01:00
Erik Johnston	865398b4a9	Revert needless change to rest.profile	2015-04-17 16:14:51 +01:00
Erik Johnston	e3417bbbe0	Revert needless change to storage.profile	2015-04-17 16:13:14 +01:00
Erik Johnston	2492efb162	Merge branch 'develop' of github.com:matrix-org/synapse into postgres	2015-04-17 16:08:42 +01:00
Erik Johnston	4a5990ff8f	Merge branch 'master' of github.com:matrix-org/synapse into develop	2015-04-17 16:08:28 +01:00
Erik Johnston	5e7a90316d	Update --database-path metavar to SQLITE_DATABASE_PATH	2015-04-17 16:08:18 +01:00