diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index b757214526..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-name: Feature request
-about: Report an accepted feature request.
-title: ''
-labels: 'enhancement'
-
----
-
-⚠🚨⛔⛔⛔⛔⛔ ⬇ STOP & READ THIS ⬇ ⛔⛔⛔⛔⛔🚨⚠
-A feature request that has not been accepted on the forum will be closed!
-⚠🚨⛔⛔⛔⛔⛔ ⬆ STOP & READ THIS ⬆ ⛔⛔⛔⛔⛔🚨⚠
-
-
-
-## Has it been discussed in the forum? Link to topic.
-
diff --git a/CliClient/locales/it_IT.po b/CliClient/locales/it_IT.po
index 72c0dada06..98477d0e29 100644
--- a/CliClient/locales/it_IT.po
+++ b/CliClient/locales/it_IT.po
@@ -1538,7 +1538,7 @@ msgid "Enable Fountain syntax support"
msgstr "Attiva supporto sintassi Fountain"
msgid "Show tray icon"
-msgstr "Visualizza tray icon"
+msgstr "Visualizza nella barra delle applicazioni"
msgid "Note: Does not work in all desktop environments."
msgstr "Nota: non funziona in tutti gli ambienti desktop."
@@ -1548,12 +1548,12 @@ msgid ""
"this setting so that your notes are constantly being synchronised, thus "
"reducing the number of conflicts."
msgstr ""
-"Questo consentirà Joplin di essere in esecuzione in background. E’ "
+"Questo consentirà a Joplin di essere in esecuzione in background. E’ "
"raccomandata l’attivazione di questa impostazione per sincronizzare "
"costantemente le tue note e quindi ridurre il numero di conflitti."
msgid "Start application minimised in the tray icon"
-msgstr "Avvia applicazione minimizzata nell’icona del vassoio"
+msgstr "Avvia applicazione minimizzata nella barra delle applicazioni"
msgid "Global zoom percentage"
msgstr "Percentuale di zoom globale"
diff --git a/ElectronClient/app/gui/MainScreen.jsx b/ElectronClient/app/gui/MainScreen.jsx
index c59013a5e7..d3eea307e4 100644
--- a/ElectronClient/app/gui/MainScreen.jsx
+++ b/ElectronClient/app/gui/MainScreen.jsx
@@ -245,7 +245,16 @@ class MainScreenComponent extends React.Component {
} else if (command.name === 'toggleSidebar') {
this.toggleSidebar();
} else if (command.name === 'showModalMessage') {
- this.setState({ modalLayer: { visible: true, message: command.message } });
+ this.setState({
+ modalLayer: {
+ visible: true,
+ message:
+ ,
+ },
+ });
} else if (command.name === 'hideModalMessage') {
this.setState({ modalLayer: { visible: false, message: '' } });
} else if (command.name === 'editAlarm') {
diff --git a/ElectronClient/app/style.css b/ElectronClient/app/style.css
index 03ffb2de64..378731a74e 100644
--- a/ElectronClient/app/style.css
+++ b/ElectronClient/app/style.css
@@ -149,3 +149,30 @@ a {
outline: 0 none;
}
+.modal-message {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ color: grey;
+ font-size: 1.2em;
+ margin: 40px 20px;
+}
+
+.modal-message #loading-animation {
+ margin-right: 20px;
+ width: 20px;
+ height: 20px;
+ border: 5px solid lightgrey;
+ border-top: 4px solid white;
+ border-radius: 50%;
+ transition-property: transform;
+ animation-name: rotate;
+ animation-duration: 1.2s;
+ animation-iteration-count: infinite;
+ animation-timing-function: linear;
+}
+
+@keyframes rotate {
+ from {transform: rotate(0deg);}
+ to {transform: rotate(360deg);}
+}
diff --git a/Joplin_install_and_update.sh b/Joplin_install_and_update.sh
index 0a6e2302c2..fd14282c13 100755
--- a/Joplin_install_and_update.sh
+++ b/Joplin_install_and_update.sh
@@ -1,14 +1,5 @@
#!/bin/bash
set -e
-# Title
-echo " _ _ _ "
-echo " | | ___ _ __ | (_)_ __ "
-echo " _ | |/ _ \| '_ \| | | '_ \ "
-echo "| |_| | (_) | |_) | | | | | |"
-echo " \___/ \___/| .__/|_|_|_| |_|"
-echo " |_|"
-echo ""
-echo "Linux Installer and Updater"
#-----------------------------------------------------
# Variables
@@ -16,8 +7,20 @@ echo "Linux Installer and Updater"
COLOR_RED=`tput setaf 1`
COLOR_GREEN=`tput setaf 2`
COLOR_RESET=`tput sgr0`
+SILENT=false
-# Check and warn if running as root.
+print() {
+ if [[ "$SILENT" == false ]] ; then
+ echo $1
+ fi
+}
+
+#-----------------------------------------------------
+# ARGUMENTS
+#-----------------------------------------------------
+
+# --allow-root
+## Check and warn if running as root.
if [[ $EUID = 0 ]] ; then
if [[ $* != *--allow-root* ]] ; then
echo "${COLOR_RED}It is not recommended (nor necessary) to run this script as root. To do so anyway, please use '--allow-root'${COLOR_RESET}"
@@ -25,53 +28,73 @@ if [[ $EUID = 0 ]] ; then
fi
fi
+# --silent
+## Mutes messages by console
+if [[ $* == *--silent* ]] ; then
+ SILENT=true
+fi
+
+#-----------------------------------------------------
+# START
+#-----------------------------------------------------
+
+# Title
+print " _ _ _ "
+print " | | ___ _ __ | (_)_ __ "
+print " _ | |/ _ \| '_ \| | | '_ \ "
+print "| |_| | (_) | |_) | | | | | |"
+print " \___/ \___/| .__/|_|_|_| |_|"
+print " |_|"
+print ""
+print "Linux Installer and Updater"
+
#-----------------------------------------------------
# Download Joplin
#-----------------------------------------------------
# Get the latest version to download
-version=$(wget -qO - "https://api.github.com/repos/laurent22/joplin/releases/latest" | grep -Po '"tag_name": "v\K.*?(?=")')
+RELEASE_VERSION=$(wget -qO - "https://api.github.com/repos/laurent22/joplin/releases/latest" | grep -Po '"tag_name": "v\K.*?(?=")')
# Check if it's in the latest version
-if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$version" ]]; then
+if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$RELEASE_VERSION" ]]; then
- echo 'Downloading Joplin...'
+ print 'Downloading Joplin...'
# Delete previous version (in future versions joplin.desktop shouldn't exist)
rm -f ~/.joplin/*.AppImage ~/.local/share/applications/joplin.desktop ~/.joplin/VERSION
-
+
# Creates the folder where the binary will be stored
mkdir -p ~/.joplin/
-
+
# Download the latest version
- wget -nv --show-progress -O ~/.joplin/Joplin.AppImage https://github.com/laurent22/joplin/releases/download/v$version/Joplin-$version-x86_64.AppImage
-
+ wget -nv --show-progress -O ~/.joplin/Joplin.AppImage https://github.com/laurent22/joplin/releases/download/v$RELEASE_VERSION/Joplin-$RELEASE_VERSION-x86_64.AppImage
+
# Gives execution privileges
chmod +x ~/.joplin/Joplin.AppImage
-
- echo "${COLOR_GREEN}OK${COLOR_RESET}"
-
+
+ print "${COLOR_GREEN}OK${COLOR_RESET}"
+
#-----------------------------------------------------
# Icon
#-----------------------------------------------------
-
+
# Download icon
- echo 'Downloading icon...'
+ print 'Downloading icon...'
mkdir -p ~/.local/share/icons/hicolor/512x512/apps
wget -nv -O ~/.local/share/icons/hicolor/512x512/apps/joplin.png https://joplinapp.org/images/Icon512.png
- echo "${COLOR_GREEN}OK${COLOR_RESET}"
-
- # Detect desktop environment
+ print "${COLOR_GREEN}OK${COLOR_RESET}"
+
+ # Detect desktop environment
if [ "$XDG_CURRENT_DESKTOP" = "" ]
then
- desktop=$(echo "$XDG_DATA_DIRS" | sed 's/.*\(xfce\|kde\|gnome\).*/\1/')
+ DESKTOP=$(echo "$XDG_DATA_DIRS" | sed 's/.*\(xfce\|kde\|gnome\).*/\1/')
else
- desktop=$XDG_CURRENT_DESKTOP
+ DESKTOP=$XDG_CURRENT_DESKTOP
fi
- desktop=${desktop,,} # convert to lower case
+ DESKTOP=${DESKTOP,,} # convert to lower case
# Create icon for Gnome
echo 'Create Desktop icon.'
- if [[ $desktop =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.* ]]
+ if [[ $DESKTOP =~ .*gnome.*|.*kde.*|.*xfce.*|.*mate.*|.*lxqt.*|.*unity.*|.*x-cinnamon.*|.*deepin.* ]]
then
: "${TMPDIR:=/tmp}"
# This command extracts to squashfs-root by default and can't be changed...
@@ -85,21 +108,22 @@ if [[ ! -e ~/.joplin/VERSION ]] || [[ $(< ~/.joplin/VERSION) != "$version" ]]; t
# On some systems this directory doesn't exist by default
mkdir -p ~/.local/share/applications
echo -e "[Desktop Entry]\nEncoding=UTF-8\nName=Joplin\nComment=Joplin for Desktop\nExec=/home/$USER/.joplin/Joplin.AppImage\nIcon=joplin\nStartupWMClass=Joplin\nType=Application\nCategories=Application;\n$APPIMAGE_VERSION" >> ~/.local/share/applications/appimagekit-joplin.desktop
- echo "${COLOR_GREEN}OK${COLOR_RESET}"
+ print "${COLOR_GREEN}OK${COLOR_RESET}"
else
- echo "${COLOR_RED}NOT DONE${COLOR_RESET}"
+ print "${COLOR_RED}NOT DONE${COLOR_RESET}"
fi
-
+
#-----------------------------------------------------
# Finish
#-----------------------------------------------------
-
# Informs the user that it has been installed and cleans variables
- echo "${COLOR_GREEN}Joplin version${COLOR_RESET}" $version "${COLOR_GREEN}installed.${COLOR_RESET}"
+ print "${COLOR_GREEN}Joplin version${COLOR_RESET}" $RELEASE_VERSION "${COLOR_GREEN}installed.${COLOR_RESET}"
+
# Add version
- echo $version > ~/.joplin/VERSION
+ echo $RELEASE_VERSION > ~/.joplin/VERSION
else
- echo "${COLOR_GREEN}You already have the latest version${COLOR_RESET}" $version "${COLOR_GREEN}installed.${COLOR_RESET}"
+ print "${COLOR_GREEN}You already have the latest version${COLOR_RESET}" $version "${COLOR_GREEN}installed.${COLOR_RESET}"
fi
-echo 'Bye!'
-unset version
+
+# Goodbye
+print 'Bye!'
diff --git a/readme/markdown.md b/readme/markdown.md
index 54cc53e653..fc32e61e71 100644
--- a/readme/markdown.md
+++ b/readme/markdown.md
@@ -24,6 +24,39 @@ This is a quick summary of the Markdown syntax.
| **Link** | This is detected as a link:
`https://joplinapp.org`
And this is a link with a title:
`[Joplin](https://joplinapp.org)`
| This is detected as a link:
https://joplinapp.org
And this is a link with a title:
[Joplin](https://joplinapp.org)
| **Images** | ``
| 
| **Horizontal Rule** | One rule:
\*\*\*
Another rule:
\-\-\-
| One rule:
Another rule:
+| **Tables** | [See below](#tables) |
+
+### Tables
+
+Tables are created using pipes `|` and and hyphens `-`. This is a Markdown table:
+
+ | First Header | Second Header |
+ | ------------- | ------------- |
+ | Content Cell | Content Cell |
+ | Content Cell | Content Cell |
+
+Which is rendered as:
+
+| First Header | Second Header |
+| ------------- | ------------- |
+| Content Cell | Content Cell |
+| Content Cell | Content Cell |
+
+Note that there must be at least 3 dashes separating each header cell.
+
+Colons can be used to align columns:
+
+ | Tables | Are | Cool |
+ | ------------- |:-------------:| -----:|
+ | col 3 is | right-aligned | $1600 |
+ | col 2 is | centered | $12 |
+
+Which is rendered as:
+
+| Tables | Are | Cool |
+| ------------- |:-------------:| -----:|
+| col 3 is | right-aligned | $1600 |
+| col 2 is | centered | $12 |
## Joplin Extras
@@ -90,4 +123,4 @@ Joplin supports a number of plugins that can be toggled on top the standard Mark
| [Emoji](https://github.com/markdown-it/markdown-it-emoji) | `:smile:` :smile: | See [this list](https://gist.github.com/rxaviers/7360908) for more emoji | no |
| [Insert](https://github.com/markdown-it/markdown-it-ins) | `++inserted++` | Transforms into `inserted` (inserted) | no |
| [Multitable](https://github.com/RedBug312/markdown-it-multimd-table) | See [MultiMarkdown](https://fletcher.github.io/MultiMarkdown-6/syntax/tables.html) page | Adds more power and customization to markdown tables | no |
-| [Fountain](https://fountain.io) | \`\`\`fountain
Your screenplay...
\`\`\` | Adds support for the Fountain markup language, a plain text markup language for screenwriting | no |
\ No newline at end of file
+| [Fountain](https://fountain.io) | \`\`\`fountain
Your screenplay...
\`\`\` | Adds support for the Fountain markup language, a plain text markup language for screenwriting | no |