62750 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Hodgson	731881ee7b	fix language	2015-10-25 12:35:52 +00:00
Matthew Hodgson	e580cb809d	spell out how to set up the deps when developing	2015-10-25 12:33:23 +00:00
Matthew Hodgson	47dca51c38	spell out how to set up the deps when developing	2015-10-25 12:33:13 +00:00
Matthew Hodgson	1ecf0f0183	Merge branch 'develop' of git+ssh://github.com/vector-im/vector-web into matthew/redesign	2015-10-25 11:57:35 +00:00
Matthew Hodgson	5844fb4020	spell out that developers need to use npm link	2015-10-25 11:56:29 +00:00
Matthew Hodgson	8257f325c4	s/getMembersWithMemership/getMembersWithMembership/	2015-10-25 11:51:17 +00:00
Matthew Hodgson	379fed813e	actually use the config file for default HS and IS URLs...	2015-10-25 02:44:57 +00:00
Matthew Hodgson	435a9cd9e4	actually use the config file for default HS and IS URLs...	2015-10-25 02:42:41 +00:00
Matthew Hodgson	8cd6d70c0a	fix voip buttons header	2015-10-25 02:36:27 +00:00
Matthew Hodgson	1d3c821672	improve spacing a bit	2015-10-25 02:26:24 +00:00
Matthew Hodgson	6d6e1366dc	s/Delete/Redact/	2015-10-25 02:13:01 +00:00
Matthew Hodgson	19d272b171	Merge branch 'develop' of git+ssh://github.com/vector-im/vector-web into matthew/redesign	2015-10-25 02:12:35 +00:00
Matthew Hodgson	1188c4c69f	Merge pull request #243 from vector-im/kegan/reg-errors-176 ... Fix #176 Password complexity error message	2015-10-25 02:12:21 +00:00
Matthew Hodgson	88dd135b5a	Merge pull request #241 from vector-im/kegan/redact-messages ... Hook up delete button on contextual menu (#56)	2015-10-25 02:12:11 +00:00
Matthew Hodgson	8ebb8ba427	fix up new message layout	2015-10-25 02:09:16 +00:00
Matthew Hodgson	9c215efcbf	fix up header layout some more	2015-10-25 02:09:06 +00:00
Matthew Hodgson	6e3e0a1447	implement new roomheader	2015-10-25 01:52:28 +00:00
Matthew Hodgson	d16968d528	update badge count in realtime	2015-10-25 01:16:41 +00:00
Matthew Hodgson	28c3787fb3	implement bottom-right call button	2015-10-25 01:03:22 +00:00
Matthew Hodgson	d8bc362a89	fix invites	2015-10-25 00:59:33 +01:00
Matthew Hodgson	13f3548057	fix badge pos	2015-10-24 20:58:00 +01:00
Matthew Hodgson	39871e52df	fix NPE	2015-10-24 20:57:05 +01:00
Matthew Hodgson	0cffd8dd84	sort out files button & NPE	2015-10-24 20:56:27 +01:00
Matthew Hodgson	f4d21f883a	Add on a membership badge	2015-10-24 20:47:48 +01:00
Matthew Hodgson	a74cef0d64	fix stupid typing warnings	2015-10-24 20:28:42 +01:00
Matthew Hodgson	e59bfe16dc	sort out the membership list	2015-10-24 20:19:54 +01:00
Matthew Hodgson	e718cad053	invites section	2015-10-24 02:02:33 +01:00
Matthew Hodgson	b6cac2bc89	Merge branch 'develop' of git+ssh://github.com/vector-im/vector-web into matthew/redesign	2015-10-23 18:03:49 +01:00
Matthew Hodgson	a86861e9b9	make badges work again	2015-10-23 18:03:35 +01:00
Matthew Hodgson	6e2362e8a9	reskin file upload UI	2015-10-23 17:43:40 +01:00
Matthew Hodgson	300005243c	only bold current room if it has unread msgs	2015-10-23 17:43:30 +01:00
David Baker	5392afdec4	Add UI for changing room avatars and update UI when room avatars change	2015-10-23 17:36:02 +01:00
David Baker	5a760b71d0	Make ChangeAvatar support room avatars and tweak RoomAvatar respond to componentWillReceiveProps	2015-10-23 17:34:53 +01:00
David Baker	e844b7aa21	UI to set Room Avatars	2015-10-23 13:47:32 +01:00
Matthew Hodgson	4019e359ca	fix visibility during contextual window	2015-10-23 12:46:08 +01:00
Matthew Hodgson	185efb00fb	new buttons	2015-10-23 12:41:59 +01:00
Matthew Hodgson	d946b39671	stop annoying popping and fix layout of hoverover tile stuff	2015-10-23 12:41:51 +01:00
Matthew Hodgson	c74dc8ef47	slightly prettier source view	2015-10-23 12:41:32 +01:00
Matthew Hodgson	7292a2ced5	kill blue lozenges	2015-10-23 12:40:28 +01:00
Matthew Hodgson	baf777a418	Merge branch 'develop' into matthew/redesign	2015-10-23 11:25:20 +01:00
Matthew Hodgson	11e6cf9757	Merge branch 'develop' into matthew/redesign	2015-10-23 11:22:00 +01:00
Matthew Hodgson	30b2156278	fix typing notifs	2015-10-23 11:19:13 +01:00
David Baker	d66427ddde	Relative-ize paths in webpack config: they're supposed to be relative but sometimes they aren't.	2015-10-23 10:16:00 +01:00
David Baker	f618585bd6	Merge branch 'develop' of github.com:vector-im/vector-web into develop	2015-10-23 09:25:15 +01:00
David Baker	7c6fb36520	Let the tile contents specify whether it requires a sender profile or not. Fixes #250.	2015-10-23 09:24:25 +01:00
Matthew Hodgson	7f65ba506b	WIP of new CSS	2015-10-23 02:39:56 +01:00
Matthew Hodgson	351a94b4a1	oops - wrong branch ... Revert "WIP of new CSS" This reverts commit ad4e3418ff.	2015-10-23 02:38:32 +01:00
Matthew Hodgson	ad4e3418ff	WIP of new CSS	2015-10-23 02:32:49 +01:00
Matthew Hodgson	82affac438	oops, typo	2015-10-22 16:33:53 +01:00
Matthew Hodgson	03dfd57a79	really kill mime types as they are ugly (3rd time lucky)	2015-10-22 16:32:27 +01:00