106 Commits

Author	SHA1	Message	Date
Matthew Hodgson	aa70dd7b67	alt tags for avatars; improve header spacing; improve roomview margin	2015-07-17 19:09:27 +01:00
David Baker	5c7bef3107	Add topic changes to timeline by adding a tile that just uses TextForEvent	2015-07-17 18:49:48 +01:00
David Baker	214ef4b4ce	Tidy up profile picture setting & fix notification bug	2015-07-17 17:13:51 +01:00
Matthew Hodgson	7bef6245f7	'ended the call' kinda handles both cancelled and 'hung up'	2015-07-17 17:08:38 +01:00
Kegan Dougal	827e777079	Implement ringing audio. Add other audio tags.	2015-07-17 16:42:26 +01:00
David Baker	ff567faeaa	Profile picture setting and notifdications thereof.	2015-07-17 16:41:46 +01:00
Matthew Hodgson	328d5004d8	it's spelt 'hung up'	2015-07-17 16:15:23 +01:00
David Baker	6a76d8ace8	Update room header when room name changes	2015-07-17 13:48:24 +01:00
David Baker	37108ac56c	Make notifications sensible again and have information once and only once.	2015-07-17 11:57:26 +01:00
David Baker	1b03aa8119	Display nick changes and factor out getting text for events into a common place.	2015-07-17 11:57:26 +01:00
Matthew Hodgson	891ba40114	basic date separator support	2015-07-17 00:12:54 +01:00
Matthew Hodgson	1a95148dae	basic date separator support	2015-07-17 00:12:53 +01:00
Matthew Hodgson	a2ca5f2847	improve badges and room tile layout	2015-07-17 00:12:53 +01:00
David Baker	8ccce4d702	Make new login style work	2015-07-16 21:46:39 +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
Erik Johnston	789e70f2d6	Remove old atoms	2015-07-16 18:07:28 +01:00
Erik Johnston	ce3dab3c5b	Make room name editable	2015-07-16 17:42:33 +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	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	95968bf619	Make server_name magix in RoomAlias optional	2015-07-16 16:14:55 +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	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	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
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	7ffd97b5dc	Implement call FSM. All works.	2015-07-16 11:05:09 +01:00
Erik Johnston	5d9db52b32	I just couldn't help myself	2015-07-16 10:53:51 +01:00
Erik Johnston	f17a9b14c2	Merge branch 'vector' of github.com:matrix-org/matrix-react-sdk into user_settings	2015-07-16 10:46:40 +01:00
Erik Johnston	3555f35737	Check to make sure passwords aren't blank	2015-07-16 10:43:16 +01:00
David Baker	139b92fcd6	Merge branch 'master' into vector	2015-07-16 10:33:53 +01:00
Erik Johnston	02045858f7	Wire up change password	2015-07-16 10:23:31 +01:00
David Baker	e2757b3587	Merge pull request #4 from matrix-org/registration ... Registration	2015-07-16 09:58:53 +01:00
Erik Johnston	edc3302d89	Fix broken RoomView CSS due to name clashes and splitting an element in ... two.	2015-07-16 09:43:05 +01:00
Erik Johnston	bc93aeb50e	Flesh out the user_settings page	2015-07-16 09:37:58 +01:00
David Baker	77114e0081	Improve registration so the container page can pick what URL it's going to route through to registration.	2015-07-15 20:33:12 +01:00