Commit graph

61 commits

Author SHA1 Message Date
Jeremy Benoist
27dce581ca
Messed up DE import translation 2016-11-19 15:39:02 +01:00
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
10b3509757
Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
Julian Oster
2bc5b74c73 Reordered documentation for German. 2016-11-17 19:22:21 +01:00
Nicolas Lœuillet
540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
Strubbl
5d52cc411b
update German configuration.rst 2016-11-16 23:07:34 +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
Olivier DOSSMANN
ccad5d7629 fix #2582 - Nginx config: disable all other PHP file from symphony
Regarding
https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/ we
need to limit access to config.php and make_dev.php files from Nginx.
That's why we return 404 error page for these files.
2016-11-14 11:58:26 +01:00
Strubbl
82f9a52078 docs: update german import.rst 2016-11-07 21:00:57 +01:00
Jeremy Benoist
2e4efb5965
Add english doc into german one 2016-11-06 23:27:55 +01:00
Nicolas Lœuillet
0c256e2e70
Updated default parameters.yml file in documentation 2016-11-06 09:11:12 +01:00
Nicolas Lœuillet
bc12f08bda
Update the upgrade documentation 2016-11-05 14:15:09 +01:00
Nicolas Lœuillet
a3f7d8a870
Prepare wallabag 2.1.3 🚀 2016-11-04 09:10:15 +01:00
Strubbl
b1057c6a5e update German faq.rst 2016-11-02 17:16:57 +01:00
Strubbl
cce77ebc2d update German faq.rst 2016-11-02 17:15:32 +01:00
Nicolas Lœuillet
4b5e95c0e5
Added more info about Doctrine / PHP bug 2016-11-02 17:02:48 +01:00
Nicolas Lœuillet
585fd2a4ad
Added documentation about failed to load external entity error
Fix #2529
2016-11-02 16:58:20 +01:00
Julian Oster
2ca1cc0c18 Translate backup.rst to German 2016-10-22 21:11:20 +02:00
Nicolas Lœuillet
67aa755fb5
Added 🇫🇷 documentation for wallabag backup 2016-10-22 14:16:17 +02:00
Nicolas Lœuillet
39c3dd30d2 Removed MD5 hash in documentation 2016-10-17 11:38:11 +02:00
Nicolas Lœuillet
7131f94274 Merge pull request #2446 from wallabag/fix-taggingrules-doc
Added information about tagging rules in documentation
2016-10-15 11:47:12 +02:00
Sven Fischer
f878902e6a docs/de/user/configuration.rst: German fix for tagging rules docu 2016-10-14 23:48:50 +02:00
Sven Fischer
2752053f99 docs/de/user/configuration.rst: German fix for tagging rules docu 2016-10-14 23:47:37 +02:00
Nicolas Lœuillet
8edb250caa
Added information about tagging rules in documentation
Fix #2060
2016-10-14 14:45:32 +02:00
Nicolas Lœuillet
bf8e088033 Merge pull request #2435 from wallabag/french-upgrade-doc
Added french documentation for upgrade
2016-10-13 16:56:37 +02:00
Nicolas Lœuillet
83634bab22 Added missing space 2016-10-13 16:56:03 +02:00
Sven Fischer
17064d3c54 update German user/upgrade-2.1.x-2.1.y.rst 2016-10-12 20:45:28 +02:00
Sven Fischer
f68e351018 update German user/upgrade-2.0.x-2.1.1 2016-10-12 20:41:15 +02:00
Sven Fischer
75a1506c27 translate to German: user/parameters 2016-10-12 20:33:55 +02:00
Nicolas Lœuillet
b09cafbb3f
Added french documentation for upgrade 2016-10-12 13:37:50 +02:00
Nicolas Lœuillet
36ef9e2730
Fixed display for note in installation page 2016-10-10 18:51:20 +02:00
Nicolas Lœuillet
ed11d7f731
Added page about parameters.yml 2016-10-10 13:01:14 +02:00
Nicolas Lœuillet
7c1225347d
Update documentation 2016-10-10 10:20:32 +02:00
Nicolas Lœuillet
84e3c36e02
Added documentation about testsuite
Fix #2415
2016-10-10 09:15:53 +02:00
Strubbl
5112b3556b update German installation.rst 2016-10-08 20:28:18 +02:00
Strubbl
5334381509 update German installation.rst 2016-10-08 20:25:48 +02:00
Nicolas Lœuillet
7eff4736a1
Cleaned up documentation for installation process 2016-10-08 15:10:56 +02:00
Nicolas Lœuillet
837247dea4
Update md5 hash for package 2016-10-04 17:43:28 +02:00
Jeremy Benoist
8ebb214ec4
Typo 2016-10-04 17:12:45 +02:00
Nicolas Lœuillet
5958597ba6
Prepare wallabag 2.1.1 2016-10-04 17:08:34 +02:00
Thomas Citharel
57386125ab Merge pull request #2353 from wallabag/assets-fix
Basically, fix everything
2016-10-04 16:26:50 +02:00
Jeremy Benoist
f440e28281
Update doc
Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
2016-10-04 10:31:03 +02:00
Zayon
f7265b4b9d Add php-bcmath extension to requirements
Fix issue #2342
2016-10-03 23:29:21 +02:00
Jeremy Benoist
88d8125a5f
Ensure cache is clear before upgrading
If we changed some namespace / classes, we need to refresh the cache before anything else.
2016-10-03 14:44:16 +02:00
Jeremy Benoist
8fdb5e5766
Re-add wallabag:install 2016-10-03 14:21:49 +02:00
Nicolas Lœuillet
9d3603147b
Update md5 hash for wallabag 2.1.0 2016-10-03 11:16:35 +02:00
Nicolas Lœuillet
12f7fd004a
Prepare wallabag 2.1.0 🚀 2016-10-03 09:16:57 +02:00
Julian Oster
34e4c12604 Little improvements to the german translation 2016-09-28 13:52:06 +02:00
Strubbl
ff1f55c2a0 update German upgrade-2.0.x-2.1.y.rst 2016-09-28 12:26:29 +02:00
Nicolas Lœuillet
9866d39431
Fixed review 2016-09-28 11:59:35 +02:00