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

1494 Commits (bb3307e156d9eb7e5c7e52115cd954a8de7ab516)

Author SHA1 Message Date
Laurent Cozic d6d86f2aff Merge branch 'master' of github.com:laurent22/joplin 2018-03-20 17:37:36 +00:00
Laurent Cozic c71809438b Updated website CSS 2018-03-20 17:36:07 +00:00
Laurent Cozic 3e6e1a0a36
Added badges 2018-03-20 10:24:26 +00:00
Laurent Cozic f590ce4a34 Added Nextcloud logo and intro text 2018-03-19 23:25:55 +00:00
Laurent Cozic 67608e29c8 Electron: Resolves #144, Resolves #311: Highlight search results and search in real time. Associated Ctrl+F with searching. 2018-03-19 23:04:48 +00:00
Laurent Cozic d5c2982093 Merge branch 'master' of github.com:laurent22/joplin 2018-03-18 12:45:59 +00:00
Laurent Cozic 90fad2a3ab Electron: Resolves #307: Use blue colour for sidebar, to be consistent with mobile app and logo 2018-03-18 12:45:39 +00:00
Laurent Cozic bc7c82e3da
Update README.md 2018-03-18 10:16:08 +00:00
Laurent Cozic cb824f7dd7 Android release v1.0.110 2018-03-17 23:55:09 +00:00
Laurent Cozic 32c47a96f1 Electron: Resolves #73: Show modified date next to note in editor 2018-03-17 23:51:15 +00:00
Laurent Cozic 4e3f8893f7 Merge branch 'master' of github.com:laurent22/joplin 2018-03-17 23:00:22 +00:00
Laurent Cozic ca3946689a Mobile: Made tag UI a dialog 2018-03-17 23:00:01 +00:00
Laurent Cozic e2ad2dfcaa
Update CONTRIBUTING.md 2018-03-17 22:23:50 +00:00
Laurent Cozic d6f7893c56 Update readme downloads 2018-03-17 15:28:56 +00:00
Laurent Cozic 8c65a7cc31 Electron release v1.0.78 2018-03-17 15:13:00 +00:00
Laurent Cozic aabb9be7de Mobile: Resolves #285: Create, edit and remove tags from notes 2018-03-16 20:17:52 +00:00
Laurent Cozic 544f93bf22 All: Handle deletion of resources that are not linked to any note 2018-03-16 17:39:44 +00:00
Laurent Cozic f81dbf4a4c CLI v1.0.103 2018-03-16 14:36:09 +00:00
Laurent Cozic fbec8263a3 Electron release v1.0.77 2018-03-16 14:34:10 +00:00
Laurent Cozic 68d77a69e6 Updated translations 2018-03-16 14:33:53 +00:00
Laurent Cozic f2ef2446c6 Merge branch 'master' of github.com:laurent22/joplin 2018-03-16 14:33:16 +00:00
Laurent Cozic 875cb5387a
Merge pull request #306 from tobias-grasse/tobias-grasse-patch-1 
Update de_DE.po
 2018-03-16 14:33:02 +00:00
Laurent Cozic ae9ecdad40 All: Fix database upgrade 2018-03-16 14:32:47 +00:00
Laurent Cozic 86a0e34975
Update faq.md 2018-03-16 14:19:24 +00:00
Laurent Cozic 1141074745
Update faq.md 2018-03-16 14:19:10 +00:00
Tobias Grasse efc46d9989
Update de_DE.po 
Add missing translations, minor corrections for existing translations.
 2018-03-16 12:13:42 +01:00
Laurent Cozic 2b45f745b6 Electron release v1.0.76 2018-03-16 10:12:27 +00:00
Laurent Cozic 37fb81e9b2 Trying to build only master branch 2018-03-16 10:12:23 +00:00
Laurent Cozic 255a4fac93 Electron release v1.0.75 2018-03-16 10:03:47 +00:00
Laurent Cozic 3e3fb88de8 Merge branch 'master' into resource_cleanup 2018-03-16 10:03:05 +00:00
Laurent Cozic e4cf03ae46 Only build master branch 2018-03-16 10:02:58 +00:00
Laurent Cozic 554a3eb10d Electron release v1.0.74 2018-03-16 09:11:25 +00:00
Laurent Cozic 61881b528a Electron: Trying to fix signed executable issue 2018-03-16 09:11:10 +00:00
Laurent Cozic c2507cbc4e CLI v1.0.101 2018-03-16 08:17:27 +00:00
Laurent Cozic ed0f6d165c Android release v1.0.107 2018-03-16 08:10:32 +00:00
Laurent Cozic 8e22d38eb3 Electron release v1.0.73 2018-03-16 08:08:10 +00:00
Laurent Cozic 2599c425c3 Updated translations 2018-03-15 18:15:33 +00:00
Laurent Cozic 0e15821a81 Merge branch 'master' of github.com:laurent22/joplin 2018-03-15 18:10:11 +00:00
Laurent Cozic c1bb51c12b All: Finished service to clean up resources 2018-03-15 18:08:46 +00:00
Laurent Cozic 1532b6d159 All: Made WebDAV options dynamics so that changing username or password doesn't require restarting the app 2018-03-15 17:57:11 +00:00
Laurent Cozic 945018b698 All: Allow deleting and syncing deleted resources 2018-03-15 17:46:54 +00:00
Laurent Cozic df7b981e5e Merge branch 'master' into resource_cleanup 2018-03-15 18:19:06 +00:00
Laurent Cozic 4fe495675b
Merge pull request #301 from fmrtn/master 
Updated Spanish translation
 2018-03-15 14:26:28 +00:00
Fernando 7828eef2ad Updated Spanish translation 2018-03-15 15:24:37 +01:00
Laurent Cozic 694f81b75f
Merge pull request #300 from rtmkrlv/master 
Updated Russian translation
 2018-03-15 13:15:09 +00:00
rtmkrlv 8364b6e08d Updated Russian translation 2018-03-15 11:14:04 +02:00
rtmkrlv 3f4328ce9d
Merge pull request #5 from laurent22/master 
Update fork from original repository
 2018-03-15 10:41:44 +02:00
Laurent Cozic 9e0bf1acb2 Mobile: Fixes #299: App freezes when connecting to OneDrive login page while internet connection is down 2018-03-14 23:17:02 +00:00
Laurent Cozic c9e130a771 Merge branch 'master' into resource_cleanup 2018-03-14 17:41:06 +00:00
Laurent Cozic 26331f61e1 Electron: Resolves #298: Removed extraneous first characters from auto-title 2018-03-14 17:37:47 +00:00