self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-18 09:35:20 +02:00
Code Issues Releases Activity
6,496 Commits 244 Branches 1,266 Tags 536 MiB
7f1de8df30
Commit Graph

1274 Commits

Author SHA1 Message Date
Laurent Cozic
517deade20 Merge branch 'dev' into release-2.2 2021-08-06 11:04:59 +01:00
Laurent Cozic
e9d590169b Desktop: Remove template feature (replaced by template plugin) 2021-08-06 10:58:32 +01:00
Laurent Cozic
fa9c08be06 Plugin Repo: Added plugin download links on README page 2021-08-05 17:32:00 +01:00
Laurent Cozic
daadc3309b Desktop release v2.2.4 2021-08-05 16:04:42 +01:00
Laurent Cozic
dbe7146bdd Merge branch 'dev' into release-2.2 2021-08-05 16:04:28 +01:00
Laurent Cozic
87298db0ec fix import 2021-08-05 16:01:46 +01:00
Laurent Cozic
f2818a653b Desktop release v2.2.3 2021-08-05 15:09:58 +01:00
Laurent Cozic
d7d05f85ff Should wait when copying file 2021-08-05 15:08:57 +01:00
Laurent Cozic
5b7a5de826 Desktop: Resolves #5184: GotoAnything sometimes is not working on first try 2021-08-05 14:40:54 +01:00
Laurent Cozic
69f0578ca9 Tools: Do not run slow updateIgnored script when running desktop app in dev mode 2021-08-05 14:35:58 +01:00
Laurent Cozic
6e82c8a8f9 Desktop: Fixes #5208: Focus is lost while searching in all notes 2021-08-05 14:35:08 +01:00
Laurent Cozic
f08af4d036 All: Fixes #5223: Fixed issue with orphaned resource being created in case of a resource conflict 2021-08-05 14:25:25 +01:00
Laurent Cozic
d3cd843fc8 Desktop: Fixed header spacing (regression) 2021-08-05 12:50:41 +01:00
Laurent Cozic
3348b4f6f8 Desktop: Fixes #5253: Fixed plugin state when it has been deleted outside the app 2021-08-05 12:48:39 +01:00
Laurent Cozic
5d176b5bc8 Desktop: Resolves #5256: Increase space between paragraphs in viewer and Rich Text editor to match Markdown editor 2021-08-05 12:30:00 +01:00
Laurent Cozic
854b83039e Desktop: Fixes #5258: Fixed recipient list colors in Share Notebook dialog 2021-08-05 12:23:10 +01:00
Laurent Cozic
73e67deb37 Desktop: Fixes #5259: Fixed share note color in note list 2021-08-05 12:16:02 +01:00
Laurent Cozic
bde39bf6b3 Desktop: Fixes #5268: Disable "Dropped file type is not supported" notification in Rich Text editor 2021-08-05 12:09:21 +01:00
Laurent Cozic
7f00e4ea5b Desktop: Turn old plugin deprecation notices into errors 2021-08-05 12:02:03 +01:00
Laurent Cozic
4d3eff3682 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-05 11:38:22 +01:00
Laurent Cozic
a16046e8a1 Doc: Updated FAQ 2021-08-05 11:37:49 +01:00
Alexander Dawson
ceb57b515d
All: Translation: Update nb_NO.po (#5263) 2021-08-04 07:24:26 -04:00
Laurent Cozic
c4fcfec581 Server: Clarify beta transition message 2021-08-04 09:34:35 +01:00
Laurent Cozic
2a9654f9ab Server v2.2.11 2021-08-03 19:48:07 +01:00
Laurent Cozic
724aa726ca Server: Fixed support emails 2021-08-03 19:47:18 +01:00
Laurent Cozic
0fc4bc05f6 typo 2021-08-03 19:43:20 +01:00
Laurent Cozic
db0e0ee17e Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-08-03 18:25:13 +01:00
Laurent Cozic
6ac22ed0a0 Server: Prevent duplicate Stripe subscriptions and improved Stripe workflow testing 2021-08-03 18:24:33 +01:00
Abdullah Ibnu Hibban
4cfb804d61
All: Translation: Update id_ID.po (thanks to eresytter) (#5251) 2021-08-03 12:54:20 -04:00
reportxx
a3c1be405e
All: Translation: Update sv.po (#5262) 
Please merge this pr to update the Swedish translation.
 2021-08-03 12:53:29 -04:00
Laurent Cozic
785248b27f Server: Disable beta account once expired 2021-08-02 17:56:25 +01:00
Laurent Cozic
8910c87d15 Server: Handle beta user upgrade 2021-08-02 17:43:18 +01:00
Laurent Cozic
447cb2d92d Server v2.2.10 2021-08-01 11:05:29 +01:00
Laurent Cozic
b5b6111e83 Server: Allows providing a coupon when creating the Stripe checkout session 2021-07-31 17:05:39 +01:00
Laurent Cozic
23553b70e0 Server v2.2.9 2021-07-31 14:53:29 +01:00
Laurent Cozic
ef35b30645 Doc: Switch to prod mode 2021-07-31 14:45:39 +01:00
Laurent Cozic
4f02c7359b Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-31 14:43:32 +01:00
Laurent Cozic
f2547fed8d Server: Add support for Stripe yearly subscriptions 2021-07-31 14:42:56 +01:00
Helmut K. C. Tessarek
d3a449a86e
All: Translation: Update da_DK.po (thanks ERYpTION) 2021-07-28 13:26:22 -04:00
Laurent Cozic
c76ed7f8ac Update translations 2021-07-28 13:35:40 +01:00
Laurent Cozic
e9c11f5ac3 Tools: Filtered out problem files from translation build 2021-07-28 13:33:57 +01:00
Laurent Cozic
5c7fa587c0 Tools: Filtered out problem files from translation build 2021-07-28 13:25:49 +01:00
Laurent Cozic
361802273d Doc: Added sponsors and automatically build sponsor list on README 2021-07-26 18:21:19 +01:00
Laurent Cozic
8920db5537 Desktop: Fixes #5241: Katex code could be broken after editing it in Rich Text editor 2021-07-26 14:50:31 +01:00
Helmut K. C. Tessarek
d5fcffbac1
All: Translation: Update en_US.po 2021-07-25 19:18:01 -04:00
Helmut K. C. Tessarek
15edd4dfce
Update translations 2021-07-25 19:11:51 -04:00
Laurent Cozic
8b08f0d2b3 Fixed config 2021-07-25 14:21:41 +01:00
Laurent Cozic
fb9ec105df Desktop: Converted Clipper notification to a modal dialog that shows up in all screens 2021-07-25 13:15:56 +01:00
Laurent Cozic
53b4d7af68 Server: Improve installation instructions 2021-07-25 12:03:23 +01:00
Laurent Cozic
3a3aa701ac Desktop, Cli: Fixes #5232: Do not export share properties 2021-07-25 11:51:50 +01:00
Laurent Cozic
830712a3bb Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-25 11:15:54 +01:00
Laurent Cozic
dd1f90819c Server: Fixes #5229: Published notes that contain non-alphabetical characters could end up being truncated 2021-07-25 11:13:27 +01:00
JackGruber
2ed8ac91a9
Server: Add Docker major, minor and beta version tags (#5237) 2021-07-25 10:38:36 +01:00
Helmut K. C. Tessarek
31c3093700
Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-24 19:11:27 -04:00
Vaso3
769094f002
All: Translation: Update sr_RS.po (#5234) 
* Update sr_RS.po

Added and improved translation in the first 3k lines of the file

* Update sr_RS.po

Added translation.

* Update sr_RS.po

Few minor changes and fixed broken string.

* Update sr_RS.po

Some more corrections

* Update sr_RS.po

* Update sr_RS.po
 2021-07-24 19:10:34 -04:00
Helmut K. C. Tessarek
a60d9fa61f
All: Translation: Update pt_BR.po (thanks kuroppi) 2021-07-24 18:28:20 -04:00
Laurent Cozic
6499ca8e61 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-24 18:57:29 +01:00
Laurent Cozic
2b64b320fb Fixed tests 2021-07-24 18:56:30 +01:00
Laurent Cozic
282f782d50 Server: Fixed certain URLs 2021-07-24 18:34:42 +01:00
Laurent Cozic
5fcf2e48b3 Server v2.2.8 2021-07-24 17:56:36 +01:00
Laurent Cozic
63d4ccdc61 Merge branch 'dev' into release-2.2 2021-07-24 17:55:41 +01:00
Laurent Cozic
19b45de298 Server: Added form tokens to prevent CSRF attacks 2021-07-24 17:45:30 +01:00
Laurent Cozic
b7e9848428 Server: Allow users to cancel Stripe subscription 2021-07-24 16:44:50 +01:00
Laurent Cozic
3f993af7fd Server: Explain how to use Joplin Server with a Joplin app 2021-07-24 15:14:07 +01:00
Ahmad Mamdouh
d3c1edc3ee
Fix wrong variable name (#5235) 2021-07-24 10:41:39 +01:00
Vaso3
471c06b3fd
All: Translation: Update sr_RS.po (#5218) 
* Update sr_RS.po

Added and improved translation in the first 3k lines of the file

* Update sr_RS.po

Added translation.

* Update sr_RS.po

Few minor changes and fixed broken string.
 2021-07-23 15:51:51 -04:00
Laurent Cozic
e83ab93644 Server: Allow user to upgrade account 2021-07-23 20:34:30 +01:00
Laurent Cozic
75a421edb1 Server: Allow admin to change Stripe subscription 2021-07-23 17:03:49 +01:00
Laurent Cozic
07d2a60c75 Plugins: Add support for loading application chrome and note CSS from the plugin 2021-07-23 11:05:21 +01:00
Laurent Cozic
252d0695a4 Server: Handle Stripe webhook receiving multiple times the same event 2021-07-22 21:54:21 +01:00
Laurent Cozic
27c3cbdf8f Server: Allow enabling or disabling a user. Handle cancelling subscription. 2021-07-22 17:32:10 +01:00
David Beale
52e1a05f4d
Tools: Remove es module entry points from Turndown packages, as they are not being included in the dist (#5226) 2021-07-22 10:51:19 +01:00
Ahmad Mamdouh
c89037b4a2
Plugins: Add ability to make dialogs fit the application window (#5219) 2021-07-22 10:21:57 +01:00
reportxx
f611d7734b
All: Translation: Update sv.po (#5221) 2021-07-21 14:27:50 -04:00
balmag
366ef025dc
All: Translation: Update hu_HU.po (#5215) 
Update Hungarian language file
 2021-07-20 13:09:18 -04:00
Laurent Cozic
75cc73cc0c Desktop, Cli: Fixes #5213: Import highlighted text from ENEX files 2021-07-20 10:39:20 +01:00
milotype
9ac56b3754
All: Translation: Update hr_HR.po (#5206) 2021-07-19 10:37:27 -04:00
Laurent Cozic
d4cdebafeb Doc: Automatic generation of responsive images 2021-07-19 14:37:59 +01:00
Laurent Cozic
1194f6879f Doc: Display Joplin Cloud links 2021-07-19 10:58:21 +01:00
Laurent Cozic
37ad6132b8 Desktop release v2.2.2 2021-07-19 10:45:30 +01:00
Laurent Cozic
2d92a0f1a0 Merge branch 'dev' into release-2.2 2021-07-19 10:45:03 +01:00
Laurent Cozic
d469ac174c Merge branch 'release-2.1' into dev 2021-07-19 10:42:22 +01:00
Laurent Cozic
882d66383b Desktop release v2.1.9 2021-07-19 10:40:12 +01:00
Laurent Cozic
cafaa9cac5 All: Ensure that timestamps are not changed when sharing or unsharing a note 2021-07-19 10:27:43 +01:00
Laurent Cozic
b2de27b6fc Desktop: Make sure clipper authorisation notification is displayed, even when in config screen 2021-07-19 09:46:32 +01:00
小骏
73c75a8071
All: Translation: Update zh_CN.po (#5203) 
* update zh_CN.po

* update zh_CN.po

* update zh_CN.po

* update zh_CN.po
 2021-07-18 14:52:14 -04:00
balmag
d2df19ed0c
All: Translation: Update hu_HU.po (#5195) 2021-07-16 17:11:43 -04:00
Helmut K. C. Tessarek
62903874b5
Update translations 2021-07-16 14:18:48 -04:00
Laurent Cozic
4567b78f0c Server: Clarify error message when user info cannot be saved 2021-07-16 17:05:15 +01:00
Laurent Cozic
92520e58fb Server: Set default of env SUPPORT_EMAIL to "SUPPORT_EMAIL" to make it clear it needs to be set 2021-07-16 16:56:21 +01:00
Laurent Cozic
7245aead39 Server: Make sure email URLs are displayed as clickable links 2021-07-16 16:37:18 +01:00
Laurent Cozic
9823ac3379 Tools: Fixed server test user creation 2021-07-16 16:35:58 +01:00
Laurent Cozic
7a164b9b87 Fixing mobile build 2021-07-16 15:50:33 +01:00
Laurent Cozic
e125430748 Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-16 14:32:09 +01:00
Laurent Cozic
ed8a928a8e Fix mobile build 2021-07-16 14:30:52 +01:00
Roman Musin
7f709c210c
Remove unused condition in synchronizer (#5194) 2021-07-16 11:48:54 +01:00
Laurent
8e4be78013
Desktop: Make Markdown editor styling closer to view styling (#5174) 2021-07-16 11:32:29 +01:00
Laurent Cozic
58c4f9eded Merge branch 'dev' of github.com:laurent22/joplin into dev 2021-07-16 11:13:50 +01:00
Xavi Ivars
2c525c2163
All: Translation: Update ca.po (#5193) 2021-07-15 13:29:02 -04:00
stephan11H
68f119efbd
All: Translation: Update de_DE.po (#5186) 
* update german translation file

* update German translation file

* changed translation for *full changelog*

Co-authored-by: Stephan Hildebrand <stephan.hildebrand@rwth-aachen.de>
 2021-07-15 12:51:33 -04:00