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 (file)
index 0000000..2bcf3bc
--- /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 <android>`_. Especially the section on *known limitations*.
+

diff --git a/scripts/require.sh b/scripts/require.sh
index ddfb3dd2a9659d4a8dca7d76dfbec26c71715c76..c48ab936870871a2b81fff865db76d21bd0e2405 100644 (file)
--- 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