14913 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
David Baker	6ceaee7fc0	Merge pull request #12 from matrix-org/markjh/cleanup-client-peg ... Move all the calls to createClient inside the MatrixClientPeg	2015-07-20 10:11:24 -07:00
Mark Haines	b66488a783	Fix syntax	2015-07-20 13:48:40 +01:00
Mark Haines	3f5c220993	Move all the calls to createClient inside the MatrixClientPeg	2015-07-20 13:19:47 +01:00
David Baker	e6260987cc	some s/then/done/	2015-07-16 16:53:08 +01:00
David Baker	9b6060a363	Decouple login view & controller	2015-07-16 16:49:40 +01:00
David Baker	64042c9de8	Handle localstorage exceptions.	2015-07-16 16:12:54 +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
David Baker	df790c1b54	Refactor view/controller logic between files, fix syntax & silly bugs.	2015-07-16 12:44:04 +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
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
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
David Baker	e0fae13b76	Merge pull request #2 from matrix-org/create_room ... CreateRoom organism	2015-07-15 10:24:44 +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
David Baker	a7e4a2847e	Start of registration support.	2015-07-13 19:14:02 +01:00
Matthew Hodgson	98baa0cb0a	improve css consistency	2015-07-12 16:36:43 +01:00
Matthew Hodgson	a1ab40064e	fix CSS namespacing	2015-07-12 14:52:37 +01:00
Matthew Hodgson	c4b2530cc0	unbreak the custom app (broken by adding linkify to the underlying app)	2015-07-12 14:27:26 +01:00
Matthew Hodgson	c33899e93a	bump to the same react version as the custom app	2015-07-12 14:26:51 +01:00
Matthew Hodgson	49e687f584	typo	2015-07-12 14:09:53 +01:00
David Baker	63d7ff3ed6	Build the logic too into the same hierarchy as it is unbuilt so it can be used either processed or unprocessed. Does involve having a dir called 'src' in the built products directory, and abusing jsx as a cross-platform version of cp (there is no jsx in the src dir).	2015-07-10 18:09:30 +01:00
David Baker	ed2cc33616	Linkify user IDs and room aliases (to nothing at the moment because we don't have anything to do with them)	2015-07-10 14:37:13 +01:00
David Baker	27d92fa98a	Open files in new window too	2015-07-09 17:45:03 +01:00
David Baker	a00510c1ca	Linkify URLs	2015-07-09 15:41:19 +01:00
David Baker	0daab63b4a	Bad workaround for some join events having no sender	2015-07-09 11:31:58 +01:00
David Baker	b6319fcf50	Add webkit prefixed flex direction too.	2015-07-08 22:12:00 +01:00
David Baker	fa3e8587cc	This never got used in the end	2015-07-08 21:11:48 +01:00
David Baker	12566c0c9c	Separate with space too	2015-07-08 19:57:58 +01:00
David Baker	6a92fdc5e6	Fix file size display	2015-07-08 19:52:44 +01:00
David Baker	03451d8c7d	Sort rooms for prev/next purposes	2015-07-08 19:47:58 +01:00
David Baker	bdfef5eedd	damn you javascript	2015-07-08 18:28:30 +01:00
David Baker	c14886a1ee	rename to mostRecentActivityFirst to disambiguate from sorting by when you joined a room, which this is not.	2015-07-08 18:21:57 +01:00
David Baker	d58fdef362	Order room list by most recent activity	2015-07-08 18:18:03 +01:00
David Baker	a591b66732	Don't barf if no info in m.file content	2015-07-08 16:50:49 +01:00
David Baker	5bed0b7275	typo	2015-07-08 16:32:03 +01:00
David Baker	53e9d030b7	See uploaded files	2015-07-08 16:25:27 +01:00
David Baker	36ecbfc87f	Upload files and images	2015-07-08 14:34:53 +01:00