Commit graph

140 commits

Author SHA1 Message Date
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
Nicolas Lœuillet
bb624c0269 Reordered 🇫🇷 documentation 2016-11-17 19:22:16 +01:00
Nicolas Lœuillet
2e389b0b90 Reordered documentation 2016-11-17 19:22:15 +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
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
Jeremy Benoist
31151d70f2
Add doc 2016-11-06 21:23:38 +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
Jeremy Benoist
5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +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
Jeremy Benoist
64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist
f623516e10
SQLite should use utf8, not utf8mb4 2016-10-24 10:10:38 +02:00
Nicolas Lœuillet
67aa755fb5
Added 🇫🇷 documentation for wallabag backup 2016-10-22 14:16:17 +02:00
Nicolas Lœuillet
f69636c4db Merge pull request #2484 from bmillemathias/fix_2479
Document what to backup in Wallabag
2016-10-22 13:55:46 +02:00
Baptiste Mille-Mathias
89abc0b61b Add missing words in the documentation 2016-10-22 13:21:53 +02:00
Jeremy Benoist
b0de88f75d
Use statements & update translation 2016-10-22 13:13:07 +02:00
Baptiste Mille-Mathias
fc75009de7 Document what to backup in Wallabag
Fixes issue #2479
2016-10-22 09:14:07 +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
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
8b28151e14 Merge pull request #2434 from wallabag/parameters-doc
Added french documentation for parameters.yml
2016-10-13 16:53:13 +02:00
zertrin
a25377cb4c Minor fixes in the english documentation 2016-10-13 11:07:24 +02:00
Nicolas Lœuillet
b09cafbb3f
Added french documentation for upgrade 2016-10-12 13:37:50 +02:00
Nicolas Lœuillet
18470d7c6a Added french documentation for parameters.yml 2016-10-12 13:19:45 +02:00
Jeremy Benoist
e4cf672ccf
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
Nicolas Lœuillet
36ef9e2730
Fixed display for note in installation page 2016-10-10 18:51:20 +02:00
Nicolas Lœuillet
c15f083896
Fixed links on import page 2016-10-10 15:38:42 +02:00
Jeremy Benoist
035513b025 Use table for parameters.yml 2016-10-10 13:42:50 +02:00
Nicolas Lœuillet
ed11d7f731
Added page about parameters.yml 2016-10-10 13:01:14 +02:00
Nicolas Lœuillet
eb54d338e8
Typos in upgrade doc 2016-10-10 11:35:32 +02:00
Nicolas Lœuillet
7c1ce28342
Update upgrade documentation 2016-10-10 11:21:20 +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
Nicolas Lœuillet
7eff4736a1
Cleaned up documentation for installation process 2016-10-08 15:10:56 +02:00
Nicolas Lœuillet
bb0c78f4a6
Added check if there is only one user
Added translations and documentation
2016-10-08 13:27:18 +02:00
Nicolas Lœuillet
4e5d219663
Fixed review 2016-10-07 15:27:05 +02:00
Nicolas Lœuillet
fba816c43b
Added link to fivefilters website 2016-10-07 15:14:15 +02:00
Nicolas Lœuillet
9cfea18a5d
Fixed review 2016-10-07 14:40:32 +02:00
Nicolas Lœuillet
baf0ffa7df
Added documentation about siteconfig fix
Found in #2358, thank you @j0k3r
2016-10-07 14:17:13 +02:00
Nicolas Lœuillet
837247dea4
Update md5 hash for package 2016-10-04 17:43:28 +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