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 diff --git a/composer.json b/composer.json index 5f9e6c1d2..bfd42339b 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" } diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index 7da9fe6b7..42a12b2a7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -361,7 +361,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'