62745 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Kegan Dougal	726c893663	Merge branch 'develop' into kegan/vector-components	2015-12-01 15:39:15 +00:00
Kegan Dougal	e07c03a7bb	Merge branch 'develop' into kegan/vector-components	2015-12-01 15:39:02 +00:00
Kegan Dougal	d5819d54db	Fix typos	2015-12-01 15:36:40 +00:00
Kegsay	e7f6e09def	Merge pull request #448 from vector-im/kegan/controller-merging4 ... Phase 4 controller merging	2015-12-01 15:34:25 +00:00
Matthew Hodgson	4fe2cc54d6	Merge pull request #42 from matrix-org/kegan/controller-merging4 ... Phase 4 controller merging	2015-12-01 15:15:39 +00:00
Kegan Dougal	fe16b221f8	s/vector.im/matrix.org/	2015-12-01 13:48:53 +00:00
Matthew Hodgson	075d2b508d	fix highlights on markdown	2015-12-01 13:13:51 +00:00
Kegan Dougal	e55e2bdd0d	Remove unused class	2015-12-01 11:22:19 +00:00
Kegan Dougal	2a025201b1	Move remaining vector molecules to be components in vector (for now)	2015-12-01 11:19:54 +00:00
Kegan Dougal	784c1b63dc	Move remaining vector molecules to components	2015-12-01 11:19:25 +00:00
Matthew Hodgson	f89dcacf07	fix bottomleftmenu layout a bit	2015-12-01 11:11:32 +00:00
Matthew Hodgson	99f47b8601	match design spacing correctly	2015-12-01 11:07:12 +00:00
Matthew Hodgson	1896ab67d1	fix room avatar offset	2015-12-01 11:05:11 +00:00
Matthew Hodgson	2bc3b665d2	Merge pull request #445 from vector-im/matthew/new-font ... switch to Open Sans	2015-12-01 10:59:05 +00:00
David Baker	7f27ffd7bd	Fix typos & variable shadowing from PR comments	2015-12-01 10:26:08 +00:00
David Baker	1de5d68e95	Un-commit accidentally committed file upload stuff	2015-12-01 10:25:35 +00:00
David Baker	1df03aa82a	Remove unintentional logging	2015-12-01 10:20:21 +00:00
Kegan Dougal	1e694da460	Move MatrixChat and login components to react SDK. ... Removed Modulator as it is no longer necessary in this form. ConferenceHandler is injected in src/vector/index.js	2015-11-30 18:11:04 +00:00
Kegan Dougal	8f5f71ec80	Move MatrixChat to react-sdk. Move all login stuff to react SDK. ... Removed Modulator stuff.	2015-11-30 18:10:09 +00:00
David Baker	021056cfd1	Move copyright header	2015-11-30 18:00:54 +00:00
David Baker	4f8895f160	Copyright header on component index	2015-11-30 18:00:19 +00:00
David Baker	6a4038daeb	Add 'replaces' tag to mark that the RoomDNDView is a RoomTile	2015-11-30 17:56:55 +00:00
David Baker	cadfbcbed3	Merge branch 'develop' into skindex-nextgen	2015-11-30 17:56:40 +00:00
David Baker	ae8c5bdcb0	better comment & regenerated index	2015-11-30 17:56:01 +00:00
David Baker	ef0cf1f28e	Merge branch 'develop' into skindex-nextgen	2015-11-30 17:34:40 +00:00
David Baker	730b33535a	More WIP component indexing	2015-11-30 17:33:04 +00:00
David Baker	6f646260aa	WIP of component indexing update	2015-11-30 17:31:32 +00:00
David Baker	4a144ac03d	WIP of new component indexing	2015-11-30 17:30:32 +00:00
Matthew Hodgson	badfdb5e3e	actually, seems FF is happy with this again now	2015-11-30 17:24:38 +00:00
Matthew Hodgson	2345624d31	switch to Open Sans, juggling font-size appropriately (as Open Sans is physically larger for the same point size as Myriad Pro, irritatingly), and fix some really weird baseline CSS bugs in read receipts that were introduced. Hopefully this doesn't re-introduce the intermittent baseline offset bug for the initials on Chrome & FF	2015-11-30 17:17:09 +00:00
Kegan Dougal	ddc4f30bb6	Remove RoomView and port it to react-sdk. Move Resend.js to react-sdk	2015-11-30 17:16:31 +00:00
Kegan Dougal	02a71b20a9	Merge and move RoomView to /structures. Add Resend.js from vector.	2015-11-30 17:15:57 +00:00
Matthew Hodgson	c67005c306	switch avatar initial layout to work with Open Sans	2015-11-30 17:15:02 +00:00
Kegan Dougal	4e7aa78ed7	Move RoomList to react-sdk. Inject a ConferenceHandler.	2015-11-30 16:56:05 +00:00
Kegan Dougal	f9e38e5326	Move and merge RoomList	2015-11-30 16:55:00 +00:00
Kegan Dougal	e792ebb837	Move and merge UserSettings to react-sdk	2015-11-30 15:53:13 +00:00
Kegan Dougal	f96e7a0dc8	Add UserSettings structure	2015-11-30 15:52:41 +00:00
Matthew Hodgson	4409f07c2e	oops, don't try to delete nonexistent tags when moving a room from conversations to favs or similar	2015-11-30 15:49:27 +00:00
Kegan Dougal	b89bd35cad	Merge branch 'develop' into kegan/controller-merging4	2015-11-30 15:42:32 +00:00
Kegan Dougal	03485c2fca	Merge branch 'develop' into kegan/controller-merging4	2015-11-30 15:39:14 +00:00
Matthew Hodgson	59d9b83099	Merge pull request #40 from matrix-org/matthew/rename-message-components ... rename message components as per RL discussion this morning	2015-11-30 15:37:01 +00:00
Matthew Hodgson	4614017b8f	Merge pull request #443 from vector-im/matthew/rename-message-components ... Matthew/rename message components	2015-11-30 15:36:50 +00:00
Matthew Hodgson	7636645efc	rename message components as per RL discussion this morning	2015-11-30 15:25:21 +00:00
Kegan Dougal	bd906cbc69	Move and merge LogoutPrompt to react-sdk	2015-11-30 15:23:37 +00:00
Kegan Dougal	e008b5578d	Move and merge LogoutPrompt	2015-11-30 15:23:16 +00:00
Matthew Hodgson	a8fd1b5d7a	rename message components as per RL discussion this morning	2015-11-30 15:19:43 +00:00
Kegan Dougal	cb30cbb09a	Remove MemberList and put it in react-sdk	2015-11-30 15:14:04 +00:00
Kegan Dougal	80a235adf9	Move and merge MemberList	2015-11-30 15:13:28 +00:00
Kegan Dougal	2b37e5334a	Remove Notifier and put it in react-sdk	2015-11-30 15:05:00 +00:00
Kegan Dougal	945a65f4b5	Move Notifier to src/ since it isn't a component.	2015-11-30 15:04:24 +00:00