X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=composer.json;h=00b93b6bb89ec4a07fbb3018d676202cd70fc51c;hb=15afcd5378cc973ae1f255ac3ac2be6a30fbbf20;hp=76f253401e8131dd090e07ef9a6a74b9a57dcd1d;hpb=448ae08dd5962d3138ab83c58fa2a6cd92d6e3c1;p=friendica.git

diff --git a/composer.json b/composer.json
index 76f253401e..00b93b6bb8 100644
--- a/composer.json
+++ b/composer.json
@@ -13,20 +13,31 @@
 		"issues": "https://github.com/friendica/friendica/issues"
 	},
 	"require": {
+		"php": ">5.6",
+		"ext-xml": "*",
 		"ezyang/htmlpurifier": "~4.7.0",
-		"mobiledetect/mobiledetectlib": "2.8.*",
 		"league/html-to-markdown": "~4.4.1",
-		"defuse/php-encryption": "1.*",
-		"pear/Text_LanguageDetect": "1.*",
-		"pear-pear.php.net/Text_Highlighter": "*",
+		"lightopenid/lightopenid": "dev-master",
+		"michelf/php-markdown": "^1.7",
+		"mobiledetect/mobiledetectlib": "2.8.*",
 		"paragonie/random_compat": "^2.0",
+		"pear/Text_LanguageDetect": "1.*",
+		"pear/Text_Highlighter": "dev-master",
 		"smarty/smarty": "^3.1",
-		"michelf/php-markdown": "^1.7"
+		"fxp/composer-asset-plugin": "~1.3",
+		"bower-asset/base64": "^1.0",
+		"bower-asset/Chart-js": "^2.7",
+		"bower-asset/perfect-scrollbar": "^0.6",
+		"npm-asset/jquery": "^2.0",
+		"npm-asset/jquery-colorbox": "^1.6",
+		"npm-asset/jquery-datetimepicker": "^2.4.0",
+		"npm-asset/jgrowl": "^1.4",
+		"npm-asset/fullcalendar": "^3.0.1"
 	},
 	"repositories": [
         {
-            "type": "pear",
-            "url": "https://pear.php.net"
+            "type": "vcs",
+            "url": "https://github.com/pear/Text_Highlighter"
         }
     ],
 	"autoload": {
@@ -37,7 +48,13 @@
 	"config": {
 		"autoloader-suffix": "Friendica",
 		"optimize-autoloader": true,
-		"preferred-install": "dist"
+		"preferred-install": "dist",
+		"fxp-asset": {
+            "installer-paths": {
+                "npm-asset-library": "vendor/asset",
+                "bower-asset-library": "vendor/asset"
+            }
+        }
 	},
 	"archive": {
 		"exclude": [