Merge pull request #1478 from K-Phoen/rule-based-tags

Rule based tags

diff --git a/composer.json b/composer.json
index 8fc5ce5bfb1a688986703cddb91ed27f4429cdd6..26608cdceadd04522b83ab77d062dfa7351a2dd5 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -86,6 +86,9 @@
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
+        ],
+        "build-parameters": [
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
         ]
     },
     "extra": {
@@ -93,7 +96,13 @@
         "symfony-web-dir": "web",
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
-            "file": "app/config/parameters.yml"
+            "file": "app/config/parameters.yml",
+            "env-map": {
+                "mailer_host": "WALLABAG_MAILER_HOST",
+                "mailer_user": "WALLABAG_MAILER_USER",
+                "mailer_password": "WALLABAG_MAILER_PASSWORD",
+                "secret": "WALLABAG_SECRET"
+            }
         }
     },
     "autoload": {

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
index 4aeadb4fd799f045ca700b2b91cf2ed082fb7055..0ba1ec277b8e407a8b58f34f7c8a986b5e18746f 100755 (executable)
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/public/css/main.css
@@ -771,7 +771,7 @@ a.add-to-wallabag-link-after:after {
 /* Diaspora */
 .icon-image--diaspora {
  background-image: url('../../_global/img/icons/diaspora-icon--black.png');
-}}
+}
 
 /* ==========================================================================
    Icon selected