13999 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	28dcfb2f12	make it work on ff	2015-07-17 00:12:53 +01:00
David Baker	0f39ec580f	Slightly improve error messages	2015-07-16 22:06:00 +01:00
David Baker	8ccce4d702	Make new login style work	2015-07-16 21:46:39 +01:00
David Baker	d08c47a328	Fix npe	2015-07-16 21:45:59 +01:00
David Baker	cfbef0177e	Fix custom server or registration & do some of new login UI	2015-07-16 19:30:27 +01:00
David Baker	8feeb93215	Merge pull request #10 from matrix-org/editable_room_name ... Make room name editable	2015-07-16 19:29:49 +01:00
Kegan Dougal	1126769686	Merge branch 'vector' into irc-style-commands	2015-07-16 18:08:30 +01:00
Erik Johnston	789e70f2d6	Remove old atoms	2015-07-16 18:07:28 +01:00
Erik Johnston	df999fb2f8	Remove deleted atoms	2015-07-16 18:03:29 +01:00
Kegan Dougal	d4a98b3850	Show correct membership messages for ban/unban.	2015-07-16 17:57:57 +01:00
Erik Johnston	ce3dab3c5b	Make room name editable	2015-07-16 17:42:33 +01:00
Kegan Dougal	91943d8a45	Merge branch 'vector' into irc-style-commands	2015-07-16 17:41:30 +01:00
Kegan Dougal	9aa66c1d8b	Add SlashCommands to functionally process /commands.	2015-07-16 17:41:12 +01:00
David Baker	03733e6a0f	Merge pull request #9 from matrix-org/create_room ... Wire in create room.	2015-07-16 17:37:48 +01:00
Kegan Dougal	59ca26ee93	Use target not sender when displaying member text.	2015-07-16 17:37:35 +01:00
Erik Johnston	98160c3947	Add ability to remove people from invite list	2015-07-16 17:30:10 +01:00
Erik Johnston	68d60aadd1	Make Presets stateless	2015-07-16 17:24:33 +01:00
Erik Johnston	aa1b763518	Make CreateRoom remember what the values of its fields were. Remove some fairly pointless atoms	2015-07-16 17:20:03 +01:00
David Baker	75f8363be0	Merge branch 'master' into vector	2015-07-16 16:53:27 +01:00
David Baker	e6260987cc	some s/then/done/	2015-07-16 16:53:08 +01:00
David Baker	3a6423dd0a	Merge branch 'master' into vector	2015-07-16 16:52:19 +01:00
David Baker	9b6060a363	Decouple login view & controller	2015-07-16 16:49:40 +01:00
Kegan Dougal	6b81022e28	Move position of incoming call buttons.	2015-07-16 16:32:21 +01:00
Erik Johnston	47f4c0dfff	Use Loader	2015-07-16 16:20:00 +01:00
Erik Johnston	ebedf0b907	Add comment about RoomAlias magic	2015-07-16 16:17:29 +01:00
Erik Johnston	95968bf619	Make server_name magix in RoomAlias optional	2015-07-16 16:14:55 +01:00
David Baker	50edc619af	Merge branch 'master' into vector	2015-07-16 16:13:24 +01:00
David Baker	64042c9de8	Handle localstorage exceptions.	2015-07-16 16:12:54 +01:00
David Baker	ebe6072225	Make this a done so it doesn't swallow exceptions	2015-07-16 16:04:31 +01:00
Erik Johnston	cd26d1323f	Wire together checkboxes and presets and use new /createRoom api	2015-07-16 15:55:46 +01:00
David Baker	155dd74a6f	Merge pull request #8 from matrix-org/message-history-arrow-keys ... Implement sent message history (up/down keys).	2015-07-16 15:41:57 +01:00
Kegan Dougal	b043889169	Implement sent message history (up/down keys). ... This includes preserving and restoring partially entered text per room. This is mostly ported straight from Angular.	2015-07-16 15:22:46 +01:00
David Baker	1677a3bf3a	text change	2015-07-16 15:16:26 +01:00
David Baker	dac94d2293	mplement custom registration screen	2015-07-16 15:16:26 +01:00
David Baker	41bab56133	Merge pull request #7 from matrix-org/nick-completion ... Implement nick completion (tab-complete).	2015-07-16 14:52:46 +01:00
Kegan Dougal	42c9766203	s/did/will/	2015-07-16 14:39:15 +01:00
Kegan Dougal	6fbb7d7da4	Implement nick completion (tab-complete). ... Including SHIFT+TAB to go backwards and the 'blink' css (which may need to be factored out of the view). Mostly ported from Angular.	2015-07-16 14:25:57 +01:00
David Baker	cf38b8a5bb	Merge branch 'master' into vector	2015-07-16 14:19:50 +01:00
David Baker	a6df6ca29b	Don't forget form values on error	2015-07-16 14:19:13 +01:00
David Baker	7aa4d50560	Handle registration errors.	2015-07-16 14:08:52 +01:00
Erik Johnston	c708976635	Wire up CreateRoom to UI.	2015-07-16 13:49:34 +01:00
Kegan Dougal	0a3a3dac1a	Display call logs in the UI. ... Display placed/incoming calls, answers and hangups.	2015-07-16 13:30:14 +01:00
Kegan Dougal	c4379e4827	Remove 'status' from payload; unused.	2015-07-16 12:57:59 +01:00
David Baker	41f659db4c	Merge branch 'master' into vector	2015-07-16 12:44:42 +01:00
David Baker	df790c1b54	Refactor view/controller logic between files, fix syntax & silly bugs.	2015-07-16 12:44:04 +01:00
David Baker	a6f857e9d8	Merge pull request #6 from matrix-org/voip ... VoIP addition	2015-07-16 12:31:36 +01:00
Kegan Dougal	5f3721f471	Tidying up	2015-07-16 11:54:53 +01:00
Kegan Dougal	c056bdf104	Only allow calls to be placed if there are 2 joined members.	2015-07-16 11:34:39 +01:00
Kegan Dougal	50f9d34211	Only display video elements in video calls.	2015-07-16 11:30:34 +01:00
Kegan Dougal	eedd437ca7	Minimal CSS bodge so the video actually dies when the call ends.	2015-07-16 11:21:43 +01:00