From: Jeremy Benoist Date: Sun, 5 Feb 2017 20:08:39 +0000 (+0100) Subject: Merge pull request #2841 from Kdecherf/active-menu-search X-Git-Tag: 2.2.2~27 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=10caff98759d37ca1553895f6325611a994b3f88;hp=7d9a67de14bd49db96d87058b7bdfc26bdd53f6e;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2841 from Kdecherf/active-menu-search Show active list in the left menu during search --- diff --git a/docs/en/user/configuring_mobile.rst b/docs/en/user/configuring_mobile.rst new file mode 100644 index 00000000..2bcf3bcb --- /dev/null +++ b/docs/en/user/configuring_mobile.rst @@ -0,0 +1,13 @@ +Configuring Mobile Apps to Work With wallabag.it +================================================ + +Steps to configure the app +--------------------------- + +- First *create a new client* in the ``Developer`` section. The name of your app doesn't matter as much as the ``Client ID`` and the ``Client secret``. Write these two values down. +- When you download a mobile app, it's going to ask for the server address of the hosted wallabag instance. With wallabag.it that is: ``https://app.wallabag.it``. +- It's also going to ask for the aforementioned ``Client ID`` and ``secret``. Please insert those in the text fields, when asked. +- Lastly you need to provide your ``username`` and ``password``. These are the same credentials you use to login in to wallabag.it. + +Please also have a look at `Android `_. Especially the section on *known limitations*. + diff --git a/scripts/require.sh b/scripts/require.sh index ddfb3dd2..c48ab936 100644 --- a/scripts/require.sh +++ b/scripts/require.sh @@ -5,5 +5,5 @@ if [ ! -f composer.phar ]; then echo "composer.phar not found, we'll see if composer is installed globally." command -v composer >/dev/null 2>&1 || { echo >&2 "wallabag requires composer but it's not installed (see http://doc.wallabag.org/en/master/user/installation.html). Aborting."; exit 1; } else - COMPOSER_COMMAND='composer.phar' + COMPOSER_COMMAND='./composer.phar' fi