Add jquery and jquery-colorbox to Composer

[friendica.git] / composer.json

diff --git a/composer.json b/composer.json
index 6a72c130d4b9b2004ab35624b98b63258d8160a7..deef01bae3d59f602f2f2bbcd5a1040be2b552d6 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -13,19 +13,26 @@
                "issues": "https://github.com/friendica/friendica/issues"\r
        },\r
        "require": {\r
+               "php": ">5.6",\r
+               "ext-xml": "*",\r
                "ezyang/htmlpurifier": "~4.7.0",\r
                "mobiledetect/mobiledetectlib": "2.8.*",\r
                "league/html-to-markdown": "~4.4.1",\r
                "defuse/php-encryption": "1.*",\r
                "pear/Text_LanguageDetect": "1.*",\r
-               "pear-pear.php.net/Text_Highlighter": "*",\r
+               "pear/Text_Highlighter": "dev-master",\r
                "paragonie/random_compat": "^2.0",\r
-               "smarty/smarty": "^3.1"\r
+               "smarty/smarty": "^3.1",\r
+               "michelf/php-markdown": "^1.7",\r
+               "fxp/composer-asset-plugin": "~1.3",\r
+               "bower-asset/base64": "^1.0",\r
+               "npm-asset/jquery": "^2.2",\r
+               "npm-asset/jquery-colorbox": "^1.6"\r
        },\r
        "repositories": [\r
         {\r
-            "type": "pear",\r
-            "url": "https://pear.php.net"\r
+            "type": "vcs",\r
+            "url": "https://github.com/pear/Text_Highlighter"\r
         }\r
     ],\r
        "autoload": {\r
@@ -36,7 +43,13 @@
        "config": {\r
                "autoloader-suffix": "Friendica",\r
                "optimize-autoloader": true,\r
-               "preferred-install": "dist"\r
+               "preferred-install": "dist",\r
+               "fxp-asset": {\r
+            "installer-paths": {\r
+                "npm-asset-library": "vendor/asset",\r
+                "bower-asset-library": "vendor/asset"\r
+            }\r
+        }\r
        },\r
        "archive": {\r
                "exclude": [\r