Joplin
/
joplin
mirror of https://github.com/laurent22/joplin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,046 Commits
244 Branches
1,281 Tags
607 MiB
Commit Graph

1046 Commits (eb500cdf9ea095d4c3f61f13b5ee0616a5436c0e)

Author SHA1 Message Date
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
Laurent Cozic 6d0f60d9a1 All: Fixed tests and minor fixes 2017-12-31 15:23:05 +01:00
Laurent Cozic e19c26fdd1 Mobile: Done UI for E2EE 2017-12-31 14:58:50 +01:00
Andros Fenollosa 86b86513d9
Update README with Importing from Standard Notes 2017-12-30 21:37:37 +01:00
Laurent Cozic 6ff19063ef All: Got E2EE working in mobile app 2017-12-30 20:57:34 +01:00
Laurent Cozic 6a75451539
Merge pull request #120 from marcosvega91/fix_undo_note 
Fix #119
 2017-12-29 19:42:48 +01:00
Laurent Cozic 70a33f8533 CLI 0.10.84 2017-12-29 11:17:07 +01:00
Laurent Cozic 23722719f0
Merge pull request #82 from gabcoh/autocomplete 
Added auto complete
 2017-12-29 10:54:38 +01:00
Laurent Cozic d499251206
Update app-gui.js 
Invalidate root after inputting command
 2017-12-29 10:39:50 +01:00
Laurent Cozic d180e7b5e1 Mobile: Handle encrypted items on UI side 2017-12-28 19:57:21 +00:00