12205 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Laurent Cozic	1eb1c5914c	Merge branch 'master' of github.com:laurent22/joplin	2017-12-15 08:46:39 +00:00
Laurent Cozic	5780951f7d	Updated translations	2017-12-15 08:46:30 +00:00
Laurent Cozic	67e790e393	Merge pull request #95 from tbroadley/fix-typos ... Fix typos	2017-12-15 07:21:26 +00:00
Thomas Broadley	0d472486ca	Fix typos	2017-12-14 19:10:47 -05:00
Laurent Cozic	2d218904d0	Merge branch 'master' of github.com:laurent22/joplin	2017-12-11 21:20:57 +00:00
Laurent Cozic	c3fbcb8feb	Update website	2017-12-11 21:20:49 +00:00
Laurent Cozic	64031ac6cf	Merge pull request #40 from Cogitri/german-locale ... WIP: Add German (Germany) locale	2017-12-11 20:43:07 +00:00
Laurent Cozic	caae7f7cf8	CLI v0.10.83	2017-12-11 20:12:41 +00:00
Laurent Cozic	d56b247adf	Electron release v0.10.39	2017-12-11 20:09:38 +00:00
Laurent Cozic	11bdfbde61	Fixed Readme typo	2017-12-10 16:44:43 +00:00
Laurent Cozic	a59bf55c16	Electron: Fixes #3: Paths with '.' would cause JSX compilation to fail	2017-12-10 16:06:43 +00:00
Laurent Cozic	043be1916c	CLI: Display welcome message the first time the app is run.	2017-12-10 15:56:12 +00:00
Laurent Cozic	42e34b5c3b	All: Fixes #87: Show warningn when deleting notebook that contains notes.	2017-12-10 14:09:12 +00:00
Laurent Cozic	931083b2e2	Electron: Fixes #86: App icon missing on Linux	2017-12-10 14:04:07 +00:00
Rasmus Thomsen	09b9df4228	German locale: adjust articulation	2017-12-07 16:02:18 +01:00
Laurent Cozic	37663bd110	Merge pull request #68 from dbinary/master ... adding translate spanish Latin America	2017-12-06 23:59:22 +00:00
Laurent Cozic	f01c6aa8d1	Merge branch 'master' of github.com:laurent22/joplin	2017-12-06 23:56:18 +00:00
Laurent Cozic	8838017830	All: Updated translations	2017-12-06 23:55:22 +00:00
Laurent Cozic	1d6fb8058f	Update BUILD.md	2017-12-06 23:34:56 +00:00
Laurent Cozic	bb51729bea	Update BUILD.md	2017-12-06 23:34:31 +00:00
Laurent Cozic	507e7e6014	All: Improved ENEX import for web pages that have been saved as notes	2017-12-06 19:29:58 +00:00
Laurent Cozic	f42908b11c	Merge branch 'sync-limits'	2017-12-05 17:30:16 +00:00
Laurent Cozic	03ec406627	All: Filter to sync target and refactored so that same code can be used by all clients	2017-12-05 19:21:01 +00:00
Laurent Cozic	c703521b6c	All: Handling of unsyncable items	2017-12-05 18:56:39 +00:00
Laurent Cozic	cf97bf9a77	Updated readme	2017-12-05 08:47:48 +00:00
Laurent Cozic	304b9a582f	Electron release v0.10.36	2017-12-04 23:57:30 +00:00
Laurent Cozic	4d5c4b1743	Electron: started unsynchronisable items UI	2017-12-04 23:57:13 +00:00
Laurent Cozic	4abe5d07c4	All: Handling of impossible-to-sync items (such as when they are over the size limit of the cloud provider)	2017-12-04 23:38:09 +00:00
Laurent Cozic	f6633e23f5	Minor tweaks	2017-12-04 23:01:22 +00:00
Laurent Cozic	a6d6201ecb	All: Improved synchronisation process and saving of models so that reducer can deal with full objects	2017-12-04 22:58:42 +00:00
Laurent Cozic	0115e74163	All: Minor tweaks regarding encryption	2017-12-04 19:29:34 +00:00
Luis Pérez	4314c392f6	adding translate spanish Latin America	2017-12-04 13:24:55 -06:00
Laurent Cozic	685f541bb4	All: Fixed issue with local resource needlessly marked as encrypted	2017-12-04 19:15:14 +00:00
Laurent Cozic	f9634ea283	CLI: Added e2ee command to check encryption status of a sync target	2017-12-04 19:01:56 +00:00
Laurent Cozic	6252a4d8c8	Merge branch 'master' into encryption	2018-01-03 20:23:26 +01:00
Laurent Cozic	d13d7bec45	Minor changes	2018-01-03 20:20:16 +01:00
Laurent Cozic	74e284d795	Merge branch 'master' of github.com:laurent22/joplin	2018-01-03 00:17:39 +01:00
Laurent Cozic	7b82dacbf2	Update website	2018-01-03 00:17:31 +01:00
Laurent Cozic	f82162f94a	Create CONTRIBUTING.md ... Started "contributing" guide	2018-01-02 22:04:41 +01:00
Laurent Cozic	e2d5128624	Update README.md ... More information on how to import notes into Joplin	2018-01-02 21:51:18 +01:00
Laurent Cozic	9074412472	Merge pull request #128 from tanrax/master ... Update README with Importing from Standard Notes	2018-01-02 21:46:13 +01:00
Laurent Cozic	0db9c66317	Electron release v0.10.40	2018-01-02 21:28:56 +01:00
Laurent Cozic	b22211fada	All: Updated translations. Added Japanese and Chinese.	2018-01-02 21:27:38 +01:00
Laurent Cozic	7efeaa3a22	All: Fixed minor issue when logger not defined	2018-01-02 21:23:35 +01:00
Laurent Cozic	79efac2f71	Merge pull request #130 from SamuelBlickle/master ... Improved german translation	2018-01-02 21:22:27 +01:00
Laurent Cozic	9d7b7092f5	Merge pull request #132 from kcrt/master ... Japanese localization	2018-01-02 21:22:14 +01:00
Laurent Cozic	71e877d369	All: Improved encryption and synchronisation	2018-01-02 20:17:14 +01:00
TAKAHASHI Kyohei	7e086a7730	Japanese localization	2018-01-02 14:17:39 +09:00
SamuelBlickle	3f810c71b0	improved german translations	2018-01-01 13:41:02 +01:00
Laurent Cozic	500fbc5294	Merge branch 'master' into encryption	2017-12-31 15:26:16 +01:00