12100 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	395804ec0d	Update .travis.yml	2017-11-13 17:59:16 +00:00
Laurent Cozic	ba3e357413	Update .travis.yml	2017-11-13 17:22:04 +00:00
Laurent Cozic	63c3636151	Testing	2017-11-13 17:21:49 +00:00
Laurent Cozic	4dc4c6cf26	Update .travis.yml	2017-11-13 16:40:26 +00:00
Laurent Cozic	015c1f6084	Update .travis.yml	2017-11-13 16:09:58 +00:00
Laurent Cozic	9945850aa7	Update .travis.yml	2017-11-13 15:43:46 +00:00
Laurent Cozic	4868adf18a	Update appveyor.yml	2017-11-13 14:44:45 +00:00
Laurent Cozic	e2ad0be555	Added files required for build	2017-11-13 14:44:22 +00:00
Laurent Cozic	8cf4ae6533	Update .travis.yml	2017-11-13 14:40:47 +00:00
Laurent Cozic	a50aacddda	Update appveyor.yml	2017-11-13 14:35:38 +00:00
Laurent Cozic	f38069a47d	Merge branch 'master' of github.com:laurent22/joplin	2017-11-13 14:35:15 +00:00
Laurent Cozic	b5f663de8b	Add locales	2017-11-13 14:35:07 +00:00
Laurent Cozic	4fd62bf7bf	Update .travis.yml	2017-11-13 14:24:08 +00:00
Laurent Cozic	e4ea21271f	Update .travis.yml	2017-11-13 14:08:32 +00:00
Laurent Cozic	57575b7f13	Create .travis.yml	2017-11-13 14:05:49 +00:00
Laurent Cozic	3ef95ee868	test	2017-11-13 13:36:07 +00:00
Laurent Cozic	6149ca575e	Update package.json	2017-11-13 13:20:35 +00:00
Laurent Cozic	7e19f99bbb	Update package.json	2017-11-13 13:14:38 +00:00
Laurent Cozic	96922aa20a	Update appveyor.yml	2017-11-13 13:14:21 +00:00
Laurent Cozic	b68dcaa526	Update appveyor.yml	2017-11-13 12:16:37 +00:00
Laurent Cozic	f4f265b1af	Merge branch 'master' of github.com:laurent22/joplin	2017-11-13 12:16:23 +00:00
Laurent Cozic	e74e717e2a	Trying build	2017-11-13 12:16:10 +00:00
Laurent Cozic	e378e03e5e	Update appveyor.yml	2017-11-13 12:13:17 +00:00
Laurent Cozic	afc42061d5	Testing build	2017-11-13 12:11:40 +00:00
Laurent Cozic	47096edd11	Update appveyor.yml	2017-11-13 12:06:19 +00:00
Laurent Cozic	04a64368c0	Testing appveyor	2017-11-13 12:01:38 +00:00
Laurent Cozic	2bb0b00136	Added app icon and other bug fixes	2017-11-13 17:51:46 +00:00
Laurent Cozic	7177ca21c9	Many changes and improvements	2017-11-13 00:23:12 +00:00
Laurent Cozic	2cf5234e76	Improved fetch with retry on all three platforms	2017-11-12 22:52:54 +00:00
Laurent Cozic	71a97bd45b	Don't allow deleting sync folder	2017-11-12 18:59:54 +00:00
Laurent Cozic	be77f15ef7	Electron: Fixed issue with conflict folder and fixed sync tests	2017-11-12 18:57:59 +00:00
Laurent Cozic	f8bcb56964	Electron: update note in view when sync update note	2017-11-12 18:12:05 +00:00
Laurent Cozic	26d1c0d79d	Electron, Mobile: Fix image width	2017-11-12 17:58:28 +00:00
Laurent Cozic	6e75c93f3c	Electron: styling	2017-11-12 17:53:26 +00:00
Laurent Cozic	6d2a5a7b32	Electron: When deleting tag that is currently selected, select a new tag or folder	2017-11-12 17:37:04 +00:00
Laurent Cozic	f9a06bb5b9	Electron: Save state of editor/viewer toggle	2017-11-12 17:02:20 +00:00
Laurent Cozic	2879e616c1	Electron: Change title when changing screen	2017-11-12 16:47:33 +00:00
Laurent Cozic	e48d2ed64b	Electron: Supports non-image files in notes	2017-11-12 16:33:34 +00:00
Laurent Cozic	6e9e3fc9bd	Added config screen	2017-11-12 00:44:26 +00:00
Laurent Cozic	eda3be066d	Electron app: handle tags	2017-11-11 23:13:14 +00:00
Laurent Cozic	e649670bfe	Added support for enex import	2017-11-11 17:36:47 +00:00
Laurent Cozic	6b3bda2941	Added application menu	2017-11-11 12:00:37 +00:00
Laurent Cozic	61890d99ec	Change dir	2017-11-10 22:27:38 +00:00
Laurent Cozic	49c11fb22e	Allow attaching files in Electron ap	2017-11-10 22:18:00 +00:00
Laurent Cozic	f543015714	Layout and styling	2017-11-10 21:04:53 +00:00
Laurent Cozic	769df5b818	Fixed layout issues	2017-11-10 20:43:44 +00:00
Laurent Cozic	43dff9362a	Created new todo button, and option to switch is_todo	2017-11-10 20:34:36 +00:00
Laurent Cozic	2b1d5ff726	Added title bar and fixed editor scrolling bug	2017-11-10 20:12:38 +00:00
Laurent Cozic	21f50a14c5	Handle todo checkbox from list	2017-11-10 20:11:48 +00:00
Laurent Cozic	00084e398c	Switched to FontAwesome for the icons, and implemented editor/viewer toggle	2017-11-10 19:18:19 +00:00