189 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Erik Johnston	c708976635	Wire up CreateRoom to UI.	2015-07-16 13:49:34 +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
Erik Johnston	ca593b8544	Remove commented out code	2015-07-16 10:39:58 +01:00
Erik Johnston	5d99abf18c	Correctly pull in client version from package.json	2015-07-16 10:38:00 +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
David Baker	931a4f29c8	Argh, accidentally committed again	2015-07-16 09:57:14 +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
Erik Johnston	1b4358624f	Add a basic modal dialog implementation	2015-07-16 09:37:14 +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
David Baker	23d9cee299	didn't mean to commit that	2015-07-15 19:30:10 +01:00
David Baker	4756427e61	First cut working regisatration	2015-07-15 19:25:36 +01:00
Erik Johnston	2b81f46030	Add placeHolder prop for EditableText	2015-07-15 15:04:39 +01:00
Erik Johnston	dfd54f3b95	Basic structure of user settings	2015-07-15 15:04:24 +01:00
Erik Johnston	844a883ad8	Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector	2015-07-15 13:59:24 +01:00
David Baker	fe98d6ec69	Merge pull request #3 from matrix-org/editable_text ... Add an editable text atom	2015-07-15 13:58:26 +01:00
Erik Johnston	5cd92229eb	Add an editable text atom	2015-07-15 13:55:43 +01:00
Erik Johnston	2fc08aeb12	Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector	2015-07-15 10:36:47 +01:00
David Baker	e0fae13b76	Merge pull request #2 from matrix-org/create_room ... CreateRoom organism	2015-07-15 10:24:44 +01:00
Matthew Hodgson	c69606df44	oops	2015-07-15 04:29:30 +01:00
Matthew Hodgson	8db6c17220	fix header	2015-07-15 04:26:25 +01:00
Matthew Hodgson	b739e7be9e	fix avatar spacing	2015-07-15 04:21:32 +01:00
Matthew Hodgson	ce38d4ea12	moar graphics	2015-07-15 04:16:51 +01:00
Matthew Hodgson	9b384e52b5	implement latest skin	2015-07-15 04:16:38 +01:00
Matthew Hodgson	c0bd574997	improve padding on membership list	2015-07-15 00:36:54 +01:00
Matthew Hodgson	9a51cace34	fix bad membership list horizontal scrolling	2015-07-15 00:31:47 +01:00
David Baker	03d048c06f	Get as far as requesting a token	2015-07-14 19:39:18 +01:00
David Baker	aacc31b2ce	Registration works with recaptcha	2015-07-14 18:46:15 +01:00
Erik Johnston	4f7dcdf566	Naming conventions	2015-07-14 17:52:13 +01:00
Erik Johnston	bb06b752b4	Document CreateRoom phases	2015-07-14 17:40:49 +01:00
Erik Johnston	c4764af9a2	Add phases to CreateRoom organism	2015-07-14 17:27:22 +01:00
Erik Johnston	a077abfb99	Remove console.log	2015-07-14 17:04:44 +01:00
Erik Johnston	03b715b8bf	Add onRoomCreated callback to CreateRoom organism	2015-07-14 17:01:06 +01:00
Erik Johnston	a748c090fb	Move all element specific code into skins/	2015-07-14 16:59:11 +01:00
Erik Johnston	b53e710d20	Add invite selection to create room dialog	2015-07-14 16:53:49 +01:00
Erik Johnston	ed52cdf6df	Add basic CreateRoom organism. Supports setting room name and selecting preset	2015-07-14 15:17:49 +01:00
Matthew Hodgson	77e76972f0	avatars for joins & parts	2015-07-14 14:31:13 +01:00
Matthew Hodgson	dff9353339	tabs->spaces everywhere; sorry folks - \!blame sublime	2015-07-14 12:11:01 +01:00
Matthew Hodgson	69d1844773	fix NPE for invites	2015-07-14 12:10:15 +01:00
Matthew Hodgson	6b0167375c	badges and broken avatars	2015-07-14 02:13:00 +01:00
Matthew Hodgson	341fe868e4	group messages together from the same user	2015-07-14 00:25:51 +01:00
David Baker	a7e4a2847e	Start of registration support.	2015-07-13 19:14:02 +01:00
Matthew Hodgson	a5d24329c2	https for google fonts	2015-07-13 17:01:35 +01:00
Matthew Hodgson	10b3f250ec	make it work in safari	2015-07-13 14:56:58 +01:00