From: Jeremy Benoist Date: Tue, 18 Aug 2015 12:29:10 +0000 (+0200) Subject: Merge pull request #1353 from wallabag/v2-pluriel X-Git-Tag: 2.0.0-alpha.0~29 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=54f2b4a254345a58cd03b872bd772863855c7f1f;hp=428af5a8c368f27ef7f1027a6bbd37b6f9cded60;p=github%2Fwallabag%2Fwallabag.git Merge pull request #1353 from wallabag/v2-pluriel check if one entry or not --- diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 4b722677..08f4a3e9 100644 --- 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 58bc7134..ffb29f9e 100644 --- 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 c43f619a..b30299fe 100644 --- a/COPYING.md +++ b/COPYING.md @@ -1,4 +1,4 @@ -Copyright (c) 2013-2014 Nicolas Lœuillet +Copyright (c) 2013-2015 Nicolas Lœuillet Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -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 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. \ No newline at end of file +THE SOFTWARE. diff --git a/CREDITS.md b/CREDITS.md index e76c580d..e3916170 100644 --- 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 5c093257..19db9814 100644 --- 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 636ba324..2fa2f8a0 100644 --- 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 b2e2e8d0..d6dd7c37 100644 --- 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 @@
- {% trans %}Clean{% endtrans %} + {% trans %}Clear{% endtrans %}
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 0339eba0..c0700c2c 100755 --- 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; });