940 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Emmanuel ROHEE	30bfa911fc	Member event: store use the the latest one	2014-09-10 16:26:11 +02:00
Emmanuel ROHEE	da3f842b8c	Removed wrong comments about recents-controller.js: it uses $rootScope.rooms not $rootScope.events.rooms managed by event-handler-service.js and used by other controllers	2014-09-10 14:53:03 +02:00
Emmanuel ROHEE	130cbdd7af	dedup events: state events conflict with messages events. Do not consider them in deduplication	2014-09-10 14:45:32 +02:00
Emmanuel ROHEE	b099634ba1	Reenabled handle of room states events in initialSync but do not add them to the displayed messages in the room page. ... Show the m.room.member events only when they come from room.messages (from initialSync of pagination) not from room.state.	2014-09-10 14:36:30 +02:00
Emmanuel ROHEE	c2afc6cd0a	Presence events do not have event id. Do not discard them	2014-09-10 13:48:33 +02:00
Emmanuel ROHEE	b63dd9506e	Improved requests: pagination is done from the data received in initialSync	2014-09-10 12:01:00 +02:00
Kegan Dougal	2bd4346075	More rst formatting.	2014-09-09 15:13:50 -07:00
Kegan Dougal	f23e5b17b6	Extra restrictions to make parsing easier.	2014-09-09 15:11:06 -07:00
Kegan Dougal	56a358481e	Tyops	2014-09-09 15:00:48 -07:00
Kegan Dougal	d5704cf2a3	Added initial draft for human-readable ID rules.	2014-09-09 14:53:35 -07:00
Kegan Dougal	550e8f32ac	Move model to client-server for now.	2014-09-09 13:51:13 -07:00
David Baker	f90ce04a83	Hangup call if user denies media access.	2014-09-09 18:21:03 +01:00
David Baker	ccfb42e4ff	Don't try setting up the call if the user has canceled it before allowing permission.	2014-09-09 17:58:26 +01:00
David Baker	25e96f82db	Don't break if you press the hangup button before allowing media permission.	2014-09-09 17:52:01 +01:00
David Baker	253c327252	Don't play an engaged tone if we hang up locally.	2014-09-09 17:38:40 +01:00
Erik Johnston	a75f8686ba	Fix bug where we used an unbound local variable if we ended up rolling back the persist_event transaction	2014-09-09 16:27:59 +01:00
Emmanuel ROHEE	1ef51e7939	Improved room page loading flow: do pagination only when the members list is available. ... Killed an unexpected pagination trigger when the page load: paginateMore	2014-09-09 16:46:30 +02:00
Emmanuel ROHEE	746ed57c0e	When the user has been kicked or banned from a room, remove the room from his recents list	2014-09-09 16:31:50 +02:00
Emmanuel ROHEE	5132fcdb8b	Made recents list display something when joining a room which we do not have state data yet	2014-09-09 16:10:20 +02:00
Emmanuel ROHEE	332986ba43	BF: prevent joined messages to be displayed twice when joining a room. ... Do this by synchronizing the m.room.member joined event from the events stream and the start of the pagination	2014-09-09 16:10:20 +02:00
David Baker	472b4fe48c	make calls work in Firefox	2014-09-09 14:54:06 +01:00
Emmanuel ROHEE	fd2d3fcfd7	Removed historical code: recents does not need to manage presences. It is already done by initialSync in eventStreamService	2014-09-09 12:47:42 +02:00
Emmanuel ROHEE	967ac65586	BF: Made the grey background of the current room cover all the cell width	2014-09-09 12:47:42 +02:00
David Baker	16b40cbede	Show call invites in the message table	2014-09-09 11:45:36 +01:00
Kegan Dougal	75890d7bdd	CSS tweakage	2014-09-08 19:02:23 -07:00
Kegan Dougal	e8f19b4c0d	Display a 'Set Topic' button if there is no topic or it's a 0-len string.	2014-09-08 18:59:26 -07:00
Kegan Dougal	6bdb23449a	Add ability to set topic by double-clicking on the topic text then hitting enter.	2014-09-08 18:40:34 -07:00
Kegan Dougal	f64cc237fc	Fixed bug which displayed an older room topic because it was being returned from /initialSync messages key. Check the ts of the event before clobbering state.	2014-09-08 17:27:51 -07:00
Kegan Dougal	ef2111099a	long topic is long. CSS support it	2014-09-08 17:19:04 -07:00
Kegan Dougal	df50a6823f	Display public room topics if they exist on the public room list.	2014-09-08 17:14:58 -07:00
Kegan Dougal	324020d5fe	Display the room topic in the room, underneath the name of the room.	2014-09-08 15:36:52 -07:00
Kegan Dougal	544691ab05	Update jsfiddles to have more helpful error messages when there is no connection when logging in.	2014-09-08 14:54:10 -07:00
Erik Johnston	5236de5b03	Add slightly helpful advice on how to generate config if you don'y already have one	2014-09-08 22:52:50 +01:00
Erik Johnston	91b370650a	Don't autogen config in synctl for the same reasons we don't turn of --generate-config by default on the homeserver - it is liable to confuse people who have moved the config file or have chosen a non standard location. ... Also, don't override log file location.	2014-09-08 22:48:46 +01:00
Erik Johnston	e062f2dfa8	Apparently we can't do txn.rollback(), so raise and catch an exception instead.	2014-09-08 22:37:19 +01:00
Kegan Dougal	c1a25756c2	Added demo.details	2014-09-08 14:24:28 -07:00
Kegan Dougal	d692994ea4	Updated jsfiddle links to point to github	2014-09-08 14:16:22 -07:00
Kegan Dougal	a3590dfa26	Bodge to default to '1 users' when you create a room, which is better than blindly assuming a recents controller is writing to rootScope.rooms and setting numUsersInRoom there.	2014-09-08 14:01:34 -07:00
Kegan Dougal	da9b7b0368	Added big massive TODOs on a huge design problem with initial sync	2014-09-08 13:54:09 -07:00
Kegan Dougal	054fad5360	Float right the num users, apply room highlight to user count.	2014-09-08 13:28:55 -07:00
Kegan Dougal	e0954f3b36	Better checks are better.	2014-09-08 12:15:29 -07:00
Kegan Dougal	76fe7d4eba	Added num_joined_users key to /publicRooms for each room. Show this information in the webclient.	2014-09-08 12:15:29 -07:00
Erik Johnston	942d8412c4	Handle the case where we don't have a common ancestor	2014-09-08 20:13:27 +01:00
Kegan Dougal	2eaa199e6a	Added number of users in recent rooms.	2014-09-08 11:55:29 -07:00
Erik Johnston	83ce57302d	Fix bug in state handling where we incorrectly identified a missing pdu. Update tests to catch this case.	2014-09-08 19:50:59 +01:00
Kegan Dougal	de727f854a	Make #matrix public rooms bold to make them stand out from the other public rooms. Ideally this would be metadata in /publicRooms to say something like 'featured channel', but for now, just make it a client side check.	2014-09-08 11:33:12 -07:00
Kegan Dougal	0627366b2f	Sort the public room list by display name.	2014-09-08 11:17:44 -07:00
Erik Johnston	c0577ea87a	Rollback if we try and insert duplicate events	2014-09-08 18:34:18 +01:00
Emmanuel ROHEE	d81e7dc00e	Added /join description	2014-09-08 18:25:56 +02:00
Emmanuel ROHEE	9a5f224931	matrixService.rooms must be renamed matrixService.initialSync now	2014-09-08 18:21:41 +02:00