aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.scrutinizer.yml4
-rw-r--r--CONTRIBUTING.md6
-rw-r--r--COPYING.md4
-rw-r--r--CREDITS.md19
-rw-r--r--composer.json4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig2
-rwxr-xr-xsrc/Wallabag/CoreBundle/Resources/views/themes/material/public/js/init.js2
7 files changed, 17 insertions, 24 deletions
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 4b722677..08f4a3e9 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -16,8 +16,8 @@ tools:
16 php_code_sniffer: true 16 php_code_sniffer: true
17 php_pdepend: true 17 php_pdepend: true
18 sensiolabs_security_checker: true 18 sensiolabs_security_checker: true
19 external_code_coverage: 19 #external_code_coverage:
20 timeout: 1800 20 # timeout: 3600
21 php_code_coverage: true 21 php_code_coverage: true
22 php_sim: false 22 php_sim: false
23 php_cpd: false 23 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).
6To fix the bug quickly, we need some infos: 6To fix the bug quickly, we need some infos:
7* your wallabag version (on top of the ./index.php file, and also on config page) 7* your wallabag version (on top of the ./index.php file, and also on config page)
8* your webserver installation : 8* your webserver installation :
9 * type of hosting (shared or dedicaced) 9 * type of hosting (shared or dedicated)
10 * in case of a dedicaced server, the server and OS used 10 * in case of a dedicated server, the server and OS used
11 * the php version used, eventually `phpinfo()` 11 * the php version used, eventually `phpinfo()`
12* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL) 12* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL)
13* any problem on the `wallabag_compatibility_test.php` page 13* 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
27## You want to fix a bug or to add a feature 27## You want to fix a bug or to add a feature
28Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**. 28Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**.
29 29
30[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md). \ No newline at end of file 30[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 @@
1Copyright (c) 2013-2014 Nicolas Lœuillet 1Copyright (c) 2013-2015 Nicolas Lœuillet
2 2
3Permission is hereby granted, free of charge, to any person obtaining a copy 3Permission is hereby granted, free of charge, to any person obtaining a copy
4of this software and associated documentation files (the "Software"), to deal 4of 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
16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 16AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 17LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN 18OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
19THE SOFTWARE. \ No newline at end of file 19THE SOFTWARE.
diff --git a/CREDITS.md b/CREDITS.md
index e76c580d..e3916170 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,17 +1,6 @@
1wallabag is based on : 1wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb) under the MIT License.
2* PHP Readability https://bitbucket.org/fivefilters/php-readability
3* Full Text RSS http://code.fivefilters.org/full-text-rss/src
4* logo by Maylis Agniel https://github.com/wallabag/logo
5* icons http://icomoon.io
6* PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
7* Session https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
8* Twig http://twig.sensiolabs.org
9* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
10* Pagination https://github.com/daveismyname/pagination
11* PHPePub https://github.com/Grandt/PHPePub/
12 2
13wallabag is mainly developed by Nicolasuillet under the MIT License 3Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r).
14 4
15Thank you so much to @tcitworld and @mariroz. 5Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors
16 6).
17Contributors : 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 @@
16 "name": "Thomas Citharel", 16 "name": "Thomas Citharel",
17 "homepage": "http://tcit.fr", 17 "homepage": "http://tcit.fr",
18 "role": "Developer" 18 "role": "Developer"
19 },
20 {
21 "name": "Jérémy Benoist",
22 "role": "Developer"
19 } 23 }
20 ], 24 ],
21 "support": { 25 "support": {
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 d0ebdad6..8fc6e8f6 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
@@ -96,7 +96,7 @@
96 </div> 96 </div>
97 97
98 <div class="col s6"> 98 <div class="col s6">
99 <a href="#!" class="center waves-effect waves-green btn-flat" id="clean_form_filters">{% trans %}Clean{% endtrans %}</a> 99 <a href="#!" class="center waves-effect waves-green btn-flat" id="clear_form_filters">{% trans %}Clear{% endtrans %}</a>
100 </div> 100 </div>
101 101
102 <div class="col s6"> 102 <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 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() {
3 if ($("div").is("#filters")) { 3 if ($("div").is("#filters")) {
4 $('#button_filters').show(); 4 $('#button_filters').show();
5 $('.button-collapse-right').sideNav({ edge: 'right' }); 5 $('.button-collapse-right').sideNav({ edge: 'right' });
6 $('#clean_form_filters').on('click', function(){ 6 $('#clear_form_filters').on('click', function(){
7 $('#filters input').val(''); 7 $('#filters input').val('');
8 return false; 8 return false;
9 }); 9 });