1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00
Commit Graph

6785 Commits

Author SHA1 Message Date
Laurent Cozic
51dbf885b7 Doc: Added sponsor 2021-08-17 14:19:37 +01:00
Laurent Cozic
ac82e4b074 Server: Re-enable account when new subscription is associated with it 2021-08-17 12:23:26 +01:00
Laurent Cozic
7faa58e0f9 All: Add a way to disable a master key 2021-08-17 12:03:19 +01:00
Laurent Cozic
ea1269d122 Merge branch 'release-2.3' into dev 2021-08-17 08:25:28 +01:00
Laurent Cozic
819af3c6d8 Desktop release v2.3.5 2021-08-17 07:14:59 +01:00
Caleb John
e51fe8bd80 Desktop: Place code-block background in the back in Markdown editor (#5322) 2021-08-17 07:14:30 +01:00
Caleb John
e159494231
Desktop: Place code-block background in the back in Markdown editor (#5322) 2021-08-17 07:13:52 +01:00
Laurent Cozic
4df434e63e Desktop release v2.3.4 2021-08-17 07:06:05 +01:00
Laurent Cozic
467bc7c455 Desktop, Cli: Fixes #5325: Fixed file paths when exporting as HTML 2021-08-17 07:05:31 +01:00
Laurent Cozic
4c99400485 Desktop, Cli: Fixes #5325: Fixed file paths when exporting as HTML 2021-08-17 07:00:54 +01:00
reportxx
4f3c832589
All: Translation: Update sv.po (#5317) 2021-08-16 17:33:33 -04:00
Laurent Cozic
edc3496506 Tools: Fixed tests 2021-08-16 18:05:22 +01:00
Laurent Cozic
3f5081e2cd Update website 2021-08-16 16:50:14 +01:00
Laurent Cozic
b23d0ef31c Website: Fixed styling 2021-08-16 16:49:15 +01:00
Laurent Cozic
be500f29cc Tools: Trying yet again to upgrade lock files to v2 2021-08-16 16:21:56 +01:00
Laurent Cozic
f5f05e6cc5 All: Added "None" sync target to allow disabling synchronisation 2021-08-16 16:18:32 +01:00
Laurent Cozic
fe4900d254 Desktop: Add Sync Wizard dialog 2021-08-16 15:20:14 +01:00
Laurent Cozic
5c50ee9b14 Merge branch 'release-2.3' into dev 2021-08-16 11:00:21 +01:00
Laurent Cozic
0aaf888aa5 CLI v2.3.2 2021-08-16 10:39:20 +01:00
Laurent Cozic
8c93a89c0a Tools: Fixed CLI release 2021-08-16 10:37:48 +01:00
Laurent Cozic
bee6001462 Releasing sub-packages 2021-08-16 10:03:33 +01:00
Laurent Cozic
dc192fb4c1 Android 2.3.4 2021-08-15 14:32:35 +01:00
Laurent Cozic
3abebe6a32 Tools: Fixed Android build 2021-08-15 14:10:52 +01:00
Roman
6c18c6ddc7 Use url-parse 2021-08-15 13:48:32 +01:00
Laurent Cozic
fd78306111 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-15 12:22:46 +01:00
Laurent Cozic
2011369c83 ios-v12.3.1 2021-08-15 12:20:48 +01:00
Laurent Cozic
2a732ba03d Merge branch 'dev' into release-2.3 2021-08-15 12:15:28 +01:00
Laurent Cozic
bcadb3662b Server: Increase cookies security - set HttpOnly, Secure and SameSite flags 2021-08-15 11:09:52 +01:00
Aaron
7b2c271070
Server: Fix missing CSS file error in DevTools (#5309) 2021-08-15 10:26:29 +01:00
Caleb John
9783f57f75
Desktop: Resolves #5297: Improved Markdown editor code styling, and add CSS classes for code (#5314)
Adds the cm-jn-inline-code and cm-jn-code-block classes
both classes are given styling based on the current theme
2021-08-15 10:25:47 +01:00
Laurent Cozic
e0971baec4 Tools: Fixed tests 2021-08-15 00:54:24 +01:00
Laurent Cozic
c7421dfbe1 Server: Fixed second duration 2021-08-15 00:39:28 +01:00
Laurent Cozic
543413d64b Server: Add request rate limter on session and login end points 2021-08-15 00:31:27 +01:00
Roman
20d1f74ee4 Use enum 2021-08-14 23:30:19 +01:00
Roman
2386abea3e Rename parseUrl -> parseCallbackUrl 2021-08-14 23:18:58 +01:00
Roman
90621a8417 Fix linter errors 2021-08-14 23:07:22 +01:00
Roman
b02baa6891 Update ignore files 2021-08-14 22:34:47 +01:00
Roman
ee46978389 Review comments - throw an error if callback url is not valid 2021-08-14 21:59:54 +01:00
Roman
2b6b4dd916 Rename initialUrl -> initialCallbackUrl 2021-08-14 21:55:47 +01:00
Roman
f0361bf80d Review comments - escape vars in url 2021-08-14 21:53:52 +01:00
Roman
ecf718005d Code review comments 2021-08-14 21:01:03 +01:00
Roman
305d0ffc49 Rename copy folder URL -> copy notebook URL 2021-08-14 20:57:01 +01:00
Roman
f454c4e33b Add a function to check for valid callback url 2021-08-14 20:20:16 +01:00
Roman
047883bd27 Read initial url from a field 2021-08-14 20:12:14 +01:00
Laurent Cozic
2c79ce25fa Server: Added commands to control db migrations - list, down, up 2021-08-14 17:49:01 +01:00
Laurent Cozic
c8ccab808f Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-14 16:58:42 +01:00
Laurent Cozic
d27f3b6ad3 Tools: Added option to push Docker images to DockerHub or not 2021-08-14 16:58:08 +01:00
Roman
f118f5250f Handle openFolder and openTag too; change the URL format; extract ULR functions to a separate file 2021-08-14 13:33:45 +01:00
reportxx
c8dad95c38
All: Translation: Update sv.po (#5301) 2021-08-14 08:28:22 -04:00
Minh-Phuc Bui
8646d8240b
All: Translation: Update vi.po (#5294)
* Update vi.po

* Update Vietnamese translation

Remove unexpected whitespace
2021-08-14 08:27:33 -04:00