2107 Commits

Author	SHA1	Message	Date
Baptiste Augrain	d4dd74e820	Merge branch 'master' into fix-paste-code	2018-12-13 08:20:36 +01:00
Junyoung Choi	3f77cb2214	Merge pull request #2684 from GuilhermeJSilva/fix/highlight-folder-on-hover ... Dragged note highlighting	2018-12-13 13:59:10 +09:00
Miguel Teixeira	c5de940946	Fixed bug where icon was hidden	2018-12-12 18:19:41 +00:00
Miguel Teixeira	2943c5fafb	Sync with upstream	2018-12-12 18:09:46 +00:00
Duarte-Frazao	62609a2918	Fixed last nonfunctional changes made earlier ... Now iterates in the SnippetNoteDetail constructor the snippets and if linesHighlighted is not defined assigns an empty array	2018-12-08 17:22:57 +00:00
Duarte-Frazao	492294e11d	Reset of linesHighlighted	2018-12-08 12:19:42 +00:00
Duarte-Frazao	f483f8fdf0	Fix so that linesHighlighted defaults to [] when does't find it	2018-12-08 12:07:28 +00:00
Guilherme Silva	4061866042	Moving prevent default	2018-12-08 09:06:55 +00:00
Duarte-Frazao	191295b6de	Added array of linesHighlighted to default snippet ... This makes the default snippet also handle highlight on the lines, because this snippet is created in the code without the normal snippet constructor	2018-12-07 23:41:51 +00:00
Junyoung Choi	d70d3b439f	Merge pull request #2672 from arkist/handle-encoded-uri-on-copyfile ... Handle encoded uri path on `copyFile`	2018-12-07 14:30:35 +09:00
Junyoung Choi	56851eb91f	Merge pull request #2666 from yougotwill/menu_items_overhaul ... Menu items overhaul	2018-12-07 12:41:22 +09:00
Evan Miller	b546b9cbe7	InfoPanel automatically adjusts its width	2018-12-03 17:04:04 -05:00
Evan Miller	dceed7d84d	Fixes exportFolder by making it actually wait for each exportNote	2018-12-03 16:51:59 -05:00
Evan Miller	0a7fd0288c	Use promises for outputFormatter	2018-12-03 16:14:28 -05:00
Evan Miller	c1deeaf5f7	Added PDF error to SnippetNoteDetail	2018-12-03 14:40:52 -05:00
Evan Miller	7c1cd50def	Add structure for exporting PDFs	2018-12-03 13:12:22 -05:00
Junyoung Choi (Sai)	b224c72e98	Merge pull request #2637 from miguelalexbt/master ... Warning when printing snippet	2018-12-03 17:16:50 +09:00
Junyoung Choi (Sai)	6c57ac8f01	Merge pull request #2383 from ehhc/exportMDexportsAttachments ... export folder should also export the attachments -> fixes #2374	2018-12-03 17:15:02 +09:00
Jinwoo Oh	cf35dc5345	Handle encoded uri path on copyFile ... fix #2578	2018-12-03 14:04:13 +09:00
William Grant	5d54ad3342	Cleaned up menu items ordering and separators, added clone note menu item and shortcut, updated focus note shortcut to be mac friendly, made delete note shortcut use either command+backspace or ctrl+backspace and the delete key on windows and linux machines	2018-12-02 15:59:47 +02:00
William Grant	0f5d753910	Removed the old ctrl+d shortcut for deleting a note since we now have the super+shift+backspace shortcut which can be changed in the hotkey settings	2018-12-02 15:21:01 +02:00
Duarte-Frazao	a9442a019f	Changes to pass tests and lint code	2018-11-30 19:20:40 +00:00
Duarte-Frazao	45436f65af	Issue #2469 almost done, missing refactor to reduce calls on code mirror	2018-11-30 18:03:23 +00:00
Guilherme Silva	b8a295713c	Dragged note highlighting	2018-11-30 08:42:27 +00:00
Miguel Teixeira	aa20bc769c	Fixed lock button behaviour and display	2018-11-29 17:06:28 +00:00
Guilherme Silva	9bc291e618	Merge branch 'master' into feature/autoBracketMatching	2018-11-29 11:47:07 +00:00
Baptiste Augrain	900f20f164	handle all dropped images	2018-11-28 15:58:58 +01:00
Baptiste Augrain	c2e4bae9dd	fix regex to correctly match the src attribute when there is a data-src attribute	2018-11-28 15:00:29 +01:00
Miguel Teixeira	a39da481e0	Changed message.	2018-11-28 09:08:58 +00:00
Junyoung Choi (Sai)	830ade9596	Merge pull request #2399 from Pudge601/bug/2241 ... Clear search when a new note is created	2018-11-28 11:36:46 +09:00
Baptiste Augrain	2aa296ff33	fix lint error	2018-11-28 00:45:20 +01:00
Baptiste Augrain	9050035c74	- add option to enable/disable smart paste ... - add shortcut to paste smartly - use electron's clipboard	2018-11-28 00:44:15 +01:00
Miguel Teixeira	c245855bbf	Improved messages.	2018-11-27 20:28:57 +00:00
Miguel Teixeira	ef66e71feb	Solved some errors in identation	2018-11-27 18:02:59 +00:00
Miguel Teixeira	c33058ae2b	Added custom warning messages.	2018-11-27 17:42:04 +00:00
Nguyễn Việt Hưng	629d4a82ae	fixed delete note not navigate to next note	2018-11-27 13:58:06 +07:00
Baptiste Augrain	64f7233bfc	fix regex to match :storage reference, added comment to explain what it does.	2018-11-25 16:58:11 +01:00
Baptiste Augrain	9d81e4be2f	undo change	2018-11-25 16:17:01 +01:00
Baptiste Augrain	0a1ee86baf	Merge branch 'master' into gallery	2018-11-25 16:05:27 +01:00
Baptiste Augrain	2908884202	drag and drop image from browser	2018-11-25 15:56:11 +01:00
Junyoung Choi (Sai)	c7bae93b48	Merge pull request #2601 from yougotwill/zoom_controls ... Zoom Controls	2018-11-25 15:37:29 +09:00
Junyoung Choi (Sai)	938cf238ff	Merge pull request #2604 from arcturus140/fixGUI ... fix GUI style element for default theme	2018-11-25 15:36:17 +09:00
Junyoung Choi (Sai)	f95284622e	Merge pull request #2621 from mehr-licht/master ... included shortcut for Info Panel (issue 2533)	2018-11-25 15:28:25 +09:00
Junyoung Choi (Sai)	b021bb73ed	Merge pull request #2498 from daiyam/create-note-with-tags ... create note with selected tags	2018-11-25 15:23:04 +09:00
Junyoung Choi (Sai)	c76b653737	Merge pull request #2338 from ehhc/spellchecker ... Spellchecker	2018-11-25 15:21:04 +09:00
Miguel Teixeira	3414e2daf0	Added warning when trying to print from InfoPanel	2018-11-22 12:22:49 +00:00
mehr-licht	92e2cd102e	deleted ctr+l and ctrl+t	2018-11-19 19:00:51 +00:00
mehr-licht	101e5d5035	included shortcut for Info Panel	2018-11-18 19:22:05 +00:00
Arcturus	7717cda52a	fix GUI style element for default theme	2018-11-12 20:50:09 +00:00
Baptiste Augrain	c13746f10e	Merge branch 'master' into create-note-with-tags	2018-11-12 19:16:50 +01:00