18766 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	8c69eff14c	improve infinite scrolling so it keeps paginating until you have a scrollbar (if it can)	2014-08-16 22:05:31 +01:00
Matthew Hodgson	f1d140eea8	remove log spam	2014-08-16 22:02:52 +01:00
Matthew Hodgson	fe25e65f3f	disambiguate identical displaynames	2014-08-16 20:48:05 +01:00
Matthew Hodgson	e4770bb039	make presence timestamps less verbose	2014-08-16 13:30:34 +01:00
Matthew Hodgson	dc6212b6fb	roll back b602834 as it made a bizarre subset of avatars go awol	2014-08-16 13:28:04 +01:00
Matthew Hodgson	ce4ca473cb	order the members list by most recently active	2014-08-16 13:23:16 +01:00
Matthew Hodgson	b60283473a	don't hammer a new hit for every displayname and avatar_url when we already have them in the members list...	2014-08-16 13:23:15 +01:00
Matthew Hodgson	98ed3d0222	improve comment	2014-08-16 01:52:03 +01:00
Matthew Hodgson	00e8be516a	merge weirdness	2014-08-16 01:48:44 +01:00
Matthew Hodgson	fc846aa771	emergency bodges to turn off presence ACLs in order to make ... matrix.org:8080 actually work	2014-08-16 01:47:17 +01:00
Matthew Hodgson	0f9b633af7	retcols is mandatory. i have no idea how this could ever have worked?	2014-08-16 01:46:35 +01:00
Matthew Hodgson	207ef144c5	display mtime_age in webclient	2014-08-16 01:07:23 +01:00
Matthew Hodgson	4068339770	slightly hacky but more functional infinite scrolling	2014-08-16 00:14:47 +01:00
Matthew Hodgson	9f7c5f161c	switch some elements from being styled by class to styled by id	2014-08-15 23:24:42 +01:00
Kegan Dougal	60a9f27edb	Formatting	2014-08-15 17:58:51 +01:00
Erik Johnston	7f5c7ddea9	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-15 17:50:27 +01:00
Kegan Dougal	0e6a2f87f9	Get presence for members when you enter a room (it was coming down but wasn't being stored in the right place)	2014-08-15 17:47:45 +01:00
Erik Johnston	f5fca6f787	Fix some of the tests to reflect changes in the storage layer.	2014-08-15 17:42:21 +01:00
Kegan Dougal	5b817ecd44	Added infinite scrolling. It's sliiiightly buggy in that it jumps down the list a bit, but it is overall working pretty well. Added ng-infinite-scroll-matrix.js and jquery-1.8.3 as deps.	2014-08-15 17:42:11 +01:00
Kegan Dougal	02e45da895	When new invites come down, update the My Rooms list. Added hacks to make the display name a bit nicer (/im/sync needs to return room aliases / membership events better)	2014-08-15 17:42:11 +01:00
Paul "LeoNerd" Evans	1731781145	Document that /rooms/:room_id/members/list yields profile and presence information about room members	2014-08-15 17:24:02 +01:00
Paul "LeoNerd" Evans	9c41f635a9	When starting to poll for presence, also include members of all shared rooms	2014-08-15 17:12:07 +01:00
Erik Johnston	40c020ad13	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor	2014-08-15 16:48:16 +01:00
Paul "LeoNerd" Evans	ec1fd20e59	Also include users' presence when responding to /rooms/:room_id/members/list	2014-08-15 16:47:50 +01:00
Erik Johnston	0e938b1ff7	Rename method name to not clash with other ones in storage.	2014-08-15 16:47:48 +01:00
Erik Johnston	6efc688917	Fix typo of key name	2014-08-15 16:47:26 +01:00
Erik Johnston	506711749f	We no longer need to special case room config events.	2014-08-15 16:45:16 +01:00
Erik Johnston	a17b371384	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: synapse/storage/roommember.py	2014-08-15 16:21:13 +01:00
Erik Johnston	d260a42ca2	PEP8 cleanups	2014-08-15 16:17:36 +01:00
Erik Johnston	8fa3cc37f9	Comment.	2014-08-15 16:11:25 +01:00
Erik Johnston	19946509a4	Support generic events.	2014-08-15 16:06:08 +01:00
Erik Johnston	cd2967d271	Fix bug when generating a key when get_room_events_stream returned zero rows	2014-08-15 16:05:46 +01:00
Erik Johnston	86be66c34e	Actually use MAX_STREAM_SIZE constant.	2014-08-15 16:04:54 +01:00
Erik Johnston	8d1f763209	Fix pagination to work with new db schema	2014-08-15 15:53:06 +01:00
Paul "LeoNerd" Evans	3c532314ec	Fix imsync's SELECT query to only find the rooms I'm actually joined in, not every room I have ever joined	2014-08-15 15:44:53 +01:00
Erik Johnston	01f089d9fb	Correctly return new token when returning events. Serialize events correctly.	2014-08-15 15:28:54 +01:00
Paul "LeoNerd" Evans	5c88e57555	Create a room-nuking script as it's useful for emergency debugging	2014-08-15 15:06:43 +01:00
Kegan Dougal	5ac87292c4	Remove old polling stuff from RoomController. Added service comments. Do not start the event stream on startup unless you have credentials.	2014-08-15 14:06:56 +01:00
Kegan Dougal	7ddb7a5cbb	Event streaming now happens on an app level, rather than a per-room level. Make eventStreamService manage it's own repolling provided no one calls stop() on it. Couple the stream with eventHandlerService so any controller can just blithely call eventStreamService.resume() and expect to 'get stuff' without having to handle promises (though resume() still returns a promise for that request and proxies it through $q). Kill and reset the stream if you logout.	2014-08-15 14:06:56 +01:00
Kegan Dougal	c51cf4efca	Store messages in $rootScope so they can be accessed from multiple controllers without duplicated storage for each. This also gives updates.	2014-08-15 14:06:56 +01:00
Kegan Dougal	5dbceaf5a4	Added event handler service which.. handles events. More specifically, it $broadcasts events depending on their type, and does processing on events (shuffling keys, adding events to $rootScope so displays will automatically update, sending delivery receipts, and so on). Some of this logic was previously contained in the RoomController, which fails the moment you add >1 room into the mix, hence requiring a Service to handle events, rather than having each individual controller maintain their part of the world.	2014-08-15 14:06:56 +01:00
Kegan Dougal	8bf3994c2e	Added event stream service which neatly blobs together requests / state for the event stream. This depends on matrix service to do the actual hit. Currently this has exactly the same behaviour as before.	2014-08-15 14:06:56 +01:00
Erik Johnston	114984a236	Start chagning the events stream to work with the new DB schema	2014-08-15 13:58:28 +01:00
Erik Johnston	d72f897f07	Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor ... Conflicts: synapse/storage/stream.py	2014-08-15 11:50:14 +01:00
Erik Johnston	c5f2da5875	Add a check to make sure that during state conflict res we only request a PDU we don't have.	2014-08-15 11:47:01 +01:00
Erik Johnston	1a26905cc9	Fix pontenial bug in state resolution handler that compared dicts rather than their id's	2014-08-15 11:41:20 +01:00
Paul "LeoNerd" Evans	33d62c2c66	Remember to reflect membership LEAVE events to the leaving member so they know it happened	2014-08-15 11:40:58 +01:00
Erik Johnston	5002efa31b	Reimplement the get public rooms api to work with new DB schema	2014-08-15 10:26:35 +01:00
Kegan Dougal	286e90e58f	Updated README about -w in all the places.	2014-08-15 09:29:39 +01:00
Matthew Hodgson	0b179db36d	s/Synapse/Matrix/	2014-08-14 18:58:40 +01:00