matrix/thirdparty/synapse.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
*	WIP voip support on web client	David Baker	2014-08-27	7	-3/+170
\|
*	Fix up the various presence-related tests so that if they're not skipped, ↵	Paul "LeoNerd" Evans	2014-08-27	3	-12/+26
\| \| \| \|	they still PASS
*	Define a NullSource useful for unit-testing	Paul "LeoNerd" Evans	2014-08-27	1	-0/+16
\|
*	Split out MessageHandler	Erik Johnston	2014-08-27	3	-276/+305
\|
*	Wired the recents list with the stream events for realtime update	Emmanuel ROHEE	2014-08-27	1	-9/+10
\|
*	Merge branch 'develop' into storage_transactions	Mark Haines	2014-08-27	5	-7/+11
\|\ \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/handlers/test_federation.py tests/handlers/test_room.py
\| *	Fix tests.	Erik Johnston	2014-08-27	2	-4/+3
\| \|
\| *	If timeout=0, return immediately	Erik Johnston	2014-08-27	1	-1/+5
\| \|
\| *	Add python shebang line and chmod +x setup.py	Paul "LeoNerd" Evans	2014-08-27	1	-0/+2
\| \|
* \|	Merge branch 'develop' into storage_transactions	Mark Haines	2014-08-27	23	-646/+727
\|\\| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/handlers/room.py synapse/storage/stream.py
\| *	Merge branch 'develop' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-08-27	8	-13/+284
\| \|\
\| \| *	improve iOS layout a bit	Matthew Hodgson	2014-08-27	1	-0/+10
\| \| \|
\| \| *	Added /rooms/$roomid/state and /rooms/$roomid/initialSync to API docs.	Kegan Dougal	2014-08-27	1	-0/+73
\| \| \|
\| \| *	BF: mFileInput dependency got lost somewhere and upload buttons did not work ↵	Emmanuel ROHEE	2014-08-27	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	anymore
\| * \|	Comments!	Erik Johnston	2014-08-27	1	-0/+35
\| \| \|
\| * \|	Remove stale FIXMEs	Erik Johnston	2014-08-27	1	-2/+0
\| \| \|
\| * \|	Remove store_id from notifier.on_new_room_event calls.	Erik Johnston	2014-08-27	2	-13/+8
\| \| \|
\| * \|	Merge branch 'stream_refactor' into develop	Erik Johnston	2014-08-27	17	-636/+599
\| \|\ \
\| \| * \|	Turn off presence again.	Erik Johnston	2014-08-27	1	-2/+2
\| \| \| \|
\| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	Erik Johnston	2014-08-27	14	-111/+289
\| \| \|\ \
\| \| * \| \|	Index sources in a nicer fashion.	Erik Johnston	2014-08-27	3	-16/+15
\| \| \| \| \|
\| \| * \| \|	Convert get_paginat_rows to use PaginationConfig. This allows people to ↵	Erik Johnston	2014-08-27	3	-41/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	supply directions.
\| \| * \| \|	PEP8 tweaks.	Erik Johnston	2014-08-27	5	-10/+12
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	Erik Johnston	2014-08-27	23	-748/+771
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/handlers/events.py synapse/rest/events.py synapse/rest/room.py
\| \| * \| \| \|	Implement presence event source. Change the way the notifier indexes listeners	Erik Johnston	2014-08-27	5	-80/+107
\| \| \| \| \| \|
\| \| * \| \| \|	Enable presence again. Fix up api to match old api.	Erik Johnston	2014-08-26	5	-10/+35
\| \| \| \| \| \|
\| \| * \| \| \|	Fix exceptions so that the event stream works. Presence like events are ↵	Erik Johnston	2014-08-26	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	turned off currently.
\| \| * \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	Erik Johnston	2014-08-26	10	-161/+85
\| \| \|\ \ \ \
\| \| * \| \| \| \|	WIP: Completely change how event streaming and pagination work. This ↵	Erik Johnston	2014-08-26	16	-655/+437
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reflects the change in the underlying storage model.
\| \| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	Erik Johnston	2014-08-26	8	-17/+22
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	Erik Johnston	2014-08-26	11	-31/+11
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	Erik Johnston	2014-08-26	7	-39/+42
\| \| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	Erik Johnston	2014-08-26	7	-12/+319
\| \| \|\ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor	Erik Johnston	2014-08-26	63	-800/+3107
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Use new StreamToken in pagination config	Erik Johnston	2014-08-21	1	-5/+9
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Add in StreamToken type	Erik Johnston	2014-08-21	1	-0/+74
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Return the store_id from persist_event	Mark Haines	2014-08-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into storage_transactions	Mark Haines	2014-08-27	34	-792/+1341
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Added RestServlet for /rooms/$roomid/initialSync	Kegan Dougal	2014-08-27	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Added RestServlet for /rooms/$roomid/state	Kegan Dougal	2014-08-27	1	-0/+16
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Highlight the current room in the recents list	Emmanuel ROHEE	2014-08-27	4	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Added the recents component at the left hand side of the room page	Emmanuel ROHEE	2014-08-27	2	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Added generic state/non-state event sending to the API docs.	Kegan Dougal	2014-08-27	1	-8/+123
\| \|/ / / / / / / / / /
\| * \| \| \| \| \| \| \| \| /	api docs: Finished adding all C-S APIs. Added initialSync, publicRooms, ↵	Kegan Dougal	2014-08-27	4	-53/+331
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	membership changes (generic and RPCy) and directory paths.
\| * \| \| \| \| \| \| \| \|	BF: use room_id if there is no alias	Emmanuel ROHEE	2014-08-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Sort recents in anti-chronological order	Emmanuel ROHEE	2014-08-27	3	-1/+49
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Moved recents things into a separate (and reusable) controler	Emmanuel ROHEE	2014-08-27	6	-117/+126
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Moved assignRoomAliases into a central piece: matrixService for now	Emmanuel ROHEE	2014-08-27	1	-0/+34
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Cleaned ng dependencies	Emmanuel ROHEE	2014-08-27	1	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	home/recents: show the last message of each message	Emmanuel ROHEE	2014-08-27	3	-8/+102
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Rename go() into goToPage() which is available from everywhere thanks to the ↵	Emmanuel ROHEE	2014-08-27	2	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	inheritance of $scope
\| * \| \| \| \| \| \| \| \|	Support limit and feedback param of initialSync	Emmanuel ROHEE	2014-08-27	2	-3/+15
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Renamed /ds to /directory	Kegan Dougal	2014-08-27	2	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Renamed /public/rooms to /publicRooms	Kegan Dougal	2014-08-27	4	-37/+14
\| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	fix joining rooms on webclient	David Baker	2014-08-27	1	-1/+2
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	git ignore all the homeserver*.db files	Paul "LeoNerd" Evans	2014-08-27	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	A reliable logger.info() message /after/ the TCP port has been opened and is ↵	Paul "LeoNerd" Evans	2014-08-27	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	listening; this is essential for avoiding races in wrapper scripts e.g. integration testing
\| * \| \| \| \| \| \| \|	Updated swagger JSON: cleaned up unused entries. Converted most paths to the ↵	Kegan Dougal	2014-08-27	4	-477/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	new format.
\| * \| \| \| \| \| \| \|	Removed urls.rst - The API docs / swagger JSON should be used as the ↵	Kegan Dougal	2014-08-27	1	-92/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	canonical source for the REST API. Keeping urls.rst around is just an extra maintenance burden.
\| * \| \| \| \| \| \| \|	Initial typing notification support - EDU federation, but no timers, and no ↵	Paul "LeoNerd" Evans	2014-08-27	3	-0/+398
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	actual push to clients
\| * \| \| \| \| \| \| \|	Added parse_roomid() helper	Paul "LeoNerd" Evans	2014-08-27	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Use SQLite's PRAGMA user_version to check if the database file really ↵	Paul "LeoNerd" Evans	2014-08-27	1	-6/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	matches the schema we have in mind
\| * \| \| \| \| \| \| \|	Neater database setup at application startup time; only .connect() it once, ↵	Paul "LeoNerd" Evans	2014-08-27	1	-17/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	not once per schema file; don't build the db_pool twice
\| * \| \| \| \| \| \| \|	Merge branch 'client_server_url_rename' into develop	Kegan Dougal	2014-08-27	8	-119/+59
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	Final url modifications: renamed /presence_list to /presence/list to keep ↵	Kegan Dougal	2014-08-27	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the top-level namespace clean. Updated tests.
\| \| * \| \| \| \| \| \| \|	Renamed /rooms to /createRoom. Removed ability to PUT raw room IDs, and ↵	Kegan Dougal	2014-08-27	6	-115/+55
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	removed tests which tested that. Updated cmdclient and webclient.
* \| \| \| \| \| \| \| \|	add _get_room_member, fix datastore methods	Mark Haines	2014-08-27	5	-12/+33
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Start updating state handling to use snapshots	Mark Haines	2014-08-27	4	-25/+24
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove call to get_federation from homeserver	Mark Haines	2014-08-27	1	-4/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fill out prev_events before calling persist_event	Mark Haines	2014-08-27	5	-83/+57
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove unused populate_previous_pdus	Mark Haines	2014-08-27	3	-27/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'develop' into storage_transactions	Mark Haines	2014-08-27	17	-167/+185
\|\\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Added support for GET /events/$eventid with auth checks.	Kegan Dougal	2014-08-27	4	-2/+45
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Modified /join/$identifier to support $identifier being a room ID in ↵	Kegan Dougal	2014-08-27	3	-14/+61
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	addition to a room alias.
\| * \| \| \| \| \| \|	Pepper UT TODOs	Kegan Dougal	2014-08-26	2	-0/+6
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'client_server_url_rename' into develop	Kegan Dougal	2014-08-26	4	-81/+13
\| \|\ \ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Kegan Dougal	2014-08-26	0	-0/+0
\| \| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	client_server_url_rename
\| * \| \| \| \| \| \| \|	Merge branch 'client_server_url_rename' into develop	Kegan Dougal	2014-08-26	6	-87/+73
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Feedback: Removed FeedbackRestServlet. Modified keys on FeedbackEvent. ↵	Kegan Dougal	2014-08-26	4	-81/+13
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Expanded the feedback constants to fully explain what type of feedback they are.
\| \| * \| \| \| \| \|	Removed MessageRestServlet, use RoomSendEventRestServlet instead. Updated ↵	Kegan Dougal	2014-08-26	6	-87/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cmdclient, tests and webclient. All appears to work.
\| \| * \| \| \| \| \|	Added RoomSendEventRestServlet to send generic non-state events. It even ↵	Kegan Dougal	2014-08-26	1	-2/+50
\| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	appears to work..!
\| * \| \| \| \| \|	Respect 'limit' param in initialSync api	Erik Johnston	2014-08-26	1	-1/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Fold federation/handler into handlers/federation	Mark Haines	2014-08-26	9	-189/+165
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Use store.persist_event rather than ↵	Mark Haines	2014-08-26	2	-21/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	pdu_actions.persist_outgoing/pdu_actions.persist_received
* \| \| \| \| \| \|	Move new event boilerplate in room handlers into a method on a base clase.	Mark Haines	2014-08-26	2	-52/+33
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Move pdu and event persistence into a single persist_event function	Mark Haines	2014-08-26	4	-50/+36
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'develop' into storage_transactions	Mark Haines	2014-08-26	6	-15/+16
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'client_server_url_rename' into develop	Kegan Dougal	2014-08-26	6	-15/+16
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Renaming: /im/sync >> /initialSync. /rooms/$roomid/members/list >> ↵	Kegan Dougal	2014-08-26	6	-15/+16
\| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/rooms/$roomid/members. /rooms$roomid/messages/list >> /room/$roomid/messages. Updated cmdclient, tests and webclient.
* \| \| \| \| \| \|	Merge branch 'develop' into storage_transactions	Mark Haines	2014-08-26	1	-1/+1
\|\\| \| \| \| \| \|
\| * \| \| \| \| \|	Use state_key rather than target_user_id	Mark Haines	2014-08-26	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Use state_key rather than target_user_id	Mark Haines	2014-08-26	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'develop' into storage_transactions	Mark Haines	2014-08-26	74	-869/+3466
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: synapse/api/auth.py synapse/handlers/room.py synapse/storage/__init__.py
\| * \| \| \| \|	Fix pyflakes errors	Mark Haines	2014-08-26	11	-31/+11
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Avoid double call of refresh at app startup	Emmanuel ROHEE	2014-08-26	2	-5/+7
\| \| \| \| \|
\| * \| \| \|	Merge branch 'client_server_url_rename' into develop	Kegan Dougal	2014-08-26	5	-34/+35
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \|
\| \| * \| \|	Fix ALL THE UNIT TESTS	Kegan Dougal	2014-08-26	5	-34/+35
\| \| \| \| \|
\| * \| \| \|	Determine and send user presence state	Emmanuel ROHEE	2014-08-26	4	-5/+140
\| \| \| \| \|
\| * \| \| \|	Merge branch 'client_server_url_rename' into develop	Kegan Dougal	2014-08-26	8	-14/+217
\| \|\\| \| \|
\| \| * \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Kegan Dougal	2014-08-26	4	-7/+38
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \|	client_server_url_rename
\| \| \| * \|	Add the ability to turn on the twisted manhole telnet service.	Erik Johnston	2014-08-26	2	-2/+13
\| \| \| \| \|
\| \| \| * \|	Add a do_users_share_a_room method and use that in the presence handler.	Erik Johnston	2014-08-26	2	-5/+25
\| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'client_server_url_rename' into develop	Kegan Dougal	2014-08-26	14	-170/+117
\| \|\ \ \
\| \| \| * \|	webclient: Updated to use /rooms/$roomid/[invite\|join\|leave]	Kegan Dougal	2014-08-26	1	-7/+11
\| \| \| \| \|
\| \| \| * \|	Implemented /rooms/$roomid/[invite\|join\|leave] with POST / PUT (incl txn ids)	Kegan Dougal	2014-08-26	2	-8/+35
\| \| \| \| \|
\| \| \| * \|	Added basic in-memory REST transaction storage. Only the latest transaction ↵	Kegan Dougal	2014-08-26	3	-2/+103
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for a given path/access_token combo is stored in order to prevent storing ALL request/response pairs.
\| \| \| * \|	Added servlet for /rooms/$roomid/[invite\|join\|leave]	Kegan Dougal	2014-08-26	1	-0/+40
\| \| \|/ /
\| \| * \|	URL renaming: Room state keys now use the format ↵	Kegan Dougal	2014-08-26	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/rooms/$roomid/state/$event_type/$state_key. cmdclient: Fixed double urlencoding on leave command. Stream from the END since START now produces an error on /events.
\| \| * \|	Adjusted webclient to use new state paths. Updated membership msg template ↵	Kegan Dougal	2014-08-26	6	-47/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	to actually show the person invited. Factored out common membership functions in matrix service.
\| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Kegan Dougal	2014-08-26	1	-1/+1
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \|	client_server_url_rename
\| * \| \|	Add 'state_key' to valid_keys	Erik Johnston	2014-08-26	1	-0/+1
\| \| \| \|
\| * \| \|	Send down state_key to clients	Erik Johnston	2014-08-26	1	-1/+0
\| \| \| \|
\| \| * \|	Merge branch 'develop' of github.com:matrix-org/synapse into ↵	Kegan Dougal	2014-08-26	55	-606/+2633
\| \| \|\ \ \| \| \|/ / \| \|/\| \| \| \| \| \|	client_server_url_rename
\| * \| \|	Order 'get_recent_events_for_room' correctly.	Erik Johnston	2014-08-26	1	-1/+1
\| \| \| \|
\| * \| \|	The landing URL is now '#/' which actually points to homeController	Emmanuel ROHEE	2014-08-25	1	-2/+2
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into develop	Emmanuel ROHEE	2014-08-25	1	-2/+2
\| \|\ \ \
\| \| * \| \|	Ensure that we don't have duplicate hosts in the pdu destinations list	Erik Johnston	2014-08-24	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	Merge branch 'hotfixes-0.0.1' of github.com:matrix-org/synapse	Erik Johnston	2014-08-24	4	-4/+14
\| \| \|\ \ \
\| * \| \ \ \	Merge remote-tracking branch 'origin/hotfixes-0.0.1' into develop	Emmanuel ROHEE	2014-08-25	24	-40/+1787
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	For the content repo, don't just use homeserver.hostname as that might not ↵	Erik Johnston	2014-08-24	2	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	include the port due to SRV.
\| \| * \| \| \|	Add a unique constraint on the room hosts table	Erik Johnston	2014-08-24	1	-1/+2
\| \| \| \| \| \|
\| \| * \| \| \|	Encode unicode from json as utf-8. This was required to allow people to ↵	Erik Johnston	2014-08-24	1	-2/+2
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	register on my laptop
\| \| * \| \|	oops	Matthew Hodgson	2014-08-23	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	very quick and dirty responsive design for iPhones	Matthew Hodgson	2014-08-23	6	-30/+110
\| \| \| \| \|
\| \| * \| \|	point out the non-quick-start guide	Matthew Hodgson	2014-08-23	1	-2/+4
\| \| \| \| \|
\| \| * \| \|	Mention in changelog that we disabled presence. v0.0.1	Erik Johnston	2014-08-22	1	-0/+2
\| \| \| \| \|
\| \| * \| \|	skip presence tests which broke when presence polling was disabled	Mark Haines	2014-08-22	3	-0/+13
\| \| \| \| \|
\| \| * \| \|	Oops, we need to use defer.returnValue.	Erik Johnston	2014-08-22	1	-1/+2
\| \| \| \| \|
\| \| * \| \|	Make is_presence_visible always return true as it was thrashing the database.	Erik Johnston	2014-08-22	1	-0/+3
\| \| \| \| \|
\| \| * \| \|	Turn off more spammy logging.	Erik Johnston	2014-08-22	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Turn off spammy logging	Erik Johnston	2014-08-22	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	Add indices to schema	Erik Johnston	2014-08-22	2	-0/+24
\| \| \| \| \|
\| \| * \| \|	avatar url	root	2014-08-22	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	add 0.0.0 into the changelog, and add dates	Matthew Hodgson	2014-08-22	1	-2/+8
\| \| \| \| \|
\| \| * \| \|	Merge branch 'release-v0.0.1' of github.com:matrix-org/synapse	Erik Johnston	2014-08-22	63	-1386/+1956
\| \| \|\ \ \
\| \| * \| \| \|	Added initial swagger REST API spec.	Kegan Dougal	2014-08-22	7	-0/+1607
\| \| \| \| \| \|
\| * \| \| \| \|	Oops. Removed my NetBeans private folders	Emmanuel ROHEE	2014-08-25	3	-39/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Added "Your name" as placeholder to help user understand what is this alone ↵	Emmanuel ROHEE	2014-08-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	input box
\| * \| \| \| \|	Merge branch 'settings-page' into develop	Emmanuel ROHEE	2014-08-22	15	-452/+503
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
\| \| * \| \| \|	Use /home everywhere	Emmanuel ROHEE	2014-08-22	6	-12/+12
\| \| \| \| \| \|
\| \| * \| \| \|	renamed rooms to home - renamed files	Emmanuel ROHEE	2014-08-22	4	-0/+23
\| \| \| \| \| \|
\| \| * \| \| \|	renamed rooms to home	Emmanuel ROHEE	2014-08-22	3	-0/+16
\| \| \| \| \| \|
\| \| * \| \| \|	Move profile parts of the rooms page and the config content into a new page: ↵	Emmanuel ROHEE	2014-08-22	8	-201/+237
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	settings
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1	Erik Johnston	2014-08-22	4	-49/+95
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Move the 'Upgrade' section to just below the 'Installation' section	Erik Johnston	2014-08-22	1	-6/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update the README.rst to refer people to UPGRADE.rst	Erik Johnston	2014-08-22	1	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Rename files to .rst for consistency.	Erik Johnston	2014-08-22	2	-0/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a missing '='	Erik Johnston	2014-08-22	1	-1/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add CHANGES and UPGRADE files.	Erik Johnston	2014-08-22	2	-0/+43
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Don't return state event outlier's when paginating.	Erik Johnston	2014-08-22	3	-2/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add a database-prepare-for-0.0.1.sh	Erik Johnston	2014-08-22	1	-0/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Add database-prepare-for-0.0.1.sh that should be run before starting a ↵	Erik Johnston	2014-08-22	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	v0.0.1 homeserver.
\| * \| \| \| \| \|	Bump versions to 0.0.1	Erik Johnston	2014-08-22	3	-1/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Allow people to specify database location in database-save.sh	Erik Johnston	2014-08-22	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Check if the membership message was for the room we were in before updating ↵	Erik Johnston	2014-08-22	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the membership list
\| * \| \| \| \| \|	Keep track of people's presence and query that when we update the members list.	Erik Johnston	2014-08-22	2	-3/+10
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Reinitialize room when creating a RoomController so that we start off with a ↵	Erik Johnston	2014-08-22	2	-1/+13
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	clean slate, as it expects/
\| * \| \| \| \|	Use $location.url instead of $location.path to get clean page URL without ↵	Emmanuel ROHEE	2014-08-22	4	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hash arguments of the previous page. This happpens with room URL like http://127.0.0.1:8080/matrix/client/#/room/#public:localhost. The second hash part is transferred to the next page when using $location.path.
\| * \| \| \| \|	Make the content repo work with in daemon mode. Return the full url on ↵	Erik Johnston	2014-08-22	3	-9/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	upload. Update the webclient to use new content repo api.
\| * \| \| \| \|	resizeImage: generate an image in the format of the original image. (Tested ↵	Emmanuel ROHEE	2014-08-22	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with tranparent PNG, transparent GIF, BMP, JPEG)
\| * \| \| \| \|	Safari needs the img.onload event before actually working on the img	Emmanuel ROHEE	2014-08-22	2	-27/+39
\| \| \| \| \| \|
\| * \| \| \| \|	homeserver runs webclient by default now	Matthew Hodgson	2014-08-22	1	-8/+3
\| \| \| \| \| \|
\| * \| \| \| \|	improve leftBlock css	Matthew Hodgson	2014-08-22	1	-1/+6
\| \| \| \| \| \|
\| * \| \| \| \|	-w is no more	Matthew Hodgson	2014-08-22	1	-2/+1
\| \| \| \| \| \|
\| * \| \| \| \|	fix mainInput retaining focus between sending consecutive messages by ↵	Matthew Hodgson	2014-08-22	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disabling commit 955662d6
\| * \| \| \| \|	fix weird fontsizes on iOS	Matthew Hodgson	2014-08-22	1	-0/+1
\| \| \| \| \| \|
\| * \| \| \| \|	sacrifice a goat or two to make wordwrap actually work properly	Matthew Hodgson	2014-08-22	2	-28/+21
\| \| \| \| \| \|
\| * \| \| \| \|	rename autoComplete directive as tabComplete to avoid confusion with the ↵	Matthew Hodgson	2014-08-22	1	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	autocomplete html attribute
\| * \| \| \| \|	add fixme pointing out name disambiguation is a bit flakey	Matthew Hodgson	2014-08-22	1	-1/+4
\| \| \| \| \| \|
\| * \| \| \| \|	host a webclient by default	Matthew Hodgson	2014-08-21	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	actually display room metadata based on m.room.membe events	Matthew Hodgson	2014-08-21	3	-2/+23
\| \| \| \| \| \|
\| * \| \| \| \|	Add a var.	Erik Johnston	2014-08-21	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Only start event streaming after having set up the controllers.	Erik Johnston	2014-08-21	6	-5/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Add ts field to all events.	Erik Johnston	2014-08-21	2	-2/+7
\| \| \| \| \| \|
\| * \| \| \| \|	Change webclient to always hit the im sync api before streaming so we get ↵	Erik Johnston	2014-08-21	2	-7/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	current presence state
\| * \| \| \| \|	Change IM sync api to also return the current presence list.	Erik Johnston	2014-08-21	2	-6/+23
\| \| \| \| \| \|
\| * \| \| \| \|	stop hammering the HS for displayname and avatar URLs	Matthew Hodgson	2014-08-21	1	-3/+5
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.0.1	Erik Johnston	2014-08-21	6	-38/+294
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Use the new 'inviter' key from im sync for room display names.	Erik Johnston	2014-08-21	2	-3/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Fixed first pagination detection	Emmanuel ROHEE	2014-08-21	1	-2/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	cheer up erik and remove the double-horizontal-border between adjacent text ↵	Matthew Hodgson	2014-08-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plinths
\| * \| \| \| \| \|	In the initial sync api, return the inviter for rooms in the 'invited' state	Erik Johnston	2014-08-21	1	-0/+4
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Return the current state in the initial sync api.	Erik Johnston	2014-08-21	1	-0/+3
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Stop internal keys from getting into SynapseEvents	Erik Johnston	2014-08-21	2	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Wait for getting a Join in response to an invite/join dance.	Erik Johnston	2014-08-21	2	-2/+28
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
\| \| \| \| \| *	Removed member list servlet: now using generic state paths.	Kegan Dougal	2014-08-26	9	-106/+53
\| \| \| \| \| \|
\| \| \| \| \| *	Impl: /rooms/roomid/state/eventtype/state_key - Renamed RoomTopicRestServlet ↵	Kegan Dougal	2014-08-22	2	-20/+43
\| \| \| \| \|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	to RoomStateEventRestServlet. Support generic state event sending.
\| \| \| * \|	Updater command line client to new IS API	David Baker	2014-08-22	1	-25/+37
\| \| \| \| \|
\| \| \| * \|	Update web client to use new IS API.	David Baker	2014-08-22	3	-24/+58
\| \| \|/ /
\| \| * \|	Show image fullscreen when clicking on the thumbnail	Emmanuel ROHEE	2014-08-21	2	-3/+31
\| \| \| \|
\| \| * \|	If there are available, show image thumbnails in the messages list	Emmanuel ROHEE	2014-08-21	1	-3/+7
\| \| \| \|
\| \| * \|	Generate thumbnail client side and send its URL and info with the image ↵	Emmanuel ROHEE	2014-08-21	3	-28/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	message body
\| \| * \|	Made uploadContent compatible for sending Blob objects	Emmanuel ROHEE	2014-08-21	1	-4/+22
\| \| \| \|
\| \| * \|	Added resizeImage()	Emmanuel ROHEE	2014-08-21	1	-1/+86
\| \|/ /
* \| \|	fix a few pyflakes errors	Mark Haines	2014-08-26	2	-7/+6
\| \| \|
* \| \|	Move the event storage into a single transaction	Mark Haines	2014-08-26	6	-48/+60
\| \| \|
* \| \|	Take a snapshot of the state of the room before performing updates	Mark Haines	2014-08-22	6	-58/+162
\|/ /
* \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-08-21	4	-0/+415
\|\\|
\| *	Added final jsfiddle: an example app demonstrating most of the c2s api.	Kegan Dougal	2014-08-20	4	-0/+415
\| \|
* \|	Make event stream storage return all membership events about the user, ↵	Erik Johnston	2014-08-20	1	-4/+6
\| \| \| \| \| \| \| \|	regardless of if they were in the room or not.
* \|	Quick fix to support array of room aliases	Emmanuel ROHEE	2014-08-20	1	-2/+3
\| \|
* \|	BF: Apply image place holder only if the image message has the height ↵	Emmanuel ROHEE	2014-08-20	1	-1/+1
\| \| \| \| \| \| \| \|	information
* \|	BF: Wait for the room_id being resolved before starting pagination	Emmanuel ROHEE	2014-08-20	1	-2/+2
\| \|
* \|	Use the "collect_presencelike_data" distributor signal instead of ↵	Paul "LeoNerd" Evans	2014-08-20	2	-30/+4
\| \| \| \| \| \| \| \|	re-implementing its behaviour
* \|	Fix exception name in _fill_out_join_content() exception	Paul "LeoNerd" Evans	2014-08-20	1	-1/+3
\| \|
* \|	Define __copy__ and __deepcopy__ as identity functions on ↵	Paul "LeoNerd" Evans	2014-08-20	1	-0/+8
\| \| \| \| \| \| \| \|	DomainSpecificString, so that copy.deepcopy() will work on them
* \|	Kill the "_homeserver_" injected messages for room membership changes	Paul "LeoNerd" Evans	2014-08-20	2	-58/+6
\| \|
* \|	Create a placeholder for each image of the chat thread. The height of this ↵	Emmanuel ROHEE	2014-08-20	1	-1/+4
\| \| \| \| \| \| \| \|	placeholder is the height of the image so that the scroller position will not be disrupted when the image will be actually loaded and displayed in its full height
* \|	Send images with their imageInfo (size, mymetype, width & height)	Emmanuel ROHEE	2014-08-20	5	-17/+89
\| \|
* \|	Sanitize message text content only if the type of current message in the ↵	Emmanuel ROHEE	2014-08-20	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|	ng-repeat loop is "text" In case of image message, the body can be a JSON object (ImageInfo) and ngSanitize does not like that (ie it generates exception in the console)
* \|	Give the event_id of the failed event	Erik Johnston	2014-08-20	1	-1/+4
\| \|
* \|	Fix test. get_joined_hosts_for_room get's called multiple times	Erik Johnston	2014-08-20	1	-3/+5
\| \|
* \|	Fix federation test, since we now hit store.get_room	Erik Johnston	2014-08-20	1	-1/+2
\| \|
* \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-08-20	6	-0/+375
\|\\|
\| *	Added more jsfiddles.	Kegan Dougal	2014-08-20	6	-0/+375
\| \|
* \|	Better handle the edge cases of trying to remote join rooms	Erik Johnston	2014-08-20	2	-37/+88
\| \|
* \|	Replaced the image URL text input by a file selector button: "Send Image"	Emmanuel ROHEE	2014-08-20	2	-18/+5
\| \|
* \|	Disabled sending buttons while a message is being sent. Useful on bad ↵	Emmanuel ROHEE	2014-08-20	2	-6/+18
\| \| \| \| \| \| \| \|	Internet connection.
* \|	Don't generate room membership messages. Include previous state of in ↵	Erik Johnston	2014-08-20	2	-8/+16
\| \| \| \| \| \| \| \|	membership messages.
* \|	Merge branch 'master' of github.com:matrix-org/synapse into develop	Erik Johnston	2014-08-20	10	-171/+415
\|\\|
\| *	File organisation sanity: put directives and filters into dedicated files	Emmanuel ROHEE	2014-08-20	6	-197/+254
\| \|
\| *	Add some static fiddles for now (will migrate to github paths eventually)	Kegan Dougal	2014-08-19	1	-1/+5
\| \|
\| *	More fiddles, more fun!	Kegan Dougal	2014-08-19	3	-0/+156
\| \|
\| *	keepScroll: a directive to anchor the scroller position at the bottom when ↵	Emmanuel ROHEE	2014-08-19	1	-0/+27
\| \| \| \| \| \| \| \|	the browser is resizing
* \|	Only hit get_room_events_stream if we have a valid user_id	Erik Johnston	2014-08-19	1	-0/+3
\| \|
* \|	Fix token to correct format	Erik Johnston	2014-08-19	1	-1/+1
\| \|
* \|	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	Erik Johnston	2014-08-19	7	-8/+100
\|\\|
\| *	Added registration/login jsfiddle, formatted so it can be loaded directly ↵	Kegan Dougal	2014-08-19	4	-1/+98
\| \| \| \| \| \| \| \|	from jsfiddle. Requires jQuery 1.8.3
\| *	BF: The enter key in the image URL box called sendImage() with no argument	Emmanuel ROHEE	2014-08-19	1	-1/+1
\| \|
\| *	Cleaned dead code	Emmanuel ROHEE	2014-08-19	1	-3/+1
\| \|
\| *	Don't delete OFFLINE users from the presence cache, so we can report on ↵	Paul "LeoNerd" Evans	2014-08-19	1	-3/+0
\| \| \| \| \| \| \| \|	their offline mtime
* \|	Remove debug logging from token parsing funcs.	Erik Johnston	2014-08-19	1	-2/+0
\| \|
* \|	Add comment about what strorage.stream does	Erik Johnston	2014-08-19	1	-0/+20
\| \|
* \|	Don't expect a reflection from events stream	Erik Johnston	2014-08-19	1	-3/+1
\| \|
* \|	Update tests	Erik Johnston	2014-08-19	2	-12/+5
\| \|
* \|	Default from param to 'END'	Erik Johnston	2014-08-19	1	-0/+1
\| \|
* \|	PresenceStreamData was expecting *_key to be ints	Erik Johnston	2014-08-19	1	-0/+3
\| \|
* \|	Fix typo in merge conflict	Erik Johnston	2014-08-19	1	-2/+0
\| \|
* \|	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	Erik Johnston	2014-08-19	29	-391/+1256
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/rest/test_presence.py tests/rest/test_rooms.py tests/utils.py
\| *	Proofing	Kegan Dougal	2014-08-19	1	-19/+20
\| \|
\| *	Rewrite of PresenceHandler test to ensure it covers the interaction with ↵	Paul "LeoNerd" Evans	2014-08-19	1	-149/+279
\| \| \| \| \| \| \| \|	Federation as well
\| *	Ensure that federation's .send_edu() returns a Deferred	Paul "LeoNerd" Evans	2014-08-19	1	-0/+1
\| \|
\| *	Add a DeferredMockCallable; like mock's MockCallable but allows awaiting	Paul "LeoNerd" Evans	2014-08-19	1	-0/+41
\| \| \| \| \| \| \| \|	on method calls to be made later
\| *	More formatting, more clarity.	Kegan Dougal	2014-08-19	1	-23/+38
\| \|
\| *	rst formatting, section heading intro blurbs.	Kegan Dougal	2014-08-19	1	-18/+35
\| \|
\| *	Added top level TODO and a bit more info on storing the 'end' token.	Kegan Dougal	2014-08-19	1	-1/+9
\| \|
\| *	Added a first cut for a 'how to' on the client-server API.	Kegan Dougal	2014-08-19	1	-0/+244
\| \|
\| *	More unquotes. Also, don't return the room_id on membership state changes, ↵	Kegan Dougal	2014-08-19	1	-6/+8
\| \| \| \| \| \| \| \|	they already know it.
\| *	Unquote sender IDs.	Kegan Dougal	2014-08-19	1	-2/+2
\| \|
\| *	Perform the 'REST'-level tests of Presence against the real Presence handler ↵	Paul "LeoNerd" Evans	2014-08-19	2	-41/+93
\| \| \| \| \| \| \| \|	as well, mocking out the datastore beneath it