From f972af3f5b85f416a987aca4a6a0e81cae6883d4 Mon Sep 17 00:00:00 2001 From: Olivier Mehani Date: Sat, 22 Apr 2017 21:45:28 +1000 Subject: [PATCH 1/3] Make symfony-assets-install use `relative` symlinks This facilitates packaging, when installing in a different work PREFIX than the final install location. Signed-off-by: Olivier Mehani --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c43d2dcf5..7f16e6910 100644 --- a/composer.json +++ b/composer.json @@ -115,7 +115,7 @@ "symfony-var-dir": "var", "symfony-web-dir": "web", "symfony-tests-dir": "tests", - "symfony-assets-install": "symlink", + "symfony-assets-install": "relative", "incenteev-parameters": { "file": "app/config/parameters.yml" } From ef88b37eb59a00aec5ac16f3c2e1e29053bd5ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gillet?= Date: Sat, 29 Apr 2017 11:37:59 +0200 Subject: [PATCH 2/3] Correct create_application en string --- src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 8e7e3c2ce..df782b010 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -359,7 +359,7 @@ quickstart: developer: title: 'Developers' description: 'We also thought to the developers: Docker, API, translations, etc.' - create_application: 'Create your third application' + create_application: 'Create your third-party application' use_docker: 'Use Docker to install wallabag' docs: title: 'Full documentation' From d49cdfe2efc9c747c0dad9fed7e3b0f11b5a72d7 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 29 Apr 2017 19:41:14 +0200 Subject: [PATCH 3/3] Ignore tests exported files --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 84fb95d7e..0bcbabb8c 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,7 @@ bin app/Resources/build/ !/src/Wallabag/CoreBundle/Resources/public /src/Wallabag/CoreBundle/Resources/public/* + +# Test-generated files +admin-export.json +specialexport.json