1182 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	7735aad9d6	Bump version and changelog	2014-09-08 11:28:50 +02:00
Kegan Dougal	7bff9b6269	Minor spec tweaks.	2014-09-08 11:28:50 +02:00
Emmanuel ROHEE	24f0bb4af5	Revert "BF: Made notification work again (forgot to renamed "offline" to "unavailable")" ... This reverts commit c3f9d8e41b.	2014-09-08 11:09:14 +02:00
Emmanuel ROHEE	c3f9d8e41b	BF: Made notification work again (forgot to renamed "offline" to "unavailable")	2014-09-08 10:28:07 +02:00
Matthew Hodgson	64b6f09b0d	fix embarassing bug where in-progress messages get vaped when the previous one gets delivered	2014-09-06 17:48:16 -07:00
Erik Johnston	a73104b566	Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse	2014-09-06 18:28:24 +01:00
Matthew Hodgson	41907209bb	fix desktop notifs, which were broken in eab463fd	2014-09-06 10:26:41 -07:00
Erik Johnston	d12feed623	Merge branch 'release-v0.2.2' of github.com:matrix-org/synapse	2014-09-06 18:18:55 +01:00
Kegan Dougal	9e0c3e7838	Center recaptcha dialog.	2014-09-06 10:15:05 -07:00
Erik Johnston	a9afb7cba3	Remove disabled change from CHANGES	2014-09-06 18:14:56 +01:00
Matthew Hodgson	44bd5e04dd	disable broken event dup suppression, and fix echo for /me	2014-09-06 10:14:05 -07:00
Kegan Dougal	9be1b2cb23	Set the room_alias field when we encounter a new one, rather than only from local storage.	2014-09-06 09:57:13 -07:00
Kegan Dougal	92800afd95	Use the room_display_name when presenting on the home page, and not the room_alias which may not be set.	2014-09-06 09:53:39 -07:00
Kegan Dougal	929cb12e7e	https when loading recaptcha js	2014-09-06 09:47:30 -07:00
Erik Johnston	de55ba218f	Fix race in presence handler where we evicted things from cache while handling a key therein	2014-09-06 17:38:11 +01:00
Erik Johnston	71fb748d70	Bump version and changelog	2014-09-06 17:27:42 +01:00
Matthew Hodgson	6e341aebab	dedup all events	2014-09-06 00:36:55 -07:00
Matthew Hodgson	a1bf28b7f0	handle m.room.aliases for id<->alias mapping; remove local_storage map; stop local echo flickering by removing opacity transition for now; implement /join	2014-09-06 00:32:39 -07:00
Matthew Hodgson	aa90e53312	add todo	2014-09-06 00:32:39 -07:00
Erik Johnston	ea5b5b1f64	Fix state unit test	2014-09-06 07:44:00 +01:00
Erik Johnston	2205aba3ed	Fix bug where we used an event_id as a pdu_id	2014-09-06 07:41:51 +01:00
Kegan Dougal	027f51763e	Unit tests do not need captchas.	2014-09-05 23:41:18 -07:00
Kegan Dougal	1a298aad9c	Added captcha support on both the HS and web client. ... Merge branch 'captcha' of github.com:matrix-org/synapse into develop	2014-09-05 23:32:51 -07:00
Kegan Dougal	a342867d3f	Added instructions for setting up captcha in an obviously named file.	2014-09-05 23:32:07 -07:00
Kegan Dougal	b5749c75d9	Reload captchas when they fail. Cleanup on success.	2014-09-05 23:08:39 -07:00
Kegan Dougal	3ea6f01b4e	80 chars please	2014-09-05 22:55:29 -07:00
Kegan Dougal	37e53513b6	Add config opion for XFF headers when performing ReCaptcha auth.	2014-09-05 22:51:11 -07:00
Kegan Dougal	1829b55bb0	Captchas now work on registration. Missing x-forwarded-for config arg support. Missing reloading a new captcha on the web client / displaying a sensible error message.	2014-09-05 19:18:23 -07:00
Erik Johnston	6d19fe1481	Fix generation of event ids so that they are consistent between local and remote ids	2014-09-06 02:48:13 +01:00
Erik Johnston	781ff713ba	When getting a state event also include the previous content	2014-09-06 02:23:36 +01:00
Kegan Dougal	0b9e1e7b56	Added a captcha config to the HS, to enable registration captcha checking and for the recaptcha private key.	2014-09-05 17:58:06 -07:00
Kegan Dougal	c80f739461	Added webclient config.js for storing recaptcha public key.	2014-09-05 17:36:09 -07:00
Erik Johnston	684001ac62	Document new invite key added to createRoom api	2014-09-06 01:12:12 +01:00
Erik Johnston	f47f42090d	Add support for inviting people when you create a room	2014-09-06 01:10:07 +01:00
David Baker	c03c255304	Better call bar (visually: still lacks ring[back] tones).	2014-09-06 00:14:02 +01:00
Erik Johnston	fc65b68f30	Add m.roo.aliases	2014-09-05 22:01:10 +01:00
Kegan Dougal	130458385e	Modified matrixService.register to specify if captcha results should be sent with the registration request. This is toggleable via useCaptcha in register-controller.	2014-09-05 13:56:36 -07:00
Erik Johnston	480438eee6	Validate power levels event changes. Change error messages to be more helpful. Fix bug where we checked the wrong power levels	2014-09-05 21:54:16 +01:00
Erik Johnston	9dd4570b68	Generate m.room.aliases event when the HS creates a room alias	2014-09-05 21:35:56 +01:00
Kegan Dougal	0280176ccd	Added basic captcha, not hooked up	2014-09-05 13:31:47 -07:00
Kegan Dougal	b4e1c1f51e	Minor spec tweaks.	2014-09-05 12:46:48 -07:00
Erik Johnston	1c7bb34ffd	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-09-05 20:39:57 +01:00
Emmanuel ROHEE	b3be06667d	BF: tab completion did not work with commands. $scope.input contained only the typed chars not the result of the completion. ... Needed to fire an event so that ng update the input model	2014-09-05 18:46:34 +02:00
Erik Johnston	982604fbf2	Empty string is not a valid JSON object, so don't return them in HTTP responses.	2014-09-05 17:13:26 +01:00
Erik Johnston	250ee2ea7d	AUth the contents of power level events	2014-09-05 17:13:19 +01:00
Erik Johnston	95037d8d9d	Change the default power levels to be 0, 50 and 100	2014-09-05 17:13:03 +01:00
Emmanuel ROHEE	8a7f7f5004	BF: Update the members list on banned & kicked "events"	2014-09-05 18:05:23 +02:00
Emmanuel ROHEE	12a23f01b4	autoscroll down(if the scroller was already at the bottom) when receiving member events	2014-09-05 17:52:11 +02:00
Emmanuel ROHEE	3a88808983	doc: kick can take a reason arg	2014-09-05 17:32:35 +02:00
Emmanuel ROHEE	3be6156774	Created kick & unban methods in matrixService. Made some factorisation.	2014-09-05 17:30:50 +02:00