Compare commits

..
Author SHA1 Message Date
Laurent Cozic 34ba2b8f9c Android release v1.4.5 2020-11-06 16:52:33 +00:00
Laurent Cozic 8db8bd998e fix script 2020-11-06 16:46:01 +00:00
Laurent Cozic 5e65c27119 fix script 2020-11-06 16:34:28 +00:00
Laurent Cozic ba8d2e207e fix script 2020-11-06 16:24:20 +00:00
Laurent Cozic 25e70024df Release script 2020-11-06 16:22:13 +00:00
Laurent Cozic 24a86e2c12 prepare release 2020-11-06 15:20:07 +00:00
Laurent Cozic 778cfa2dff Tools in dev dep 2020-11-06 14:35:34 +00:00
Laurent Cozic 7e2d512fde Merge branch 'release-1.3' into dev 2020-11-06 12:05:15 +00:00
Laurent Cozic 6b75485a1e Electron release v1.3.18 2020-11-06 11:52:20 +00:00
Laurent Cozic 0cfcc00912 Desktop: Fixes #4049: Keymap editor crash when an invalid command is used 2020-11-06 11:51:36 +00:00
Laurent Cozic 496b19b3f1 Electron release v1.3.17 2020-11-06 10:52:06 +00:00
Laurent Cozic 9618591158 Electron release v1.3.16 2020-11-06 10:51:08 +00:00
Laurent Cozic 55b6394bf3 Desktop: Fixes #4051: Random crash when syncing due to undefined tags 2020-11-06 10:50:44 +00:00
Laurent Cozic 4a1dc2c80e Tools: Need to remove spellfix.dll otherwise it gets signed by CI 2020-11-05 21:12:55 +00:00
Laurent Cozic cb66158b2d Electron release v1.4.6 2020-11-05 21:06:03 +00:00
Laurent Cozic da04d3ce51 Tools: trying a different timestamp server 2020-11-05 21:05:52 +00:00
Laurent Cozic bcbce682d5 Electron release v1.4.5 2020-11-05 20:55:01 +00:00
Laurent Cozic 08f7521e1e Tools: Fixing desktop build 2020-11-05 20:54:51 +00:00
Laurent Cozic 3579e7eab5 Electron release v1.4.4 2020-11-05 19:54:13 +00:00
Laurent Cozic 5922c6b216 Tools: Fix Linux build 2020-11-05 19:53:53 +00:00
Laurent Cozic c558e729bd Electron release v1.4.3 2020-11-05 18:58:12 +00:00
Laurent Cozic ca80101174 Tools: Fixed desktop app name 2020-11-05 18:56:35 +00:00
Laurent Cozic 6124f483dc Electron release v1.4.2 2020-11-05 18:24:07 +00:00
Laurent Cozic 90d58e4e2b Tools: Fixing Windows CI build 2020-11-05 18:23:54 +00:00
Laurent Cozic 8cd37d602c Tools: Running tests from root does not work well 2020-11-05 17:53:43 +00:00
Laurent Cozic e4ed26a961 Electron release v1.4.1 2020-11-05 17:44:29 +00:00
Laurent Cozic bc57d229fa Tools: Fix desktop build 2020-11-05 17:44:19 +00:00
Laurent Cozic c53cd52b4d Tools: Set version to 1.4 2020-11-05 17:41:25 +00:00
Laurent Cozic 0d7ca97556 Tools: Add way to get credential files 2020-11-05 17:40:13 +00:00
Laurent Cozic c1e2fd125c Fix paths 2020-11-05 17:18:38 +00:00
Laurent Cozic 6856f84faa Doc: Update doc 2020-11-05 17:15:53 +00:00
Laurent Cozic de091dfd64 Doc: Fixed gettext file url 2020-11-05 17:02:49 +00:00
Laurent Cozic cc07016b07 All: Use Lerna to manage monorepo 2020-11-05 16:58:23 +00:00
Laurent Cozic 122f20905c ios-v10.3.1 2020-11-05 14:53:44 +00:00
Laurent Cozic 5ff8beb82f fix iOS build 2020-11-05 14:53:24 +00:00
Laurent Cozic ff6cd57873 Android release v1.3.13 2020-11-05 13:46:19 +00:00
Laurent Cozic 4c948408c4 Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-11-04 12:03:09 +00:00
Laurent Cozic cc3a1d78da Merge branch 'dev' into release-1.3 2020-11-04 12:02:38 +00:00
Laurent Cozic 0cc544a95f Android release v1.3.11 2020-11-04 11:58:36 +00:00
Laurent Cozic 03b7402dc5 Electron release v1.3.15 2020-11-04 11:44:33 +00:00
Laurent Cozic dd5c400c24 Electron release v1.3.14 2020-11-04 11:44:04 +00:00
Laurent Cozic abc702c21f Electron release v1.3.12 2020-11-04 11:43:40 +00:00
Laurent Cozic cc3e1bdee8 Mobile: Fixed Katex rendering 2020-11-04 11:36:44 +00:00
Laurent Cozic 10cfa773ca Mobile: Fixes #4033: Fixed clicking on links 2020-11-04 11:35:12 +00:00
Laurent Cozic 8dc42b1f41 Revert "Desktop: Fixed handling of Option key for shortcuts in macOS"
This reverts commit e4f53a48d2.

Causes other issues like this one, so it needs to be removed:

https://github.com/laurent22/joplin/issues/4032
2020-11-04 10:37:07 +00:00
Ji-Hyeon Gim 6e7ea9a549 All: Translation: Update ko.po (#4018)
It updates fuzzy translations for Korean.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2020-11-01 19:48:19 -05:00
Laurent Cozic ed2ccdd504 Merge branch 'dev' of https://github.com/laurent22/joplin into dev 2020-11-01 00:11:09 +00:00
Laurent Cozic 6d2bad01e6 Merge branch 'release-1.3' into dev 2020-10-31 16:49:50 +00:00
Laurent Cozic 3847831d80 Merge branch 'release-1.3' of github.com:laurent22/joplin into release-1.3 2020-10-31 16:45:17 +00:00
Robin 44462f4d71 All: Translation: Update nl_NL.po (#4012) 2020-10-31 12:38:54 -04:00
Laurent Cozic 4d20589773 Desktop: Remove from keymap editor commands that cannot be associated with a shortcut 2020-10-31 16:29:17 +00:00
Laurent Cozic 52140ec1a9 Merge branch 'release-1.3' into dev 2020-10-31 13:06:06 +00:00
Laurent Cozic 08c2a7ad64 Tools: Improved HTML escape in git-changelog 2020-10-31 13:05:46 +00:00
Laurent Cozic d19796f14c Electron release v1.3.11 2020-10-31 13:02:14 +00:00
Laurent Cozic e4f53a48d2 Desktop: Fixed handling of Option key for shortcuts in macOS 2020-10-31 13:01:40 +00:00
Laurent Cozic 154163bd6c Desktop: Fixes #4010: Add history backward and forward commands to keymap and menus 2020-10-31 12:46:55 +00:00
Laurent Cozic 4502414934 Desktop: Make sure all commands appear in keymap editor 2020-10-31 12:25:12 +00:00
Laurent Cozic 38e4bc61d9 Doc: Plugin doc 2020-10-30 18:50:04 +00:00
Laurent Cozic 86c471afcd Cli: Fixes #4000: Display proper error message when decryption worker cannot be started 2020-10-29 23:37:19 +00:00
Laurent Cozic e2698aaead Merge branch 'release-1.3' into dev 2020-10-29 17:10:48 +00:00
Laurent Cozic 8cfe4b0f82 Mobile: Disable beta editor for now due to bugs that cannot be fixed
and crashes.

See https://discourse.joplinapp.org/t/11658/9?u=laurent
2020-10-29 16:42:47 +00:00
Laurent Cozic fd90a490c0 All: Security: Remove "link" and "meta" tags from notes to prevent XSS 2020-10-29 16:19:56 +00:00
Helmut K. C. Tessarek 16c5ffadc7 Update translations 2020-10-29 10:34:31 -04:00
Laurent Cozic 4a184721e4 Doc: Restored privacy policy document 2020-10-29 13:49:12 +00:00
Laurent Cozic 1e3bd937ed Android release v1.3.10 2020-10-29 11:34:10 +00:00
Laurent Cozic 0f6932f1e8 Clipper release v1.3.1 2020-10-29 11:28:21 +00:00
Laurent Cozic cab98776db Electron release v1.3.10 2020-10-29 11:20:45 +00:00
Laurent Cozic fbc1e3ed3b Merge branch 'dev' into release-1.3 2020-10-29 11:18:32 +00:00
Ji-Hyeon Gim 805d16abda All: Translation: Update ko.po (#3995)
It updates fuzzy translations for Korean.

Signed-off-by: Ji-Hyeon Gim <potatogim@potatogim.net>
2020-10-29 11:18:01 +00:00
Eduardo Braga f133229287 Add some missing translations to pt_BR.po (#3994) 2020-10-29 11:16:18 +00:00
Mario Campo 8f4031572a Update es_ES.po (#3978)
Several corrections in spanish language
2020-10-29 11:15:53 +00:00
Laurent Cozic d25fa796c0 Api: Added service to access resource external editing 2020-10-29 11:09:18 +00:00
Laurent Cozic 089d6a5c9e All: Fixes #3993: Fix slow Katex rendering when there are many global definitions 2020-10-29 10:44:48 +00:00
Laurent Cozic 3f83355d9f Clipper: Fixes #3984: Images from some website were not being downloaded 2020-10-29 10:16:31 +00:00
Laurent Cozic 40380e3066 Merge branch 'release-1.3' of github.com:laurent22/joplin into release-1.3 2020-10-29 10:15:08 +00:00
Laurent Cozic a6748bafb3 All: Fixes #3992: Update highlight.js to fix freeze for certain code blocks 2020-10-28 17:31:54 +00:00
Laurent Cozic b52f6eb77c All: Fixes #3955: Fixed sync issue when importing ENEX files that contain new line characters in the source URL attribute 2020-10-28 17:21:41 +00:00
Laurent Cozic 98c933fdb7 All: Fixed OneDrive authentication 2020-10-28 15:50:34 +00:00
Laurent Cozic ece7ffadd6 Desktop: Fixes #3986: Handle gzipped CSS files when importing from clipper 2020-10-28 15:47:36 +00:00
Laurent Cozic 591bceb8ef Update mermaid 2020-10-28 12:10:35 +00:00
Laurent Cozic 04cfd07176 macOS: Regression: Restore Edit menu in config screens so that Copy/Cut/Paste shortcuts work 2020-10-28 11:23:57 +00:00
Laurent Cozic db2282a351 Desktop: Fix syntax of imported resources when importing ENEX as HTML 2020-10-28 11:11:04 +00:00
Laurent Cozic 0ec3d6ca9d Clipper: Upgraded clipper to support API pagination
This version of the clipper will support both new and old Joplin
clients, so as to ease the transition.
2020-10-27 00:38:39 +00:00
Laurent Cozic 442b7ce0d3 litner 2020-10-26 23:19:52 +00:00
Laurent Cozic 6a068a90b2 Desktop: Regression: Keyboard shortcut would not save in some cases 2020-10-25 17:46:41 +00:00
Laurent Cozic 9a6f6c8b39 Desktop: Regression: Restore "New sub-notebook" command 2020-10-25 17:29:52 +00:00
Laurent Cozic 52d5c32950 Plugins: Add the openNote, openFolder and openTag commands 2020-10-25 17:22:59 +00:00
Laurent Cozic de47cff86d Fixed case 2020-10-24 12:07:48 +01:00
Laurent Cozic a459174f98 Desktop: Fix: Command Palette click did not work 2020-10-24 11:46:02 +01:00
Laurent Cozic 75d5aa3a77 Tools: Fixed linter errors 2020-10-24 00:14:30 +01:00
Laurent Cozic c254ca524f CLI v1.3.3 2020-10-23 17:01:13 +01:00
Laurent Cozic 51934b8d8d Cli: Added missing "immer" package 2020-10-23 17:00:20 +01:00
Laurent Cozic a5dd686bb2 CLI v1.3.2 2020-10-23 16:58:28 +01:00
Laurent Cozic 4cbfd04522 Cli: Trying to fix build 2020-10-23 16:56:34 +01:00
Laurent Cozic 6d5d9323bd CLI v1.3.1 2020-10-23 16:04:34 +01:00
Laurent Cozic 76063a6284 Android release v1.3.9 2020-10-23 16:03:13 +01:00
Laurent Cozic 4119924e57 Electron release v1.3.9 2020-10-23 15:57:29 +01:00
Laurent Cozic 537336754c All: Sort tags in a case-insensitive way 2020-10-23 15:48:11 +01:00
Laurent Cozic 06f73919bd Desktop: Fixed Cut menu item and test units 2020-10-23 13:21:37 +01:00
Laurent Cozic 3f3e46081c Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-10-22 16:34:45 +01:00
Laurent Cozic 68e4b4eaad macOS: Fixes #3404: Show context menu option to copy a link 2020-10-22 16:32:13 +01:00
Gen Neko 9dcb4b51e5 All: Translation: Update ja_JP.po (#3967) 2020-10-22 11:05:28 -04:00
Laurent Cozic 8543849ea1 Tools: Fixed tests 2020-10-22 15:55:29 +01:00
Laurent Cozic 6ce5240e12 Plugins: Fixed tests 2020-10-22 14:51:59 +01:00
Rory O’Kane 5bc25aefce Desktop: Make “update is available” dialog box easier to use (#3877) 2020-10-22 12:25:06 +01:00
Naveen M V b737ca7471 All: Fix search filters when language is in Korean or with accents (#3947) 2020-10-22 12:16:47 +01:00
Laurent Cozic a5d7366f94 Desktop: Fix invalid tag state issue when importing notes or syncing 2020-10-22 11:21:16 +01:00
Laurent Cozic 98f822d89c Cleaned up plugin doc 2020-10-21 22:52:58 +01:00
Laurent Cozic c33a8250ee Desktop: Added openProfileDirectory command and menu item 2020-10-21 22:10:21 +01:00
Laurent Cozic adad406696 Update translations 2020-10-21 21:54:47 +01:00
Laurent Cozic d82eec0fa4 Tools: Render translator names as link to prevent website template from breaking 2020-10-21 21:53:41 +01:00
Laurent Cozic c93f474547 Merge branch 'release-1.3' of github.com:laurent22/joplin into release-1.3 2020-10-21 21:30:29 +01:00
Laurent Cozic 0afd4a6234 Doc: Fixed typo 2020-10-21 21:23:31 +01:00
Laurent Cozic f42786a840 Android release v1.3.8 2020-10-21 18:31:12 +01:00
Laurent Cozic 1c1f044966 Electron release v1.3.8 2020-10-21 18:19:33 +01:00
Laurent Cozic ad7a80e260 Api: Allow preserving timestamps when updating a note 2020-10-21 18:12:36 +01:00
Laurent Cozic 5e040c062c Desktop: Fixes #3962: Certain commands no longer worked. 2020-10-21 17:22:29 +01:00
Laurent Cozic 0cede5f90a Desktop: Display more info while an ENEX file is being imported 2020-10-21 16:55:52 +01:00
Laurent Cozic 8dc0deb2a4 Desktop, Cli: Fixes #3958: Fixed freeze when importing ENEX as HTML, and fixed potential error when importing resources 2020-10-21 12:02:06 +01:00
Laurent Cozic 1ca44b8f44 Desktop: Made toolbar buttons bigger and swap order of bullet and number lists 2020-10-21 10:39:53 +01:00
Laurent Cozic 4ba9e60194 Merge branch 'dev' of github.com:laurent22/joplin into dev 2020-10-21 10:12:13 +01:00
Laurent Cozic 9d0bb4257f Desktop: Regression: Fixed format of copied version info 2020-10-21 10:10:18 +01:00
Alessandro Bernardello 1a273b9bca All: Translation: Update it_IT.po (#3956)
* Updated italian translation

* Updated translator name and email
2020-10-21 01:03:23 -04:00
Laurent Cozic d9e93cd6c4 Doc: Update plugin doc 2020-10-21 01:46:53 +01:00
Laurent Cozic 5d39860707 Plugins: Allow custom commands to return a result 2020-10-21 01:43:06 +01:00
Laurent Cozic 60a6f714bc Update website 2020-10-21 00:56:03 +01:00
Laurent Cozic 6eebeca259 Tools: updated plugin types 2020-10-21 00:55:10 +01:00
Laurent Cozic 995034c53f Update plugin templates 2020-10-21 00:35:06 +01:00
Laurent Cozic 45a0981d05 Updated website 2020-10-21 00:27:11 +01:00
Laurent Cozic 3d8577a689 Plugins: Added support for content scripts
- For now, supports Markdown-it plugins
- Also fixed slow rendering of notes in some cases
- Simplified how Markdown-It plugins are created and cleaned MdToHtml code

commit 89576de289
Merge: c75aa21f 5292fc14
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 21 00:23:00 2020 +0100

    Merge branch 'release-1.3' into plugin_content_scripts

commit c75aa21ffd
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 21 00:19:52 2020 +0100

    Fixed tests

commit 075187729d
Author: Laurent Cozic <laurent@cozic.net>
Date:   Wed Oct 21 00:11:53 2020 +0100

    Fixed tests

commit 14696b8c65
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 20 23:27:58 2020 +0100

    Fixed slow rendering of note

commit 61c09f5bf8
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 20 22:35:21 2020 +0100

    Clean up

commit 9f7ea7d865
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 20 20:05:31 2020 +0100

    Updated doc

commit 98bf3bde8d
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 20 19:56:34 2020 +0100

    Finished converting plugins

commit fe90d92e01
Author: Laurent Cozic <laurent@cozic.net>
Date:   Tue Oct 20 17:52:02 2020 +0100

    Simplified how Markdown-It plugins are created

commit 47c7b864cb
Author: Laurent Cozic <laurent@cozic.net>
Date:   Mon Oct 19 16:40:11 2020 +0100

    Clean up rules

commit d927a238bb
Author: Laurent Cozic <laurent@cozic.net>
Date:   Mon Oct 19 14:29:40 2020 +0100

    Fixed tests

commit 388a56c5dd
Author: Laurent Cozic <laurent@cozic.net>
Date:   Mon Oct 19 14:00:47 2020 +0100

    Add support for content scripts
2020-10-21 00:23:55 +01:00
3063 changed files with 184369 additions and 138290 deletions

No files matched your search

+1245 -343
View File
File diff suppressed because it is too large. Load diff
+1229 -329
View File
File diff suppressed because it is too large. Load diff
+1195 -289
View File
File diff suppressed because it is too large. Load diff
+5 -8
View File
@@ -61,21 +61,18 @@ script:
- |
# Install tools
npm install
cd Tools
npm install
cd ..
# Run test units.
# Only do it for pull requests because Travis randomly fails to run them
# and that would break the desktop release.
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
cd CliClient
cd packages/app-cli
npm run test-ci
testResult=$?
if [ $testResult -ne 0 ]; then
exit $testResult
fi
cd ..
cd ../..
fi
# Run linter for pull requests only - this is so that
@@ -93,7 +90,7 @@ script:
# tool like poedit. Doing it for Linux only is sufficient.
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
if [ "$TRAVIS_OS_NAME" != "osx" ]; then
node Tools/validate-translation.js
node packages/tools/validate-translation.js
testResult=$?
if [ $testResult -ne 0 ]; then
exit $testResult
@@ -102,7 +99,7 @@ script:
fi
# Find out if we should run the build or not. Electron-builder gets stuck when
# builing PRs so we disable it in this case. The Linux build should provide
# building PRs so we disable it in this case. The Linux build should provide
# enough info if the app builds or not.
# https://github.com/electron-userland/electron-builder/issues/4263
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
@@ -112,5 +109,5 @@ script:
fi
# Prepare the Electron app and build it
cd ElectronClient
cd packages/app-desktop
USE_HARD_LINKS=false npm run dist
File renamed without changes.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 300 KiB

After

Width:  |  Height:  |  Size: 48 KiB

File renamed without changes.
File renamed without changes.
@@ -13,7 +13,7 @@ gulp.task('icon-packager', function() {
});
gulp.task('deploy', function() {
fs.copyFileSync(`${__dirname}/dist/icons/Joplin/icons.js`, `${__dirname}/../../../ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/icons.js`);
fs.copyFileSync(`${__dirname}/dist/icons/Joplin/icons.js`, `${__dirname}/../../../packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/icons.js`);
return Promise.resolve();
});
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -27,7 +27,7 @@ module.exports = function(grunt) {
// },
shell: {
command: 'tsc',
command: 'tsc --project tsconfig.json',
},
rollup: {
@@ -125,7 +125,7 @@ module.exports = function(grunt) {
// { src: ['changelog.txt'], dest: 'dist', expand: true },
{
src: ['dist/joplinLists.js'],
dest: '../../../ElectronClient/gui/NoteEditor/NoteBody/TinyMCE/plugins/lists.js',
dest: '../../../packages/app-desktop/gui/NoteEditor/NoteBody/TinyMCE/plugins/lists.js',
},
],
},
@@ -1,11 +1,13 @@
# TinyMCE Joplin Lists Plugin
**As of 2020-11-02 this module no longer builds (a ton of TypeScript errors). No idea why since nothing was changed but should be investigated if modifying this plugin is ever needed.**
This is based on https://github.com/tinymce/tinymce/tree/59748a11303fb7cf00fdb8c9392dcb082ee9d965/modules/tinymce/src/plugins/lists
But with support for Joplin checkboxes.
## Building
Use `npm i && npm run build` to build the plugin, which will also copy the compiled version to the right ElectronClient sub-directory.
Use `npm i && npm run build` to build the plugin, which will also copy the compiled version to the right packages/app-desktop sub-directory.
To test the plugin, use `npm run buildAndStart`, which will build the plugin and start the desktop application.
File renamed without changes.
@@ -9,7 +9,7 @@
"test": "bedrock-auto -b phantomjs -d src/test/ts/",
"test-manual": "bedrock -d src/test/ts/",
"start": "grunt webpack",
"buildAndStart": "yarn build && cd .. && cd .. && cd .. && cd ElectronClient && npm start"
"buildAndStart": "yarn build && cd .. && cd .. && cd .. && cd packages/app-desktop && npm start"
},
"keywords": [],
"author": "Tiny Technologies Inc.",
@@ -48,7 +48,7 @@ const listState = function (editor: Editor, listName, options:any = {}) {
// dependent on how the checkbox is styled, so if the style is changed, this might need
// to be updated too.
// For the styling, see:
// ReactNativeClient/lib/joplin-renderer/MdToHtml/rules/checkbox.ts
// packages/app-mobile/lib/joplin-renderer/MdToHtml/rules/checkbox.ts
//
// The previous solution was to use "pointer-event: none", which mostly work, however
// it means that links are no longer clickable when they are within the checkbox label.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loaded 100 of 3063 files, more files were not shown because too many files have changed in this diff. Show more