Merge pull request #8692 from Elgg/1.10

Merge 1.10 to 1.11
Elgg · Jul 6, 2015 · e332e2c · e332e2c
2 parents a064667 + 45688ef
commit e332e2c
Show file tree

Hide file tree

Showing 35 changed files with 70 additions and 35 deletions.
diff --git a/mod/aalborg_theme/composer.json b/mod/aalborg_theme/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/blog/composer.json b/mod/blog/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/bookmarks/composer.json b/mod/bookmarks/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/categories/composer.json b/mod/categories/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/ckeditor/composer.json b/mod/ckeditor/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/custom_index/composer.json b/mod/custom_index/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/dashboard/composer.json b/mod/dashboard/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/developers/composer.json b/mod/developers/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/diagnostics/composer.json b/mod/diagnostics/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/embed/composer.json b/mod/embed/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/externalpages/composer.json b/mod/externalpages/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/file/composer.json b/mod/file/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/garbagecollector/composer.json b/mod/garbagecollector/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/groups/composer.json b/mod/groups/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/htmlawed/composer.json b/mod/htmlawed/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/invitefriends/composer.json b/mod/invitefriends/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/legacy_urls/composer.json b/mod/legacy_urls/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/likes/composer.json b/mod/likes/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/logbrowser/composer.json b/mod/logbrowser/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/logrotate/composer.json b/mod/logrotate/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/members/composer.json b/mod/members/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/messageboard/composer.json b/mod/messageboard/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/messages/composer.json b/mod/messages/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/notifications/composer.json b/mod/notifications/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/pages/composer.json b/mod/pages/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/profile/composer.json b/mod/profile/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/reportedcontent/composer.json b/mod/reportedcontent/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/search/composer.json b/mod/search/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/site_notifications/composer.json b/mod/site_notifications/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/tagcloud/composer.json b/mod/tagcloud/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/thewire/composer.json b/mod/thewire/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/twitter_api/composer.json b/mod/twitter_api/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/uservalidationbyemail/composer.json b/mod/uservalidationbyemail/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/web_services/composer.json b/mod/web_services/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }
diff --git a/mod/zaudio/composer.json b/mod/zaudio/composer.json
@@ -3,5 +3,6 @@
     "type": "elgg-plugin",
     "require": {
         "composer/installers": ">=1.0.8"
-    }
+    },
+    "license": "GPL-2.0"
 }