828 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Mark Haines	86fa1138be	Update readme with instructions on how to generate configs for homeservers	2014-09-01 20:22:16 +01:00
Erik Johnston	f452899fe2	Merge branch 'develop' of github.com:matrix-org/synapse into room_config	2014-09-01 19:57:28 +01:00
Erik Johnston	3f5ebccbff	Fix the tests to include new db calls	2014-09-01 19:57:17 +01:00
Mark Haines	ff79437d9b	Merge branch 'server2server_tls' into develop	2014-09-01 19:56:22 +01:00
Mark Haines	5452a8ee29	Fix SSL for federation http client	2014-09-01 18:43:08 +01:00
Mark Haines	00b042a3eb	Merge remote-tracking branch 'origin/develop' into server2server_tls	2014-09-01 18:30:07 +01:00
Mark Haines	a53946a8a1	Enable SSL for s2s http client	2014-09-01 18:30:00 +01:00
Erik Johnston	b8ab9f1c0a	Add all the necessary checks to make banning work.	2014-09-01 18:24:56 +01:00
Erik Johnston	3faa2ae78c	Merge branch 'develop' of github.com:matrix-org/synapse into room_config	2014-09-01 18:21:29 +01:00
Emmanuel ROHEE	0271e8e692	Follow API renaming. state -> presence. mtime_ago -> last_active_ago	2014-09-01 19:09:49 +02:00
Kegan Dougal	74cffcf51a	Small formatting errors	2014-09-01 17:57:44 +01:00
David Baker	6d07a28a29	fix lying docs	2014-09-01 17:55:41 +01:00
Mark Haines	6200630904	Add server TLS context factory	2014-09-01 17:55:35 +01:00
Emmanuel ROHEE	7d99cee3ef	Added roomName, a directive to compute a room name based on its alias (not aliases for now) and its users displaynames or ids	2014-09-01 18:52:24 +02:00
Kegan Dougal	99ce820cc8	Little bit more on syncing APIs, need to know more about responses before more work can be done on it.	2014-09-01 17:51:31 +01:00
David Baker	ab8de33c76	Oops, show the voice call button once a call has ended	2014-09-01 17:41:42 +01:00
Paul "LeoNerd" Evans	32bfd567ac	Added docs on presence 'last_active' field	2014-09-01 17:22:33 +01:00
David Baker	57f047a05a	Fairly simple move of the call status widget to the header bar (and therefore into the index page rather than the rooms page).	2014-09-01 17:16:27 +01:00
Kegan Dougal	5a11a8ef69	Flesh out Room Events.	2014-09-01 16:52:33 +01:00
Emmanuel ROHEE	9b61076d42	BF: Check config exists (=defined in the localstorage) before using it	2014-09-01 17:43:27 +02:00
Mark Haines	46dcb0d890	Merge branch 'develop' into server2server_tls	2014-09-01 16:31:09 +01:00
Mark Haines	ef6a8e4f32	Listen using SSL	2014-09-01 16:30:43 +01:00
David Baker	b9172b982f	missing semicolon	2014-09-01 16:23:13 +01:00
Paul "LeoNerd" Evans	1c6ab2d759	Bump a user's presence last_active time every time they send a message to a room	2014-09-01 16:16:35 +01:00
Paul "LeoNerd" Evans	59d3955db1	Have MemoryDataStore's get_rooms_for_user_where_membership_is() return room membership event objects, as per interface contract	2014-09-01 16:15:45 +01:00
Erik Johnston	db7109c43b	Add beginnings of ban support.	2014-09-01 16:15:34 +01:00
Paul "LeoNerd" Evans	fd696f1243	Perform room unit tests with 'local' users actually in the right domain ;)	2014-09-01 15:58:30 +01:00
Kegan Dougal	401c16559d	Specced out state/non-state events. Start working on the myriad of syncing APIs.	2014-09-01 15:58:20 +01:00
David Baker	fa6b3490e2	Handle call events in the recents view as well to get consistency with what it displays when refreshed.	2014-09-01 15:54:06 +01:00
David Baker	4e14e38bd5	Just show 'Call' for call events. Don't just splat out the content of the event for other events: it's rarely going to be sesnible.	2014-09-01 15:54:06 +01:00
Mark Haines	f5755bcadf	Merge branch 'develop' into server2server_tls	2014-09-01 15:51:44 +01:00
Mark Haines	9ea1de432d	Fix homeserver config parsing	2014-09-01 15:51:15 +01:00
Paul "LeoNerd" Evans	468d94c920	Rename API-visible 'mtime' presence field to 'last_active'; slightly different semantics	2014-09-01 15:39:50 +01:00
Emmanuel ROHEE	26a95988da	Fixed presence change that occurs -Xs ago	2014-09-01 16:27:11 +02:00
Emmanuel ROHEE	c9ee9b45c7	Fixed presence state update. Specifically, the current user was sometimes indicated as offline	2014-09-01 16:22:59 +02:00
Paul "LeoNerd" Evans	02f4e3b3ff	Rename 'state' presence key to the much more obvious 'presence'; maintain a legacy 'state' copy for now	2014-09-01 14:45:41 +01:00
Kegan Dougal	f500dd627a	Fleshed out joining/leaving rooms. Added M_LIMIT_EXCEEDED standard error code for rate limited requests.	2014-09-01 14:44:25 +01:00
Erik Johnston	865469f233	Implement power level lists, default power levels and send_evnet_level/add_state_level events.	2014-09-01 14:39:09 +01:00
David Baker	67ffc00d48	Don't show the hang up button once tha call has ended	2014-09-01 14:15:32 +01:00
Kegan Dougal	389ee3624c	Added /web folder which contains html/css (based off the default swagger-ui) for viewing the c-s json api.	2014-09-01 14:11:26 +01:00
Kegan Dougal	51b0b5c5ab	Renamed json files because: paths.	2014-09-01 14:05:28 +01:00
Erik Johnston	10efca1a74	Merge branch 'develop' of github.com:matrix-org/synapse into room_config	2014-09-01 13:41:44 +01:00
Mark Haines	a9512d0994	Merge branch 'develop' into server2server_tls	2014-09-01 13:29:17 +01:00
Matthew Hodgson	fad58dbd08	add another public wishlist item	2014-09-01 13:22:50 +01:00
Matthew Hodgson	0b01c8560d	make the little logos clickable for Erik	2014-09-01 13:22:42 +01:00
Kegan Dougal	3bb93abb34	Start digging into invite/join/leave sections.	2014-09-01 10:38:48 +01:00
Emmanuel ROHEE	f81002df60	BF: Pass desired_user_id to register API. And update the app header to avoid to display the previous matrix id	2014-09-01 11:12:24 +02:00
Matthew Hodgson	df752a15ce	licenses, please...	2014-09-01 00:42:03 +01:00
Matthew Hodgson	d27e1ab148	fix footer on non-room pages	2014-09-01 00:41:53 +01:00
Mark Haines	3eb45eba0e	Merge branch 'develop' into server2server_tls	2014-08-31 16:08:20 +01:00