diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-03-08 17:02:34 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2016-06-09 17:12:51 +0200 |
commit | 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 (patch) | |
tree | 03ee1eab0d89d1857daca9e273fd8c9ca47e33c2 /docs/en/user/android.rst | |
parent | 9f95b14dec88cf083cefa38d5fbd84189e07acac (diff) | |
download | wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.tar.gz wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.tar.zst wallabag-5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3.zip |
manage assets through npm
first draft
remote assetic totally
work
nearly there
use at least nodejs > 0.12
use proper version of grunt
bump nodejs version for travis
update npm
workaround for materialize
install node 5.0
add grunt-cli
baggy theme & cache node modules
cache bower & npm
make travis build assets on php7 only
exclude installing node & npm if not needed & use bash
clean & try to make icomoon work on baggy
ready
config for travis
rebase
make travis work
more travis work
impove travis & update deps
add missing pixrem deps
add module through oddly lost
ui updates
install latest nodejs
add install_dev.sh, link local binaries for npm/bower/grunt
ui improvements (mostly baggy)
fix travis build
no need to install on travis
Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
Add unread filter test to EntryControllerTest
Add a new test to the EntryControllerTest collection which checks that
only entries which have not been archived (and are treated as "unread")
are retrieved.
Improve English translation
Update FAQ
-Fix grammar
-Add notes about MTA, firewall, and SELinux
Update installation instructions
-Fix grammar
-Add SELinux section
add screenshots of android docu in English
Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
Move fixtures to the right place
Display a message when saving an entry failed
When saving an entry fail because of database error we previously just returned `false`.
Now we got an error in the log and the displayed notice to the user is updated too.
Change ManyToMany between entry & tag
Following https://gist.github.com/Ocramius/3121916
Be sure to remove the related entity when removing an entity.
Let say you have Entry -> EntryTag -> Tag.
If you remove the entry:
- before that commit, the EntryTag will stay (at least using SQLite).
- with that commit, the related entity is removed
Prepare wallabag 2.0.5
enforce older materialize version
Diffstat (limited to 'docs/en/user/android.rst')
-rw-r--r-- | docs/en/user/android.rst | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/docs/en/user/android.rst b/docs/en/user/android.rst index c13cf031..4271f037 100644 --- a/docs/en/user/android.rst +++ b/docs/en/user/android.rst | |||
@@ -13,61 +13,61 @@ Steps to configure your app | |||
13 | 13 | ||
14 | When you first start the app, you see the welcome screen, where you are adviced to configure the app for your wallabag instance at first. | 14 | When you first start the app, you see the welcome screen, where you are adviced to configure the app for your wallabag instance at first. |
15 | 15 | ||
16 | .. image:: ../../img/user/android_welcome_screen.de.png | 16 | .. image:: ../../img/user/android_welcome_screen.en.png |
17 | :alt: Welcome screen | 17 | :alt: Welcome screen |
18 | :align: center | 18 | :align: center |
19 | 19 | ||
20 | Just confirm that message and you get redirected to the settings screen. | 20 | Just confirm that message and you get redirected to the settings screen. |
21 | 21 | ||
22 | .. image:: ../../img/user/android_configuration_screen.de.png | 22 | .. image:: ../../img/user/android_configuration_screen.en.png |
23 | :alt: Settings screen | 23 | :alt: Settings screen |
24 | :align: center | 24 | :align: center |
25 | 25 | ||
26 | Fill in your wallabag data. You need to enter your wallabag address. It is important that this URL does not end with a slash. Also add your wallabag credentials to the user name and password field. | 26 | Fill in your wallabag data. You need to enter your wallabag address. It is important that this URL does not end with a slash. Also add your wallabag credentials to the user name and password field. |
27 | 27 | ||
28 | .. image:: ../../img/user/android_configuration_filled_in.de.png | 28 | .. image:: ../../img/user/android_configuration_filled_in.en.png |
29 | :alt: Filled in settings | 29 | :alt: Filled in settings |
30 | :align: center | 30 | :align: center |
31 | 31 | ||
32 | After you have filled in your data, push the button Connection test and wait for the test to finish. | 32 | After you have filled in your data, push the button Connection test and wait for the test to finish. |
33 | 33 | ||
34 | .. image:: ../../img/user/android_configuration_connection_test.de.png | 34 | .. image:: ../../img/user/android_configuration_connection_test.en.png |
35 | :alt: Connection test with your wallabag data | 35 | :alt: Connection test with your wallabag data |
36 | :align: center | 36 | :align: center |
37 | 37 | ||
38 | The connection test shall finish with success. If not, you need to fix this first until you proceed. | 38 | The connection test shall finish with success. If not, you need to fix this first until you proceed. |
39 | 39 | ||
40 | .. image:: ../../img/user/android_configuration_connection_test_success.de.png | 40 | .. image:: ../../img/user/android_configuration_connection_test_success.en.png |
41 | :alt: Connection test successful | 41 | :alt: Connection test successful |
42 | :align: center | 42 | :align: center |
43 | 43 | ||
44 | After the connection test was successful, you can push the button to get your feed credentials. The app now tries to login to your wallabag instance and get the user id and the corresponding token for the feeds. | 44 | After the connection test was successful, you can push the button to get your feed credentials. The app now tries to login to your wallabag instance and get the user id and the corresponding token for the feeds. |
45 | 45 | ||
46 | .. image:: ../../img/user/android_configuration_get_feed_credentials.de.png | 46 | .. image:: ../../img/user/android_configuration_get_feed_credentials.en.png |
47 | :alt: Getting the feed credentials | 47 | :alt: Getting the feed credentials |
48 | :align: center | 48 | :align: center |
49 | 49 | ||
50 | When the process of getting your feed credentials finishes with success you see a toast message that the user id and the token were automatically filled in to the form. | 50 | When the process of getting your feed credentials finishes with success you see a toast message that the user id and the token were automatically filled in to the form. |
51 | 51 | ||
52 | .. image:: ../../img/user/android_configuration_feed_credentials_automatically_filled_in.de.png | 52 | .. image:: ../../img/user/android_configuration_feed_credentials_automatically_filled_in.en.png |
53 | :alt: Getting feed credentials successful | 53 | :alt: Getting feed credentials successful |
54 | :align: center | 54 | :align: center |
55 | 55 | ||
56 | Now you need to scroll to the bottom of the settings menu. Of course you can adjust the given settings to your needs. Finish the configuration of your app with pushing the save button. | 56 | Now you need to scroll to the bottom of the settings menu. Of course you can adjust the given settings to your needs. Finish the configuration of your app with pushing the save button. |
57 | 57 | ||
58 | .. image:: ../../img/user/android_configuration_scroll_bottom.de.png | 58 | .. image:: ../../img/user/android_configuration_scroll_bottom.en.png |
59 | :alt: Bottom of the settings screen | 59 | :alt: Bottom of the settings screen |
60 | :align: center | 60 | :align: center |
61 | 61 | ||
62 | After hitting the save button, you get the following screen. The app proposes to initiate a syncronisation process to update your feeds of articles. It is recommended to acknowledge this action and press Yes. | 62 | After hitting the save button, you get the following screen. The app proposes to initiate a syncronisation process to update your feeds of articles. It is recommended to acknowledge this action and press Yes. |
63 | 63 | ||
64 | .. image:: ../../img/user/android_configuration_saved_feed_update.de.png | 64 | .. image:: ../../img/user/android_configuration_saved_feed_update.en.png |
65 | :alt: Settings saved the first time | 65 | :alt: Settings saved the first time |
66 | :align: center | 66 | :align: center |
67 | 67 | ||
68 | Finally after the syncronisation finished successfully, you are presented the list of unread articles. | 68 | Finally after the syncronisation finished successfully, you are presented the list of unread articles. |
69 | 69 | ||
70 | .. image:: ../../img/user/android_unread_feed_synced.de.png | 70 | .. image:: ../../img/user/android_unread_feed_synced.en.png |
71 | :alt: Filled article list cause feeds successfully syncronized | 71 | :alt: Filled article list cause feeds successfully syncronized |
72 | :align: center | 72 | :align: center |
73 | 73 | ||