26580 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	25ab56106a	Backport labels & placeholders for Editable text from Vector	2015-09-16 14:18:25 +01:00
David Baker	6cca5f4c05	backport fixes from vector	2015-09-16 13:48:24 +01:00
David Baker	aba4c1e9af	We don't use catw here anymore	2015-09-15 14:46:41 +01:00
David Baker	2d0c8ac9ff	Working skin stuff, minus css	2015-09-15 13:34:36 +01:00
David Baker	f3b9f8c799	WIP reworking of skinning and app integration process	2015-09-11 15:42:11 +01:00
David Baker	9b73d6ed6d	react-tools is dead. Long live Babel.	2015-09-10 15:28:30 +01:00
David Baker	a06e1f23ea	Spurious react-loader require	2015-09-10 15:08:26 +01:00
David Baker	635041470f	There is no MatrixChat in the sdk anymore (well, only a controller). Advertise the Component Broker instead.	2015-09-10 15:07:34 +01:00
David Baker	a124e53a9a	Component broker loading files never really worked very well anyway, and now it can't work because they're all defined elsewhere.	2015-09-10 15:06:42 +01:00
David Baker	6cc88e4ef3	Remove stuff that's going into the base skin	2015-09-09 16:57:55 +01:00
David Baker	e1a6ede17b	Ignore all module caches and make the built js the default include root	2015-09-08 18:45:00 +01:00
David Baker	8fbce5fce8	de-tab	2015-09-08 16:17:06 +01:00
David Baker	2d9419c380	Merge pull request #17 from ndarilek/master ... Make HTML more semantic to improve accessibility	2015-08-10 13:45:36 +01:00
Nolan Darilek	bd0db01515	Add landmarks around major view regions for easier navigation.	2015-08-08 18:09:37 -05:00
Nolan Darilek	517bb01f33	Event tiles are now items in a list, improves accessibility.	2015-08-08 17:36:19 -05:00
David Baker	ec8a815688	Ignore olm. There is no olm.	2015-08-07 11:51:13 +01:00
David Baker	5a87b9759f	update to new js-sdk	2015-08-07 11:27:13 +01:00
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