Merge pull request #2092 from Rurik19/issue2089

Starred and Archived clears if article is already exists

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index 0b92775aaa220aef5aa64697c4d340c9ff9e15cb..920f19055076558296d414b01c9826e447afdf8b 100644 (file)
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -3,22 +3,11 @@
 ## You found a bug
 Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
 
-To fix the bug quickly, we need some infos:
-* your wallabag version (in `app/config/config.yml`, see `wallabag_core.version`)
-* your webserver installation :
-  * type of hosting (shared or dedicated)
-  * in case of a dedicated server, the server and OS used
-  * the php version used, eventually `phpinfo()`
-* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL)
-* any particular details which could be related
+To fix the bug quickly, we need some infos: please answer to the questions in the issue form.
 
-If relevant :
-* the link you want to save and which causes problem
-* the file you want to import into wallabag, or just an extract
-
-If you have the skills, look for errors into php, server and application (see `var/logs`) logs
+If you have the skills, look for errors into php, server and application (see `var/logs`) logs.
 
 Note : If you have large portions of text, use [Github's Gist service](https://gist.github.com/) or other pastebin-like.
 
 ## You want to fix a bug or to add a feature
-Please fork wallabag and work with **the v2 branch** only. **Do not work on master branch**.
+Please fork wallabag and work with **the master branch**.

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index cc4038c5803b200e4586dfae19a62c1b10f322fc..1d5692264d6a8016627da7f147b112bc479b8884 100644 (file)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -32,7 +32,7 @@
 
                         <div class="card-content">
                             {% if not entry.previewPicture is null %}
-                                <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-vert right"></i>
+                                <i class="card-title grey-text text-darken-4 activator mdi-navigation-more-horiz right"></i>
                             {% endif %}
 
                             <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>