62750 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	1901fdf889	oops, bogus commit	2015-09-22 22:57:27 +02:00
David Baker	b11abae8e8	More fixing up of paths, requires etc	2015-09-22 19:09:23 +01:00
David Baker	7e72ee891a	More fixing up of vector skin	2015-09-22 18:49:04 +01:00
David Baker	40594fc5fa	Fix up controller requires	2015-09-22 18:17:19 +01:00
David Baker	dd4cfb25f8	Replace symlinks	2015-09-22 18:06:43 +01:00
David Baker	148dbc23ed	Rename base skin to vector	2015-09-22 18:05:55 +01:00
David Baker	682392d02a	Move skins dir to src	2015-09-22 18:05:31 +01:00
David Baker	09b81f46b0	Remove controllers that all come from react-sdk	2015-09-22 17:20:22 +01:00
David Baker	96627d4477	Port membertile fix	2015-09-22 16:51:16 +01:00
David Baker	3838569625	Port memberlist branch fixes	2015-09-22 16:37:39 +01:00
David Baker	2f0df6d37e	Merge branch 'master' into reactsdk-unfork	2015-09-22 15:28:50 +01:00
David Baker	616b4fe0f1	Merge pull request #175 from vector-im/matthew/userlist ... Reskin the userlist as per the design	2015-09-22 15:27:21 +01:00
David Baker	b32658cfd0	Load fewer events when switching to a room: they take surprisingly long to render.	2015-09-22 15:18:16 +01:00
Matthew Hodgson	ef3603cd1a	oops, rogue debugging stmt	2015-09-22 01:25:58 +02:00
Matthew Hodgson	61c94d63e7	make the new userlist UI actually work	2015-09-22 01:16:45 +02:00
Matthew Hodgson	260e22186b	WIP at turning MemberInfo into a ContextualMenu	2015-09-21 19:23:04 +02:00
Matthew Hodgson	048260bb1b	WIP at turning MemberInfo into a ContextualMenu	2015-09-21 19:22:29 +02:00
David Baker	a545007a19	Merge branch 'master' into reactsdk-unfork	2015-09-21 18:08:58 +01:00
David Baker	980ce7fdae	Remainder of the controllers from vector	2015-09-21 17:23:51 +01:00
David Baker	49c5f7cb95	Use same protocol as client was loaded over for recaptcha to prevent JS origin errors.	2015-09-21 16:53:50 +01:00
David Baker	1b82d92fa1	Port registration fixes	2015-09-21 16:38:12 +01:00
David Baker	65498600de	port login fixes	2015-09-21 16:36:17 +01:00
David Baker	28c4a648be	Port roomlist fixes	2015-09-21 16:31:31 +01:00
David Baker	e2c9afb278	port create room	2015-09-21 16:28:39 +01:00
David Baker	29d2ed7191	Merge userselector changes	2015-09-21 16:17:29 +01:00
David Baker	82aa603596	Merge in resend support	2015-09-21 16:14:19 +01:00
Matthew Hodgson	56c5f6f46e	clarify deployment	2015-09-19 20:17:45 +01:00
David Baker	a8eb93bd6f	Member list	2015-09-18 18:39:16 +01:00
David Baker	31ee667102	Room header	2015-09-18 14:34:36 +01:00
David Baker	b9538a077c	Missed files from last commit	2015-09-18 13:54:20 +01:00
David Baker	343de6245f	Port ServerConfig changes	2015-09-18 13:33:51 +01:00
David Baker	08b5888d03	More porting: make sending messages work again!	2015-09-18 10:44:57 +01:00
David Baker	81db1b2360	Merge pull request #160 from vector-im/conferencing ... Add conferencing support	2015-09-18 10:03:02 +01:00
David Baker	abeed92501	Partial porting over of vector controller logic to react sdk.	2015-09-17 18:23:38 +01:00
David Baker	6eb18f0268	Fix reskindex	2015-09-17 18:21:35 +01:00
David Baker	d938ba70d3	Port over room leaving	2015-09-17 12:10:01 +01:00
Kegan Dougal	240d5502fe	Add a FIXME explaining the situation around alternative FS ASes	2015-09-17 11:47:42 +01:00
Kegan Dougal	7a50166dc6	Move the 'thumbnail' video to the top-left of the screen ... This was originally laid out at the MatrixChat level which could then be CSSified, but Matthew suggests this looks a lot better being at the RoomList level above recents. Move the rendering logic to RoomList.	2015-09-17 11:37:56 +01:00
Kegan Dougal	9c8b540d14	Actually add the doc	2015-09-17 11:06:50 +01:00
Kegan Dougal	e991beb900	Add conferencing doc	2015-09-17 11:06:08 +01:00
David Baker	88aaf82c88	Backport: linkify emotes	2015-09-16 16:23:35 +01:00
David Baker	f3b30477ce	Backport: add other presets into room presets	2015-09-16 16:10:39 +01:00
David Baker	a4cbbf0d92	Backport Notifier improvements from Vector, including TextForEvent	2015-09-16 14:48:49 +01:00
David Baker	25ab56106a	Backport labels & placeholders for Editable text from Vector	2015-09-16 14:18:25 +01:00
David Baker	f1120562f3	Random console log	2015-09-16 14:14:21 +01:00
David Baker	901574b56e	Update package.json	2015-09-16 14:13:16 +01:00
David Baker	6cca5f4c05	backport fixes from vector	2015-09-16 13:48:24 +01:00
David Baker	fe586f6a36	Merge branch 'master' into reactsdk-unfork	2015-09-16 10:49:04 +01:00
Matthew Hodgson	01d3f2f119	implement /part, /j, and error rather than pass-through unrecognised commands	2015-09-16 01:09:32 +01:00
Matthew Hodgson	0aec086ebb	actually link to blog etc from the login page	2015-09-15 17:06:04 +01:00