1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-30 08:26:59 +02:00
Commit Graph

1328 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Cozic
8063c94ff7 Desktop: Allow setting a max width for the editor content 2021-08-14 12:19:53 +01:00
Laurent Cozic
6ae5ccb638 Server v2.3.7 2021-08-13 22:20:21 +01:00
Laurent Cozic
30a23ea118 Merge branch 'dev' into release-2.3 2021-08-13 22:20:05 +01:00
Laurent Cozic
a9961ae3ec Server: Fix migrations 2021-08-13 22:19:20 +01:00
Laurent Cozic
d42d17e1ed Server v2.3.6 2021-08-13 21:59:45 +01:00
Laurent Cozic
60ef24a3f7 Merge branch 'dev' into release-2.3 2021-08-13 21:59:29 +01:00
Laurent Cozic
f518549cfe Server: Fix migrations 2021-08-13 21:58:39 +01:00
Laurent Cozic
d0ffc03ccc Server v2.3.5 2021-08-13 19:01:31 +01:00
Laurent Cozic
32c8cc9030 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-13 18:59:55 +01:00
Laurent Cozic
d42d181f31 Server: Fixed pagination link styling 2021-08-13 18:59:45 +01:00
Laurent Cozic
48f23f1ee7 Tools: Build renderer assets 2021-08-13 17:58:03 +01:00
Laurent Cozic
58efe1c87f Merge branch 'release-2.3' into dev 2021-08-13 17:57:32 +01:00
Laurent Cozic
1478c368c5 Server v2.3.4 2021-08-13 17:57:06 +01:00
Laurent Cozic
c96ec36d0d Server v2.3.3 2021-08-13 10:15:38 +01:00
Roman Musin
e57e5d3b3f
All: Fixes #5245: Bump hightlight.js to v11.2 (#5278) 2021-08-12 22:07:57 +01:00
Laurent Cozic
6ce19ed680 Android 2.3.3 2021-08-12 21:57:37 +01:00
Laurent Cozic
d0251400a4 version 2021-08-12 21:32:54 +01:00
Laurent Cozic
f0ad813f40 Tools: remove git pull from Android release script, which can make upload fail 2021-08-12 21:26:29 +01:00
Laurent Cozic
f07636e4b7 Desktop release v2.3.3 2021-08-12 19:27:57 +01:00
Laurent Cozic
11cf8474f7 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-12 19:27:14 +01:00
Laurent Cozic
77a8ab8125 Tools: Fixed lib import statements 2021-08-12 19:26:35 +01:00
Laurent Cozic
3309f42fb6 Desktop release v2.3.2 2021-08-12 18:02:16 +01:00
Laurent Cozic
bd907ddeb2 Tools: Trying again to upgrade lock files to v2 2021-08-12 18:01:55 +01:00
Laurent Cozic
b6d9392798 Desktop release v2.3.1 2021-08-12 17:30:56 +01:00
Laurent Cozic
f7e90490e9 Server v2.3.2 2021-08-12 17:26:58 +01:00
Laurent Cozic
14bf50fdc9 Tools: Fixed desktop test scripts 2021-08-12 17:25:19 +01:00
Laurent Cozic
97726b02e6 Server: Fixed publishing of notes with HTML markup type 2021-08-12 17:23:49 +01:00