1170 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erik Johnston	1e6c5b205c	Fix bug where we didn't correctly pull out the event_id of the deletion	2014-09-24 13:29:20 +01:00
Erik Johnston	4e79b09dd9	Fill out the prune_event method.	2014-09-24 11:37:14 +01:00
Erik Johnston	3d2cca6762	Fix test.	2014-09-24 11:17:43 +01:00
Erik Johnston	4354590a69	Add v4 deltas to current sql.	2014-09-24 11:06:41 +01:00
Erik Johnston	efea61dc50	Rename 'pruned' to 'pruned_because'	2014-09-23 17:40:58 +01:00
Erik Johnston	bc250a6afa	SYN-12: Implement auth for deletion by adding a 'delete_level' on the ops levels event ... SYN-12 # comment Auth has been added.	2014-09-23 17:36:24 +01:00
Erik Johnston	932b376b4e	Add prune_event method	2014-09-23 15:37:32 +01:00
Erik Johnston	b99f6eb904	Make sure we don't persist the 'pruned' key	2014-09-23 15:29:27 +01:00
Erik Johnston	78af6bbb98	Add m.room.deletion. If an event is deleted it will be returned to clients 'pruned', i.e. all client specified keys will be removed.	2014-09-23 15:28:32 +01:00
Erik Johnston	231afe464a	Add a deletions table	2014-09-22 13:42:52 +01:00
Erik Johnston	e68dc04900	Merge branch 'master' of github.com:matrix-org/synapse into develop	2014-09-22 13:02:47 +01:00
David Baker	4696622b0a	Propagate failure reason to the other party.	2014-09-22 11:44:15 +01:00
David Baker	83ea3c96ec	Better logging of ICE candidates and fail the call when ICE fails.	2014-09-22 10:55:01 +01:00
Kegan Dougal	333e63156e	Fixed unit test; it all actually works. Added a README for running the tests with karma/jasmine.	2014-09-22 10:27:03 +01:00
Matthew Hodgson	a0c3da17b4	go back to the original behaviour of only notifying if we think the app is backgrounded or idle...	2014-09-20 01:40:29 +01:00
Matthew Hodgson	4c7a1abd39	remove insanely busy logging which is killing CPU	2014-09-20 01:14:01 +01:00
Matthew Hodgson	9fda37158a	remove the ng-model attribute from mainInput textarea to stop the digest being run every time you press a key (SYWEB-4)	2014-09-20 00:49:45 +01:00
David Baker	648fd2a622	Notify a callee that their browser doesn't support VoIP too. ... SYWEB-14 #resolved	2014-09-19 18:22:14 +01:00
David Baker	99b0c9900e	Move video background element up as it was causing the page to scroll.	2014-09-19 17:40:00 +01:00
David Baker	f6258221c1	Join rooms if we're not already in them when accepting a call coming from that room. ... SYWEB-55 #resolve	2014-09-19 17:23:55 +01:00
Emmanuel ROHEE	68e534777c	SYWEB-32: made all input/textearea inherit the font of their parent	2014-09-19 18:00:16 +02:00
David Baker	29686f63ac	Fix the "is webrtc supported" titles on buttons and make the video / voice call buttons appear in multi-user rooms but be greyed out with approriate titles.	2014-09-19 16:52:45 +01:00
Erik Johnston	dcc1965bfe	Test that prev_content get's added if there is a prev_state key (in the event stream).	2014-09-19 16:44:16 +01:00
David Baker	03ac0c91ae	Merge branch 'videocalls' into develop ... Conflicts: webclient/room/room.html	2014-09-19 16:26:46 +01:00
Emmanuel ROHEE	709b8ac2b7	SYWEB-13 SYWEB-14: disabled "Call" button if the browser does not support all required WebRTC features	2014-09-19 17:20:33 +02:00
Emmanuel ROHEE	e9670fd144	SYWEB-13: disabled "Send image" button if the browser does not support HTML5 file API	2014-09-19 17:20:33 +02:00
Emmanuel ROHEE	f9688d7519	SYWEB-13: Do not start the app if the browser does not support WEBStorage. ... Internet Explorer case: Launch the app only for versions 9 and higher.	2014-09-19 17:20:33 +02:00
David Baker	da8b5a5367	First working version of UI chrome for video calls.	2014-09-19 16:18:15 +01:00
Erik Johnston	28bcd01e8d	SYN-47: Fix bug where we still returned events for rooms we had left. ... SYN-47 #resolve	2014-09-19 14:45:21 +01:00
Kegan Dougal	fba67ef951	Small formatting fixes	2014-09-19 14:19:02 +01:00
Kegan Dougal	3fa01be9e4	formatting	2014-09-19 12:04:26 +01:00
David Baker	270825ab2a	Fix undefined variable error	2014-09-19 11:41:49 +01:00
Emmanuel ROHEE	008515c844	A kind of the typo in the fix of SYWEB-44	2014-09-19 09:25:51 +02:00
Emmanuel ROHEE	301ef1bdc6	Room id leaks: log them when then happens. Plus log the conditions that made them happen	2014-09-19 09:17:18 +02:00
Emmanuel ROHEE	cf1e167034	Fixed SYWEB-16: When sending an invite over federation, the remote user sees the name of the resulting invite room as *their* name rather than the inviters	2014-09-19 09:07:16 +02:00
Erik Johnston	beed1ba089	Merge branch 'develop' of github.com:matrix-org/synapse	2014-09-18 18:25:23 +01:00
Matthew Hodgson	2ab7e23790	fix SYWEB-41 (hopefully)	2014-09-18 18:18:30 +01:00
Emmanuel ROHEE	0dac2f7a8d	Fixed missing component dependency which created a crash	2014-09-18 19:12:21 +02:00
Kegan Dougal	6a6a718898	Added test directory, karma conf, and angular-mocks. Expect it to work? Pah, not yet.	2014-09-18 17:59:15 +01:00
Emmanuel ROHEE	faec6f7f31	Oops. Removed dev logs	2014-09-18 17:48:20 +02:00
Emmanuel ROHEE	26dda48e50	SYWEB-14: BF: rooms invitations were not visible in recents after launching/refreshing the web page	2014-09-18 17:34:26 +02:00
Erik Johnston	3108accdee	Remove lie from change log.	2014-09-18 16:31:18 +01:00
Erik Johnston	e0f060d89b	Merge branch 'master' of github.com:matrix-org/synapse into develop	2014-09-18 16:22:14 +01:00
Erik Johnston	380852b58e	Bump Changelog and version	2014-09-18 16:20:53 +01:00
Kegan Dougal	3dea0d2806	undefined is empty. Fixed bug where empty bingWords with old accounts which hadn't logged in didn't send notifications.	2014-09-18 16:17:29 +01:00
David Baker	0505014152	add unprefixed filter css as well	2014-09-18 16:15:48 +01:00
David Baker	3bd8cbc62f	Prettier and stabler video with basic support for viewing mode. For now, transition into 'large' mode is disabled.	2014-09-18 15:51:30 +01:00
Matthew Hodgson	d583aaa0c3	fix wordwrap	2014-09-18 15:25:25 +01:00
Matthew Hodgson	3a7375f15e	fix binger description	2014-09-18 15:25:11 +01:00
Erik Johnston	79a5fb469b	Merge branch 'master' of github.com:matrix-org/synapse into develop	2014-09-18 14:52:19 +01:00