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

1024 Commits (70b69eb31ee7f123688afde6ced6529d79d7bc6e)

Author SHA1 Message Date
rtmkrlv 70b69eb31e
Merge branch 'master' into russian-locale 2018-01-06 14:59:28 +02:00
rtmkrlv 3fa891e136
Merge branch 'master' into russian-locale 2018-01-06 14:54:46 +02:00
rtmkrlv 6f7a9f3295 Updated Russian translation 
Added translation of new strings and small corrections
 2018-01-06 14:45:30 +02:00
Laurent Cozic 8e8793943b
Update README.md 2018-01-06 10:19:50 +01:00
Laurent Cozic 83d9faf2fe
Create PULL_REQUEST_TEMPLATE 2018-01-06 10:17:14 +01:00
Laurent Cozic f45a4fff8b Mobile: Fixes #136, fixes #137: styling issues on E2EE 2018-01-06 10:06:41 +01:00
Laurent Cozic 1e02aa3120 Update website 2018-01-05 21:38:37 +01:00
Laurent Cozic 77fec75f23 CLI v0.10.86 2018-01-05 21:02:23 +01:00
Laurent Cozic 2c9feae20b Merge branch 'master' of github.com:laurent22/joplin 2018-01-05 20:52:41 +01:00
Laurent Cozic a81788b3fa Electron release v0.10.41 2018-01-05 20:52:22 +01:00
Laurent Cozic 88cfba53a3
Update CONTRIBUTING.md 2018-01-05 20:50:28 +01:00
Laurent Cozic d659d975cd All: Documentation and minor tweaks for E2EE 2018-01-05 18:40:57 +01:00
rtmkrlv 6ac3b8a8f9
Add files via upload 
Russian localisation for Joplin. 100% done, but some corrections may be required.
 2017-12-16 20:41:04 +02:00
Laurent Cozic 7ab2b11c9d
Update README.md 
Updated list of supported languages
 2017-12-15 10:07:55 +00:00
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