1
0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-12 08:54:00 +02:00
Commit Graph

3439 Commits

Author SHA1 Message Date
Laurent Cozic
fdac132905 Updating icons 2019-12-02 21:23:30 +00:00
Laurent Cozic
60b993412e Doc: Updated website icon and cleaned up design a bit 2019-12-02 20:41:26 +00:00
Laurent Cozic
697c914c77 Merge branch 'master' of github.com:laurent22/joplin 2019-12-03 15:52:01 +00:00
Devon Zuegel
8c17ecb3d9 Desktop: Add highlight_mark token to Ace editor rules (#2100)
* Added highlight_mark token to Ace editor rules

* Fix edge case for highlight_mark Ace rule

* Add ==mark== rule only if plugin is enabled

* Rm temporary highlight class
2019-12-03 11:12:47 +00:00
Laurent Cozic
4c93121102
Added GSoC 2020 banner 2019-12-02 10:55:45 +00:00
Helmut K. C. Tessarek
5efe9b99c2
fix missing double quotes in nb_NO.po 2019-12-01 20:26:10 -05:00
Mats Estensen
3249763091 Translation: Update nb_NO.po (#2135)
* Update norwegian

* fix typo
2019-12-01 20:15:42 -05:00
Laurent Cozic
60964a4224 Tools: Removed uneeded untranslatedCount prop from translation index 2019-11-29 18:51:55 +00:00
Laurent Cozic
805a5399b5 All: Fixes #2126: Restaured translations that had been accidentally deleted 2019-11-29 15:47:12 +00:00
Laurent Cozic
0a39e4ccb0 Merge branch 'master' of github.com:laurent22/joplin 2019-11-29 15:40:20 +00:00
Laurent Cozic
f8cb908e0f Tools: Added check on translation builder to prevent it from deleting too many translations 2019-11-28 18:27:38 +00:00
Laurent Cozic
d2aceed34e Security: Upgraded packages to fix security issues on clipper 2019-11-28 17:33:54 +00:00
Laurent Cozic
e6d9d83d92 Desktop: Fixes #1826: Fixed warning boxes in solarized theme 2019-11-28 17:09:52 +00:00
Laurent Cozic
1a1c87b5c4 Update Turkish translation (Thanks Hüseyin Fahri Uzun) 2019-11-27 11:02:30 +00:00
exprez135
5bcec583bb Finish translation of es_ES.po and standardize quotation marks format to guillemets (#2125) 2019-11-26 17:39:40 -05:00
Christiaan de Die le Clercq
692606292f Translation: Update nl_NL.po (#2123)
Noticed a small typo when using the application
2019-11-26 17:38:51 -05:00
Helmut K. C. Tessarek
1782e55c66
update the resource icon (for internal/local links) 2019-11-22 18:12:39 -05:00
Laurent Cozic
707828ca76 All: Fixes #2117: Prevent synch from happening if target dir could not be created, in local sync 2019-11-21 19:54:09 +00:00
Laurent Cozic
5b0a817d69
Update stale.yml 2019-11-21 09:31:24 +00:00
Laurent Cozic
23e77efc83 Android release v1.0.311 2019-11-20 20:57:25 +00:00
Laurent Cozic
03c7368d71 iOS v10.0.40 2019-11-20 20:48:37 +00:00
Laurent Cozic
fdc80f0663 Update translations 2019-11-20 19:06:45 +00:00
Laurent Cozic
4e708ea021 Doc: More GSoC 2019-11-20 19:01:01 +00:00
Laurent Cozic
49898d01b5 Doc: Added GSoC to website 2019-11-20 18:47:32 +00:00
Laurent Cozic
8036923aca All: Added more logging for resource fetching to try to debug issue 2019-11-20 18:47:18 +00:00
Dominik Bamberger
76c8f777ca Move variable declaration before its first use. (#2109)
* Move variable declaration before its first use.

* Remove trailing whitespace
2019-11-20 18:19:33 +00:00
Marcus Hill
e84bafd034 All: Resolves #2097: Add warning message when user tries to upload a file 10MB or larger (#2102) 2019-11-20 18:18:58 +00:00
PackElend
37fc42eb73 Doc: GsoC first public draft of documentation (#2092)
* GSoC root file

This is the root file for the Google Summer of Code program

* Fixed TOC

* Introduction to GSoC with Joplin

The first draft cloned from https://community.kde.org/GSoC

* Joplin's Application at GSoC template

Cloned from https://wiki.openstreetmap.org/wiki/Google_Summer_of_Code/2019/Organisation_application

* GSoC 2019, idea #1: deeper Nextcloud integration

* GSoC 2019, idea #2: sharing notes

* GSoC 2019, idea #2: tag handling

* GSoC 2019, idea #4: search improvements

* GSoC 2019, idea #5: per note password protection

* Update GSoC_Idea#1.md

* Update GSoC_Idea#2.md

* Rename GSoC_Idea#2.md to GSoC_Idea#2_sharing.md

* Rename GSoC_Idea#1.md to GSoC2019_Idea#1_Nextcloud.md

* Rename GSoC_Idea#2_sharing.md to GSoC2019_Idea#2_sharing.md

* Update and rename GSoC_Idea#3.md to GSoC2019_Idea#3_tagging.md

* Rename GSoC_Idea#4.md to GSoC2019_Idea#4_Search.md

* Rename GSoC_Idea#5.md to GSoC2019_Idea#5_Password per Note.md

* Update GSoC2019_Idea#1_Nextcloud.md

* Create GSoC2019.md

cloned from https://community.kde.org/GSoC/2019/Ideas

* Rename Introduction.md to GSoCIntroduction.md

* Rename GSoCIntroduction.md to GSoC_Introduction.md

* Rename Application.md to GSoC_Application.md

* first draft of a public introduction and project idea page, plus first (filled) template for ideas

* added idea

* started to update org details

* Delete GSoC_Application.md

moved to forum

* Update summer_of_code.md

put the template in a <details> block. little improvements where to publish ideas and applications

* Update summer_of_code.md

put application in quote
2019-11-20 18:17:51 +00:00
Laurent Cozic
a0a89112bd Merge branch 'master' of github.com:laurent22/joplin 2019-11-20 18:17:08 +00:00
Laurent Cozic
4842f83aae All: Fixes #2088: Handle rare case when notebook has a parent that no longer exists, which causes a crash when sorting 2019-11-20 18:14:11 +00:00
taw00
69b185ff5e Documentation: correct and expand the markdown instructions for a link (#2106)
* correcting and expanding the markdown instructions for a link
- "some content" in `[some content](https://somelink/)` is called the
    content of an entity (or alt text for an image link)
- "some title" in this example is the the title element of the
    entity: `[some content](https://somelink/ "some title")`

* link description: Fixed a typo, restructured a line break I screwed up, and I cleaned up the language a bit
2019-11-20 12:09:03 -05:00
vicoutorama
d8c2f0cbba Translation: Update pt_BR.po (#2116)
Done some updates to pt BR translation. Hope it helps!
2019-11-19 21:03:29 -05:00
genneko
5b05f22476 Translation: Update ja_JP.po (#2115) 2019-11-19 21:02:27 -05:00
rikanotank1
8012d1fcfc Translation: Update zh_CN.po (#2108)
Translated some theme part into chinese
2019-11-19 15:19:02 -05:00
Laurent Cozic
40753296c4 iOS: Fixes #2103: Fix issue when WebDAV server redirects certain API calls 2019-11-19 09:09:01 +00:00
Laurent Cozic
7baeb223f3
Update markdown.md 2019-11-18 10:26:07 +00:00
Laurent Cozic
affacf472f Doc: Fix Esperanto flag 2019-11-18 08:55:23 +00:00
Laurent Cozic
896925ca49 Doc: Added link on website to improve doc 2019-11-18 08:49:01 +00:00
Laurent Cozic
78628c0f42 Doc: Switching to Fork Awesome 2019-11-18 08:39:37 +00:00
Laurent Cozic
ee650c1ef4 Doc: Switching to Fork Awesome 2019-11-18 08:31:17 +00:00
Laurent Cozic
5b65fae49d All: Improved logging during sync to allow finding bugs more easily 2019-11-13 18:54:54 +00:00
barbowza
2d5d8ceb1d Desktop: Allow Electron debugging flag (#2084)
* Add check for Electron's cli arg --remote-debugging-port and discard it to prevent cli arg parser raising Unknown flag exception.

* Jump to next iteration once arg processed

* Allow only the strict form of flag as --x=y
2019-11-13 21:38:09 +00:00
Tomáš Bambas
de214c8695 Translation: update Czech cs_CZ.po (#2086) 2019-11-13 16:33:44 -05:00
Laurent Cozic
ca2446aef0 Update website 2019-11-12 18:21:28 +00:00
Laurent Cozic
0ca96ee8be Electron release v1.0.174 2019-11-12 17:56:59 +00:00
Laurent Cozic
0c82c108ec Update translations 2019-11-12 17:55:58 +00:00
Laurent Cozic
15f09ef169 Revert "Desktop: Stop watching external edits when closing editor (#1981)"
Due to this issue:

https://discourse.joplinapp.org/t/joplin-version-1-0-173/4232/7

This reverts commit 0eb51e6bb0.
2019-11-12 17:51:57 +00:00
Laurent Cozic
45cca9e002 Desktop: Fixes #2079: Do not crash when a notebook parent does not exist 2019-11-12 17:50:48 +00:00
Laurent Cozic
76ecfd0234 Merge branch 'master' of github.com:laurent22/joplin 2019-11-12 16:16:52 +00:00
Laurent Cozic
927d46b2e4 Fix tests 2019-11-12 16:16:39 +00:00