Jeremy Benoist
|
68003139e1
|
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
|
2016-11-19 15:30:49 +01:00 |
|
Nicolas Lœuillet
|
540a9bc4a2
|
Added help on config screen
|
2016-11-17 09:22:39 +01:00 |
|
Nicolas Lœuillet
|
a42f38d9fb
|
Added a configuration to define the redirection after archiving an entry
Fix #496
|
2016-11-16 23:07:34 +01:00 |
|
Jeremy Benoist
|
94060509b8
|
Use more explicit check
|
2016-11-07 08:36:52 +01:00 |
|
Jeremy Benoist
|
206bade58a
|
Add ability to reset some datas
- annotations
- tags
- entries
|
2016-10-22 13:13:06 +02:00 |
|
Jeremy Benoist
|
876d77a67d
|
Better display and description
Confirmation message isn’t required since it is written in the delete description
|
2016-10-08 20:25:42 +02:00 |
|
Jeremy Benoist
|
c3396c65ef
|
Fix some tests
|
2016-10-08 14:07:13 +02:00 |
|
Nicolas Lœuillet
|
b840268711
|
Added a test to check if entries are also deleted
|
2016-10-08 13:27:18 +02:00 |
|
Nicolas Lœuillet
|
71254701b7
|
Changed tests
|
2016-10-08 13:27:18 +02:00 |
|
Nicolas Lœuillet
|
821bb87685
|
Added tests
|
2016-10-08 13:27:18 +02:00 |
|
Jeremy Benoist
|
eb4142e0af
|
Remove NewUser test from Config
|
2016-10-02 11:09:28 +02:00 |
|
Jeremy Benoist
|
bf3dc999e7
|
Add ability to edit a tagging rule
|
2016-10-01 16:52:05 +02:00 |
|
Jeremy Benoist
|
23634d5d84
|
Jump to Symfony 3.1
|
2016-06-22 17:59:35 +02:00 |
|