6966 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	bc80405f13	Merge branch 'master' of github.com:laurent22/joplin	2017-11-15 15:37:41 +00:00
Laurent Cozic	b4b9e285eb	Updated for iOS	2017-11-15 15:37:02 +00:00
Laurent Cozic	35b9835fd5	Exclude build files	2017-11-14 23:05:35 +00:00
Laurent Cozic	11ad6c6bef	Removing need for including build files	2017-11-14 23:01:19 +00:00
Laurent Cozic	c838548831	Unversioning build files	2017-11-14 20:58:40 +00:00
Laurent Cozic	dbb5599b0f	Save window state	2017-11-14 18:02:58 +00:00
Laurent Cozic	bf916d5b9b	Trying auto update	2017-11-14 11:18:15 +00:00
Laurent Cozic	9c610963b2	Trying auto update	2017-11-14 10:54:16 +00:00
Laurent Cozic	7b1e913651	Trying auto update	2017-11-14 10:53:18 +00:00
Laurent Cozic	e8d7050279	Trying auto update	2017-11-14 10:18:18 +00:00
Laurent Cozic	0e01011afc	Trying update	2017-11-13 23:13:40 +00:00
Laurent Cozic	01d3bf8a11	Testing auto update	2017-11-13 23:04:27 +00:00
Laurent Cozic	cfa4da39e5	Added optional dependency 7zip-bin-linux	2017-11-13 22:49:09 +00:00
Laurent Cozic	cf233e8e67	Update .travis.yml	2017-11-13 22:44:41 +00:00
Laurent Cozic	b5f1f87839	Trigger new release	2017-11-13 21:06:31 +00:00
Laurent Cozic	48061457ac	Various tweaks to get prod version to work	2017-11-13 18:47:35 +00:00
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