62750 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Matthew Hodgson	960cc2d6b4	simplify avatar logic slightly	2015-11-30 14:39:42 +00:00
Matthew Hodgson	f947400131	Open Sans	2015-11-30 14:17:33 +00:00
Kegan Dougal	8a98fcd427	Merge branch 'develop' into kegan/controller-merging4	2015-11-30 14:14:41 +00:00
Kegan Dougal	2002af6c7d	Assign a default onFinished call to prevent TypeErrors being thrown.	2015-11-30 14:14:30 +00:00
Kegan Dougal	fd4d7eba12	Remove ErrorDialog and QuestionDialog to react-sdk	2015-11-30 14:11:28 +00:00
Kegan Dougal	fcb6db684b	Move and merge QuestionDialog and ErrorDialog	2015-11-30 14:11:04 +00:00
Matthew Hodgson	8a00e71139	remove spurious Vector layer Avatar helper class	2015-11-30 13:56:53 +00:00
Kegan Dougal	78cfaeb5c3	Merge branch 'develop' into kegan/controller-merging4	2015-11-30 10:56:39 +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
Kegan Dougal	cf6b5461cc	Move and merge CreateRoom	2015-11-30 10:55:15 +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	28b85bb226	remove unnecessary zalgo hacks	2015-11-30 01:12:41 +00:00
Matthew Hodgson	96aa42471d	fix messagecomposer layout when switching between rooms on FF	2015-11-30 01:12:32 +00:00
Matthew Hodgson	ba090a6ad5	only dispatch user_activity event if the mouse actually moves (rather than the DOM moving under the mouse)	2015-11-29 15:39:10 +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	bed7d50ab8	reactor the highlighting code to avoid duplication and make it more coherent	2015-11-29 13:00:58 +00:00
Matthew Hodgson	ca6cdfafd3	clean up spurious whitespace	2015-11-29 13:00:37 +00:00
Matthew Hodgson	c96fa7f15d	fix autoplay on chrome and remove loop for m.video	2015-11-29 12:34:01 +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	d6b188751a	s/autoplay/autoPlay/	2015-11-29 03:25:55 +00:00
Matthew Hodgson	0b483c4707	rename searchTerms to highlights, and support highlighting multiple search terms	2015-11-29 03:22:01 +00:00
Matthew Hodgson	3cc1b1ad82	fix unwanted vertical scrollbar issue and typo	2015-11-29 03:21:21 +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	f028b343b0	HTML and Markdown emotes.	2015-11-28 22:34:45 +00:00
Matthew Hodgson	52376091cb	resize the composer when you change rooms	2015-11-28 22:20:14 +00:00
Matthew Hodgson	9befe243b5	combine M{Text,Notice,Emote}Message into a generic TextualMessage component	2015-11-28 21:12:02 +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	832da3aa8e	support del tags for markdown	2015-11-28 12:44:10 +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
Kegsay	144feb6af9	Merge pull request #39 from matrix-org/kegan/controller-merging3 ... Phase 3 controller merging	2015-11-27 16:17:31 +00:00
Kegan Dougal	07001ae35e	Remove unused files	2015-11-27 16:11:58 +00:00
Kegan Dougal	12f90ba849	Merge branch 'develop' into kegan/controller-merging3	2015-11-27 15:45:10 +00:00
Kegan Dougal	cd216e218c	Merge branch 'develop' into kegan/controller-merging3	2015-11-27 15:44:52 +00:00
Kegsay	471d016a78	Merge pull request #38 from matrix-org/kegan/controller-merging2 ... Phase 2 controller merging (all atoms)	2015-11-27 15:43:58 +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	9950e45b7d	Add required imports	2015-11-27 15:39:52 +00:00
Kegan Dougal	af30ef1f72	Remove unusued imports	2015-11-27 15:39:29 +00:00
Kegan Dougal	5ba1ef5203	Move velocity stuff / contextual menu from Vector to React.	2015-11-27 15:37:40 +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