1160 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Kegan Dougal	b007edca63	Merge and move RoomHeader/RoomSettings into React SDK	2015-11-27 10:42:25 +00:00
Kegan Dougal	3ce29622ed	Move and merge MemberInfo to React SDK	2015-11-26 17:49:55 +00:00
Kegan Dougal	1a6afc2ef0	Move and merge UserSelector	2015-11-26 17:38:01 +00:00
Kegan Dougal	6dea8e7256	Move and merge MessageComposer	2015-11-26 17:31:37 +00:00
Kegan Dougal	7595071e6a	Move and merge ProgressBar	2015-11-26 17:21:35 +00:00
Kegan Dougal	fdad00790e	Move and merge Change* components to React SDK. Update references.	2015-11-26 17:11:26 +00:00
Kegan Dougal	9ecf5bed64	Nuke old CallView controller	2015-11-26 16:48:32 +00:00
Kegan Dougal	ff9608c914	Move and merge voip molecules. Inject the ConferenceHandler as a prop ... This keeps the vector conf logic munge separate from react SDK.	2015-11-26 16:39:58 +00:00
Kegan Dougal	49e5f18f62	Move and merge create_room atoms to react SDK	2015-11-26 15:43:57 +00:00
Kegan Dougal	c5b0ea7e9f	Move VideoFeed to React SDK	2015-11-26 15:24:32 +00:00
Kegan Dougal	83eae1b64a	Move and merge EditableText into React SDK	2015-11-26 15:15:45 +00:00
Kegan Dougal	35ee9c9ddd	Move and merge EnableNotificationsButton to react SDK	2015-11-26 15:10:49 +00:00
Kegan Dougal	0a8f5b6223	Move ImageView	2015-11-26 14:51:30 +00:00
Kegan Dougal	3f120c7027	Nuke LogoutButton; nothing used it.	2015-11-26 14:47:11 +00:00
Kegan Dougal	343670c5c4	Move MessageTimestamp	2015-11-26 14:38:48 +00:00
Kegan Dougal	f21b6203ed	Merge branch 'kegan/controller-merging' into kegan/controller-merging2	2015-11-26 14:31:31 +00:00
Kegan Dougal	8517f9f2bf	Missed one	2015-11-26 14:29:26 +00:00
Kegan Dougal	3c12191cb7	Move Spinner	2015-11-26 14:25:20 +00:00
Kegan Dougal	ab22ca6a28	Also move the existing login components to the new structure	2015-11-26 14:11:45 +00:00
Kegan Dougal	8898b444af	Point things at the right places	2015-11-26 13:48:37 +00:00
Kegan Dougal	d079617ce2	Nuke MemberAvatar/RoomAvatar; moved to react SDK	2015-11-26 13:25:56 +00:00
Matthew Hodgson	93c67771af	Merge pull request #324 from vector-im/erikj/video ... Add basic m.video view support	2015-11-24 16:06:11 +00:00
Matthew Hodgson	f9040e08ce	fix conflicts	2015-11-24 16:05:58 +00:00
Matthew Hodgson	fd8864d528	STOP PEOPLE SHOUTING	2015-11-22 22:35:34 +00:00
Matthew Hodgson	841c790337	naughty override to stop RoomList panel scrolling horizontally	2015-11-22 15:47:50 +00:00
Matthew Hodgson	324c3e7dcf	override more GFM css	2015-11-22 15:47:10 +00:00