Merge pull request #1353 from wallabag/v2-pluriel

check if one entry or not

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 4b722677dfb96b368c393998f0a8bec4ffccd99d..08f4a3e98cd9fa74e64c49794a26d551f2525275 100644 (file)
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -16,8 +16,8 @@ tools:
     php_code_sniffer: true
     php_pdepend: true
     sensiolabs_security_checker: true
-    external_code_coverage:
-        timeout: 1800
+    #external_code_coverage:
+    #    timeout: 3600
     php_code_coverage: true
     php_sim: false
     php_cpd: false

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 58bc7134545a15b10f765e033320b83216c35c7d..ffb29f9eb249282c351dfd461f2a5b8edc5a5adf 100644 (file)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,8 +6,8 @@ Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
 To fix the bug quickly, we need some infos:
 * your wallabag version (on top of the ./index.php file, and also on config page)
 * your webserver installation :
-  * type of hosting (shared or dedicaced)
-  * in case of a dedicaced server, the server and OS used
+  * 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 problem on the `wallabag_compatibility_test.php` page
@@ -27,4 +27,4 @@ Note : If you have large portions of text, use [Github's Gist service](https://g
 ## You want to fix a bug or to add a feature
 Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**.
 
-[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).
\ No newline at end of file
+[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).

diff --git a/COPYING.md b/COPYING.md
index c43f619a3a99389db14326c4a3f14f0d34e6270d..b30299fe441928c81c9d475b1f58d7e1298035c8 100644 (file)
--- a/COPYING.md
+++ b/COPYING.md
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 Nicolas Lœuillet\r
+Copyright (c) 2013-2015 Nicolas Lœuillet\r
 \r
 Permission is hereby granted, free of charge, to any person obtaining a copy\r
 of this software and associated documentation files (the "Software"), to deal\r
@@ -16,4 +16,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
-THE SOFTWARE.
\ No newline at end of file
+THE SOFTWARE.\r

diff --git a/CREDITS.md b/CREDITS.md
index e76c580d38bd8060fdef8fd55a0e186617f4deb4..e3916170f1200d25aca5864d3ae3f53eeb97fab2 100644 (file)
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,17 +1,6 @@
-wallabag is based on :
-* PHP Readability https://bitbucket.org/fivefilters/php-readability
-* Full Text RSS http://code.fivefilters.org/full-text-rss/src
-* logo by Maylis Agniel https://github.com/wallabag/logo
-* icons http://icomoon.io
-* PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
-* Session https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
-* Twig http://twig.sensiolabs.org
-* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
-* Pagination https://github.com/daveismyname/pagination
-* PHPePub https://github.com/Grandt/PHPePub/
+wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb) under the MIT License.
 
-wallabag is mainly developed by Nicolas Lœuillet under the MIT License
+Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r).
 
-Thank you so much to @tcitworld and @mariroz.
-
-Contributors : https://github.com/wallabag/wallabag/graphs/contributors
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors
+).

diff --git a/composer.json b/composer.json
index 5c093257e3e355896ea13e3fe0700cc2d87cfad6..19db9814a2ee5d4f06f15e3f3b6a9f574a7ef8ef 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -16,6 +16,10 @@
             "name": "Thomas Citharel",
             "homepage": "http://tcit.fr",
             "role": "Developer"
+        },
+        {
+            "name": "Jérémy Benoist",
+            "role": "Developer"
         }
     ],
     "support": {

diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
index 636ba3246e3a819fd8edc781704629b85d66f599..2fa2f8a08033beada4f9e36436e3373b45a68dc9 100644 (file)
--- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
@@ -10,7 +10,21 @@ class EntryFilterType extends AbstractType
 {
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('readingTime', 'filter_number_range');
+        $builder
+            ->add('readingTime', 'filter_number_range')
+            ->add('createdAt', 'filter_date_range', array(
+                    'left_date_options' => array(
+                        'attr' => array(
+                            'placeholder' => 'dd/mm/yyyy'),
+                        'format' => 'dd/MM/yyyy',
+                        'widget' => 'single_text'
+                    ),
+                    'right_date_options' => array(
+                        'attr' => array(
+                            'placeholder' => 'dd/mm/yyyy'),
+                        'format' => 'dd/MM/yyyy',
+                        'widget' => 'single_text'
+                    )));
     }
 
     public function getName()

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 b2e2e8d0d73f92efed5ff7c06fec9f13c97e99d1..d6dd7c376a836c4453b30dd55f3e8bffc81b8738 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
@@ -82,7 +82,7 @@
                 </div>
 
                 <div class="col s6">
-                    <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a>
+                    <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a>
                 </div>
 
                 <div class="col s6">

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
index 0339eba02fdf73b630ebb9f65e2bf84c46dab5ed..c0700c2cbbeac312c3716093de2f247999e487a9 100755 (executable)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js
@@ -3,7 +3,7 @@ function init_filters() {
     if ($("div").is("#filters")) {
         $('#button_filters').show();
         $('.button-collapse-right').sideNav({ edge: 'right' });
-        $('#clean_form_filters').on('click', function(){
+        $('#clear_form_filters').on('click', function(){
             $('#filters input').val('');
             return false;
         });