11362 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnston	7c89d5e97a	Merge branch 'develop' of github.com:matrix-org/synapse into develop	2014-08-27 17:05:48 +01:00
Erik Johnston	226025e9ca	Comments!	2014-08-27 17:04:47 +01:00
Mark Haines	f54b70520a	Return the store_id from persist_event	2014-08-27 17:03:45 +01:00
Matthew Hodgson	f53c4300fd	improve iOS layout a bit	2014-08-27 17:03:16 +01:00
Kegan Dougal	6ad9d9c226	Added /rooms/$roomid/state and /rooms/$roomid/initialSync to API docs.	2014-08-27 17:02:08 +01:00
Emmanuel ROHEE	234c50b834	BF: mFileInput dependency got lost somewhere and upload buttons did not work anymore	2014-08-27 18:00:19 +02:00
Mark Haines	1d95e78759	Merge branch 'develop' into storage_transactions	2014-08-27 16:54:12 +01:00
Mark Haines	b30358f439	add _get_room_member, fix datastore methods	2014-08-27 16:51:54 +01:00
Kegan Dougal	f64887e15c	Added RestServlet for /rooms/$roomid/initialSync	2014-08-27 16:49:01 +01:00
Erik Johnston	52cb5e6324	Remove stale FIXMEs	2014-08-27 16:44:29 +01:00
Kegan Dougal	4e8d19ee2b	Added RestServlet for /rooms/$roomid/state	2014-08-27 16:42:33 +01:00
Erik Johnston	8af5e360d6	Remove store_id from notifier.on_new_room_event calls.	2014-08-27 16:23:33 +01:00
Emmanuel ROHEE	d9155b6a25	Highlight the current room in the recents list	2014-08-27 17:20:53 +02:00
Emmanuel ROHEE	7ee5288849	Added the recents component at the left hand side of the room page	2014-08-27 17:20:53 +02:00
Kegan Dougal	e179ed1f60	Added generic state/non-state event sending to the API docs.	2014-08-27 16:16:40 +01:00
Erik Johnston	89c044c2a0	Merge branch 'stream_refactor' into develop	2014-08-27 16:11:43 +01:00
Erik Johnston	7917ff1271	Turn off presence again.	2014-08-27 16:09:48 +01:00
Kegan Dougal	abe2035d85	api docs: Finished adding all C-S APIs. Added initialSync, publicRooms, membership changes (generic and RPCy) and directory paths.	2014-08-27 15:41:38 +01:00
Erik Johnston	08881d808d	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	2014-08-27 15:34:01 +01:00
Erik Johnston	bfe9faad5a	Index sources in a nicer fashion.	2014-08-27 15:33:52 +01:00
Erik Johnston	05672a6a8c	Convert get_paginat_rows to use PaginationConfig. This allows people to supply directions.	2014-08-27 15:25:27 +01:00
Emmanuel ROHEE	fb9661898d	BF: use room_id if there is no alias	2014-08-27 16:24:23 +02:00
Mark Haines	a0d1f5a014	Start updating state handling to use snapshots	2014-08-27 15:11:51 +01:00
Emmanuel ROHEE	87190a9673	Sort recents in anti-chronological order	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	308c9273fa	Moved recents things into a separate (and reusable) controler	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	c67cac134f	Moved assignRoomAliases into a central piece: matrixService for now	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	43242a0657	Cleaned ng dependencies	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	b1352f97ac	home/recents: show the last message of each message	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	6691ca6f8d	Rename go() into goToPage() which is available from everywhere thanks to the inheritance of $scope	2014-08-27 15:55:51 +02:00
Emmanuel ROHEE	e40d829363	Support limit and feedback param of initialSync	2014-08-27 15:55:51 +02:00
Kegan Dougal	c585c87c4b	Renamed /ds to /directory	2014-08-27 14:54:29 +01:00
Kegan Dougal	1d9d287c7c	Renamed /public/rooms to /publicRooms	2014-08-27 14:52:07 +01:00
Mark Haines	46a2f6a816	Remove call to get_federation from homeserver	2014-08-27 14:36:20 +01:00
Mark Haines	a03c7f27a8	Fill out prev_events before calling persist_event	2014-08-27 14:32:19 +01:00
Erik Johnston	77a255c7c3	PEP8 tweaks.	2014-08-27 14:19:39 +01:00
Erik Johnston	47519cd8c2	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor ... Conflicts: synapse/handlers/events.py synapse/rest/events.py synapse/rest/room.py	2014-08-27 14:13:06 +01:00
Erik Johnston	bd16b93e8f	Implement presence event source. Change the way the notifier indexes listeners	2014-08-27 14:03:27 +01:00
David Baker	474d913712	fix joining rooms on webclient	2014-08-27 13:59:14 +01:00
Paul "LeoNerd" Evans	dddf5c0cc8	git ignore all the homeserver*.db files	2014-08-27 13:08:55 +01:00
Paul "LeoNerd" Evans	05fa81fee4	A reliable logger.info() message /after/ the TCP port has been opened and is listening; this is essential for avoiding races in wrapper scripts e.g. integration testing	2014-08-27 13:08:55 +01:00
Kegan Dougal	71095f4e6e	Updated swagger JSON: cleaned up unused entries. Converted most paths to the new format.	2014-08-27 12:14:35 +01:00
Kegan Dougal	6c609425ba	Removed urls.rst - The API docs / swagger JSON should be used as the canonical source for the REST API. Keeping urls.rst around is just an extra maintenance burden.	2014-08-27 12:14:35 +01:00
Paul "LeoNerd" Evans	5eff05a4ce	Initial typing notification support - EDU federation, but no timers, and no actual push to clients	2014-08-27 11:45:16 +01:00
Paul "LeoNerd" Evans	d63f775e06	Added parse_roomid() helper	2014-08-27 11:45:16 +01:00
Paul "LeoNerd" Evans	e677a3114e	Use SQLite's PRAGMA user_version to check if the database file really matches the schema we have in mind	2014-08-27 11:45:16 +01:00
Paul "LeoNerd" Evans	648796ef1d	Neater database setup at application startup time; only .connect() it once, not once per schema file; don't build the db_pool twice	2014-08-27 11:45:16 +01:00
Kegan Dougal	a8774cf351	Merge branch 'client_server_url_rename' into develop	2014-08-27 11:38:13 +01:00
Kegan Dougal	135a1aa229	Final url modifications: renamed /presence_list to /presence/list to keep the top-level namespace clean. Updated tests.	2014-08-27 11:37:53 +01:00
Mark Haines	474dcecb11	Remove unused populate_previous_pdus	2014-08-27 11:34:31 +01:00
Kegan Dougal	dd661769e1	Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and removed tests which tested that. Updated cmdclient and webclient.	2014-08-27 11:33:56 +01:00