1033 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kegsay	819b80d30f	Merge pull request #450 from vector-im/kegan/vector-components ... Move remaining Vector-only components to src/components	2015-12-01 15:58:55 +00:00
Kegan Dougal	8083e7f118	Move vector-only components to src/components.	2015-12-01 15:45:38 +00:00
Kegan Dougal	e07c03a7bb	Merge branch 'develop' into kegan/vector-components	2015-12-01 15:39:02 +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	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
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
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
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	4e7aa78ed7	Move RoomList to react-sdk. Inject a ConferenceHandler.	2015-11-30 16:56:05 +00:00
Kegan Dougal	e792ebb837	Move and merge UserSettings to react-sdk	2015-11-30 15:53:13 +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
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	cb30cbb09a	Remove MemberList and put it in react-sdk	2015-11-30 15:14:04 +00:00
Kegan Dougal	2b37e5334a	Remove Notifier and put it in react-sdk	2015-11-30 15:05:00 +00:00
Matthew Hodgson	f947400131	Open Sans	2015-11-30 14:17:33 +00:00
Kegan Dougal	fd4d7eba12	Remove ErrorDialog and QuestionDialog to react-sdk	2015-11-30 14:11:28 +00:00
Matthew Hodgson	8a00e71139	remove spurious Vector layer Avatar helper class	2015-11-30 13:56:53 +00:00
Kegan Dougal	83b3702769	Merge branch 'develop' into kegan/controller-merging4	2015-11-30 10:56:14 +00:00
Kegan Dougal	450b2d4d67	Move CreateRoom to react-sdk	2015-11-30 10:55:52 +00:00
Matthew Hodgson	cd040ae0dd	fix zalgo properly! remove ugly regexp hacks for detecting combining diacritics and instead set the right font ordering, as Arial combines nicely with Myriad Pro whilst Helvetica doesn't. (Myriad Pro itself has no combining diacritic characters)	2015-11-30 01:13:59 +00:00
Matthew Hodgson	9a64dc27fc	improve layout for search results, fix syntax highlighting quirks in sublime, and don't crash on zero results	2015-11-29 13:32:13 +00:00
Matthew Hodgson	af6bd53d38	revert 23d45d7f33 and apply a better fix which works for both chrome & FF	2015-11-29 13:18:37 +00:00
Matthew Hodgson	01f0e61d6e	fix search ordering; add room labels; hide input areas if searching	2015-11-29 04:41:17 +00:00
Matthew Hodgson	fc02331cd3	fix CSS for search timestamps	2015-11-29 03:20:19 +00:00
Matthew Hodgson	e43edee9bb	call highlighted search terms highlights, and uphold them if provided by synapse	2015-11-29 03:19:51 +00:00
Matthew Hodgson	8de94d45b1	swim like a salmon and manually update skindex for a generic TextualMessage type	2015-11-28 21:11:37 +00:00
Matthew Hodgson	9e97160c85	fix inline <code/> blocks	2015-11-27 16:20:37 +00:00
Kegsay	8a5828620c	Merge pull request #425 from vector-im/kegan/controller-merging3 ... Phase 3 controller merging	2015-11-27 16:17:39 +00:00
Kegan Dougal	07001ae35e	Remove unused files	2015-11-27 16:11:58 +00:00
Kegan Dougal	cd216e218c	Merge branch 'develop' into kegan/controller-merging3	2015-11-27 15:44:52 +00:00
Kegsay	054836cd50	Merge pull request #421 from vector-im/kegan/controller-merging2 ... Phase 2 controller merging (all atoms)	2015-11-27 15:43:49 +00:00
Kegan Dougal	0ef7c8d16d	Use the right name	2015-11-27 15:43:16 +00:00
Kegan Dougal	af30ef1f72	Remove unusued imports	2015-11-27 15:39:29 +00:00
Kegan Dougal	df86e85492	Move ContextualMenu to React SDK	2015-11-27 15:37:00 +00:00
Kegan Dougal	05c9b44b81	Move velocity stuff to react sdk	2015-11-27 15:34:26 +00:00
Kegan Dougal	0f3ea9f4ce	Merge branch 'develop' into kegan/controller-merging2	2015-11-27 15:01:23 +00:00
Kegan Dougal	a5d00c73b2	Move HtmlUtils to react SDK	2015-11-27 15:01:06 +00:00
Kegsay	f9a5f4b61e	Merge pull request #420 from vector-im/kegan/controller-merging ... Phase 1 controller merging (general structure)	2015-11-27 14:59:38 +00:00
Kegan Dougal	40b974f22d	Move all Event/Message Tiles to React SDK.	2015-11-27 14:35:16 +00:00
Kegan Dougal	f969ccb50c	Move and merge RoomTile/MemberTile to react SDK. Keep DND stuff in vector as RoomDNDView.	2015-11-27 11:52:29 +00:00