10793 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Baker	eb497d442b	Merge pull request #2049 from matrix-org/t3chguy/slate_cont2 ... T3chguy/slate cont2	2018-07-16 13:25:27 +01:00
Matthew Hodgson	d7ff7cd4ed	stupid thinkotypo	2018-07-16 12:00:15 +01:00
Michael Telatynski	59a14f2c0b	re-hydrate Values which have been serialized into LocalStorage ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-15 20:34:27 +01:00
Michael Telatynski	7405c5eff2	specify alternate history storage key to prevent conflicts with draft ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-12 16:35:42 +01:00
Michael Telatynski	b4bc09c335	null-guard savedState since now we're accessing its props ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 17:13:33 +01:00
Michael Telatynski	3e05bf19c5	hide autocomplete when moving caret to match existing behaviour ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 16:30:45 +01:00
Michael Telatynski	95909de446	fix MessageComposer not marking translatable strings. run gen-i18n ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 11:39:55 +01:00
Michael Telatynski	c3aef6e3a0	workaround for tommoor/slate-md-serializer#14 ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 10:29:14 +01:00
Michael Telatynski	fd4f9679df	convert md<->rt if the stored editorState was in a different state ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-11 09:43:39 +01:00
Michael Telatynski	abbb69dc36	fix fn call, fixes usage of SlashCommands ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-10 17:35:13 +01:00
Michael Telatynski	100ecfe7ce	remove trailing spaces to make linter happy (no-trailing-spaces) ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-10 10:29:52 +01:00
Michael Telatynski	58301e5dd4	navigateHistory only when at edges of document, to prevent Firefox bug ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-10 10:28:17 +01:00
Matthew Hodgson	51591a4d62	fix lint	2018-07-09 20:49:31 +01:00
Michael Telatynski	8bcb987f50	delint ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 20:14:37 +01:00
Matthew Hodgson	0d0934add7	unbreak modifier+space (e.g. emoji insert on macOS) ... (cherry picked from commit c490f87) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:58:04 +01:00
Matthew Hodgson	021409aafe	apply review feedback from @lukebarnard1 ... (cherry picked from commit 37d4bce) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:54:57 +01:00
Matthew Hodgson	83f2614919	add guide to slate's data formats and how we convert ... (cherry picked from commit e7e4ee8) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:54:10 +01:00
Matthew Hodgson	8665f10f27	pin slate to 0.33.4 to avoid https://github.com/ianstormtaylor/slate/pull/1958 ... (cherry picked from commit 445faca) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:53:47 +01:00
Michael Telatynski	5bd4104c96	modify ComposerHistoryManager ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit d139dd6) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:43:57 +01:00
Michael Telatynski	5b74c615ae	add missing import ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 47b6099) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:42:57 +01:00
Michael Telatynski	43204ea177	fix Control-Backspace after select-all ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 0f32ec0) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:42:10 +01:00
Michael Telatynski	faf17f06c6	remove debugger statement ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit b6f7940) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:36 +01:00
Michael Telatynski	483116fb03	add rule to slate-md-serializer: make underlined and removed work for CM ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit b521efd) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:29 +01:00
Michael Telatynski	372fa29ad3	take edge into consideration when moving focus region on arrow keys ... fixes: >Pressing right when the caret is immediately left of some entity (pill, emojione emoji, etc..) causes the caret to jump to the left of the next entity (or end of the message if there are no more entities) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 0982617) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:20 +01:00
Michael Telatynski	c6837af398	import-type Change from slate ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> (cherry picked from commit 85ed499) Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-09 19:40:00 +01:00
Matthew Hodgson	efdc5430d7	merge develop	2018-07-09 17:50:07 +01:00
Bruno Windels	e61317284b	Merge pull request #2031 from matrix-org/t3chguy/notif_nag_bar ... move nag bar clear statement to any desktop notif toggle not just 0->1	2018-07-09 11:17:15 +01:00
David Baker	1646c3180c	Merge pull request #2041 from matrix-org/t3chguy/improve_devtools_perf ... use TruncatedList to prevent rendering hundreds/thousands of DOM nodes	2018-07-09 10:17:05 +01:00
Michael Telatynski	83a7f126f9	Merge pull request #2047 from matrix-org/hs/fix-server-acl-renderer ... Fix stuff	2018-07-06 20:28:07 +01:00
Will Hunt	6e1f62d16a	Fix stuff	2018-07-06 20:22:37 +01:00
Matthew Hodgson	aa9208d6b4	Merge pull request #2046 from Half-Shot/hs/show-server-bans ... Show m.room.server_acl	2018-07-06 19:17:30 +01:00
Matthew Hodgson	4044185cdd	add space after commas	2018-07-06 19:17:01 +01:00
Will Hunt	83221da7d7	Delint	2018-07-06 16:54:28 +01:00
Will Hunt	9a4075c637	Semicolons	2018-07-06 16:38:04 +01:00
Will Hunt	52b1d946be	Remove unused console.log	2018-07-06 16:37:52 +01:00
Will Hunt	1db803ccfc	"/n" -> " "	2018-07-06 16:37:40 +01:00
Will Hunt	1ca164f1a9	Change all ban message and move further up	2018-07-06 16:36:44 +01:00
Will Hunt	12ce7839f3	Const things	2018-07-06 16:36:26 +01:00
Will Hunt	8b9fd7ddcb	Clean up rules.	2018-07-06 15:31:21 +01:00
Luke Barnard	e6330f3136	Merge pull request #2043 from matrix-org/luke/track-decryption-failures-specific ... Implement aggregation by error type for tracked decryption failures	2018-07-06 11:45:46 +01:00
Will Hunt	526459a9e0	Capitalise	2018-07-06 11:06:31 +01:00
Will Hunt	a6cff4a969	Show server bans in the timeline	2018-07-06 11:06:31 +01:00
Luke Barnard	5af8ddcf10	Fix import	2018-07-06 11:00:39 +01:00
Luke Barnard	15bd2e157f	Test everything	2018-07-05 14:55:29 +01:00
Luke Barnard	d53c836fd7	Implement aggregation by error type for tracked decryption failures	2018-07-05 13:54:44 +01:00
Michael Telatynski	dc6b3cb081	showing all is pretty slow, show an additional 50 instead ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-04 13:07:57 +01:00
Michael Telatynski	e5392e2c00	use TruncatedList to prevent rendering hundreds/thousands of DOM nodes ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>	2018-07-04 12:57:22 +01:00
David Baker	de33cf1afe	Merge pull request #2030 from matrix-org/t3chguy/optional_new_behaviour_roomsublist ... make new hiding of roomsublist behaviour opt-in	2018-07-04 11:42:33 +01:00
Michael Telatynski	168edbca16	Merge branch 'develop' into t3chguy/optional_new_behaviour_roomsublist	2018-07-04 11:21:16 +01:00
David Baker	4b4864abed	Merge pull request #2040 from RiotTranslateBot/weblate-riot-web-matrix-react-sdk ... Update from Weblate.	2018-07-04 11:16:13 +01:00