diff --git a/BUILD.md b/BUILD.md index b81cc8d96d..6b8db323a1 100644 --- a/BUILD.md +++ b/BUILD.md @@ -9,8 +9,6 @@ echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile source ~/.bash_profile -If you get a node-gyp related error you might need to manually install it: `npm install -g node-gyp` - ## Linux and Windows (WSL) dependencies - Install yarn - https://yarnpkg.com/lang/en/docs/install/ @@ -37,6 +35,10 @@ yarn dist If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4` +If you get a node-gyp related error you might need to manually install it: `npm install -g node-gyp`. + +If you get the error `libtool: unrecognized option '-static'`, follow the instructions [in this post](https://stackoverflow.com/a/38552393/561309) to use the correct libtool version. + That will create the executable file in the `dist` directory. From `/ElectronClient` you can also run `run.sh` to run the app for testing. diff --git a/README.md b/README.md index 782ff1c33b..060675384e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Joplin -[![Donate](https://joplin.cozic.net/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) [![Donate with Bitcoin](https://joplin.cozic.net/images/badges/Donate-Bitcoin.svg)](https://joplin.cozic.net/donate/#bitcoin) [![Travis Build Status](https://travis-ci.org/laurent22/joplin.svg?branch=master)](https://travis-ci.org/laurent22/joplin) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/laurent22/joplin?branch=master&passingText=master%20-%20OK&svg=true)](https://ci.appveyor.com/project/laurent22/joplin) +[![Donate](https://joplin.cozic.net/images/badges/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=E8JMYD2LQ8MMA&lc=GB&item_name=Joplin+Development¤cy_code=EUR&bn=PP%2dDonationsBF%3abtn_donateCC_LG%2egif%3aNonHosted) [![Become a patron](https://joplin.cozic.net/images/badges/Patreon-Badge.svg)](https://www.patreon.com/joplin) [![Travis Build Status](https://travis-ci.org/laurent22/joplin.svg?branch=master)](https://travis-ci.org/laurent22/joplin) [![Appveyor Build Status](https://ci.appveyor.com/api/projects/status/github/laurent22/joplin?branch=master&passingText=master%20-%20OK&svg=true)](https://ci.appveyor.com/project/laurent22/joplin) Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in [Markdown format](#markdown). diff --git a/docs/images/badges/Patreon-Badge.svg b/docs/images/badges/Patreon-Badge.svg new file mode 100644 index 0000000000..2e3cf2f2c3 --- /dev/null +++ b/docs/images/badges/Patreon-Badge.svg @@ -0,0 +1,19 @@ + \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index 95161a4d94..c6d66deee3 100644 --- a/docs/index.html +++ b/docs/index.html @@ -249,7 +249,7 @@ -
+Joplin is a free, open source note taking and to-do application, which can handle a large number of notes organised into notebooks. The notes are searchable, can be copied, tagged and modified either from the applications directly or from your own text editor. The notes are in Markdown format.
Notes exported from Evernote via .enex files can be imported into Joplin, including the formatted content (which is converted to Markdown), resources (images, attachments, etc.) and complete metadata (geolocation, updated time, created time, etc.). Plain Markdown files can also be imported.
The notes can be synchronised with various cloud services including Nextcloud, Dropbox, OneDrive, WebDAV or the file system (for example with a network directory). When synchronising the notes, notebooks, tags and other metadata are saved to plain text files which can be easily inspected, backed up and moved around.
@@ -402,6 +402,7 @@