Merge branch '5.0RC'5.0

1 files changed, 20 insertions, 2 deletions

diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index 3022c7e5b..76f79059b 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -193,7 +193,6 @@ return array(
     'HTMLPurifier_Injector_SafeObject' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Injector/SafeObject.php',
     'HTMLPurifier_Language' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Language.php',
     'HTMLPurifier_LanguageFactory' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/LanguageFactory.php',
-    'HTMLPurifier_Language_en_x_test' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Language/classes/en-x-test.php',
     'HTMLPurifier_Length' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Length.php',
     'HTMLPurifier_Lexer' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer.php',
     'HTMLPurifier_Lexer_DOMLex' => $vendorDir . '/ezyang/htmlpurifier/library/HTMLPurifier/Lexer/DOMLex.php',
@@ -372,6 +371,9 @@ return array(
     'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
     'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
     'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
+    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
+    'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
+    'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
     'Ramsey\\Uuid\\BinaryUtils' => $vendorDir . '/ramsey/uuid/src/BinaryUtils.php',
     'Ramsey\\Uuid\\Builder\\DefaultUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DefaultUuidBuilder.php',
     'Ramsey\\Uuid\\Builder\\DegradedUuidBuilder' => $vendorDir . '/ramsey/uuid/src/Builder/DegradedUuidBuilder.php',
@@ -727,6 +729,7 @@ return array(
     'Sabre\\VObject\\Property\\VCard\\DateAndOrTime' => $vendorDir . '/sabre/vobject/lib/Property/VCard/DateAndOrTime.php',
     'Sabre\\VObject\\Property\\VCard\\DateTime' => $vendorDir . '/sabre/vobject/lib/Property/VCard/DateTime.php',
     'Sabre\\VObject\\Property\\VCard\\LanguageTag' => $vendorDir . '/sabre/vobject/lib/Property/VCard/LanguageTag.php',
+    'Sabre\\VObject\\Property\\VCard\\PhoneNumber' => $vendorDir . '/sabre/vobject/lib/Property/VCard/PhoneNumber.php',
     'Sabre\\VObject\\Property\\VCard\\TimeStamp' => $vendorDir . '/sabre/vobject/lib/Property/VCard/TimeStamp.php',
     'Sabre\\VObject\\Reader' => $vendorDir . '/sabre/vobject/lib/Reader.php',
     'Sabre\\VObject\\Recur\\EventIterator' => $vendorDir . '/sabre/vobject/lib/Recur/EventIterator.php',
@@ -1012,6 +1015,7 @@ return array(
     'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => $baseDir . '/Zotlabs/Identity/ProfilePhoto.php',
     'Zotlabs\\Lib\\AConfig' => $baseDir . '/Zotlabs/Lib/AConfig.php',
     'Zotlabs\\Lib\\AbConfig' => $baseDir . '/Zotlabs/Lib/AbConfig.php',
+    'Zotlabs\\Lib\\AccessList' => $baseDir . '/Zotlabs/Lib/AccessList.php',
     'Zotlabs\\Lib\\Activity' => $baseDir . '/Zotlabs/Lib/Activity.php',
     'Zotlabs\\Lib\\ActivityStreams' => $baseDir . '/Zotlabs/Lib/ActivityStreams.php',
     'Zotlabs\\Lib\\Api_router' => $baseDir . '/Zotlabs/Lib/Api_router.php',
@@ -1019,6 +1023,7 @@ return array(
     'Zotlabs\\Lib\\Cache' => $baseDir . '/Zotlabs/Lib/Cache.php',
     'Zotlabs\\Lib\\Chatroom' => $baseDir . '/Zotlabs/Lib/Chatroom.php',
     'Zotlabs\\Lib\\Config' => $baseDir . '/Zotlabs/Lib/Config.php',
+    'Zotlabs\\Lib\\Connect' => $baseDir . '/Zotlabs/Lib/Connect.php',
     'Zotlabs\\Lib\\DB_Upgrade' => $baseDir . '/Zotlabs/Lib/DB_Upgrade.php',
     'Zotlabs\\Lib\\DReport' => $baseDir . '/Zotlabs/Lib/DReport.php',
     'Zotlabs\\Lib\\Enotify' => $baseDir . '/Zotlabs/Lib/Enotify.php',
@@ -1055,6 +1060,7 @@ return array(
     'Zotlabs\\Lib\\Zotfinger' => $baseDir . '/Zotlabs/Lib/Zotfinger.php',
     'Zotlabs\\Module\\Achievements' => $baseDir . '/Zotlabs/Module/Achievements.php',
     'Zotlabs\\Module\\Acl' => $baseDir . '/Zotlabs/Module/Acl.php',
+    'Zotlabs\\Module\\Activity' => $baseDir . '/Zotlabs/Module/Activity.php',
     'Zotlabs\\Module\\Admin' => $baseDir . '/Zotlabs/Module/Admin.php',
     'Zotlabs\\Module\\Admin\\Account_edit' => $baseDir . '/Zotlabs/Module/Admin/Account_edit.php',
     'Zotlabs\\Module\\Admin\\Accounts' => $baseDir . '/Zotlabs/Module/Admin/Accounts.php',
@@ -1103,6 +1109,7 @@ return array(
     'Zotlabs\\Module\\Cover_photo' => $baseDir . '/Zotlabs/Module/Cover_photo.php',
     'Zotlabs\\Module\\Dav' => $baseDir . '/Zotlabs/Module/Dav.php',
     'Zotlabs\\Module\\Defperms' => $baseDir . '/Zotlabs/Module/Defperms.php',
+    'Zotlabs\\Module\\Dircensor' => $baseDir . '/Zotlabs/Module/Dircensor.php',
     'Zotlabs\\Module\\Directory' => $baseDir . '/Zotlabs/Module/Directory.php',
     'Zotlabs\\Module\\Dirsearch' => $baseDir . '/Zotlabs/Module/Dirsearch.php',
     'Zotlabs\\Module\\Display' => $baseDir . '/Zotlabs/Module/Display.php',
@@ -1115,9 +1122,11 @@ return array(
     'Zotlabs\\Module\\Email_validation' => $baseDir . '/Zotlabs/Module/Email_validation.php',
     'Zotlabs\\Module\\Embed' => $baseDir . '/Zotlabs/Module/Embed.php',
     'Zotlabs\\Module\\Embedphotos' => $baseDir . '/Zotlabs/Module/Embedphotos.php',
+    'Zotlabs\\Module\\Event' => $baseDir . '/Zotlabs/Module/Event.php',
     'Zotlabs\\Module\\Events' => $baseDir . '/Zotlabs/Module/Events.php',
     'Zotlabs\\Module\\Fbrowser' => $baseDir . '/Zotlabs/Module/Fbrowser.php',
     'Zotlabs\\Module\\Feed' => $baseDir . '/Zotlabs/Module/Feed.php',
+    'Zotlabs\\Module\\Fhubloc_id_url' => $baseDir . '/Zotlabs/Module/Fhubloc_id_url.php',
     'Zotlabs\\Module\\Fhublocs' => $baseDir . '/Zotlabs/Module/Fhublocs.php',
     'Zotlabs\\Module\\File_upload' => $baseDir . '/Zotlabs/Module/File_upload.php',
     'Zotlabs\\Module\\Filer' => $baseDir . '/Zotlabs/Module/Filer.php',
@@ -1149,7 +1158,6 @@ return array(
     'Zotlabs\\Module\\Logout' => $baseDir . '/Zotlabs/Module/Logout.php',
     'Zotlabs\\Module\\Lostpass' => $baseDir . '/Zotlabs/Module/Lostpass.php',
     'Zotlabs\\Module\\Magic' => $baseDir . '/Zotlabs/Module/Magic.php',
-    'Zotlabs\\Module\\Mail' => $baseDir . '/Zotlabs/Module/Mail.php',
     'Zotlabs\\Module\\Manage' => $baseDir . '/Zotlabs/Module/Manage.php',
     'Zotlabs\\Module\\Menu' => $baseDir . '/Zotlabs/Module/Menu.php',
     'Zotlabs\\Module\\Message' => $baseDir . '/Zotlabs/Module/Message.php',
@@ -1179,6 +1187,7 @@ return array(
     'Zotlabs\\Module\\Permcats' => $baseDir . '/Zotlabs/Module/Permcats.php',
     'Zotlabs\\Module\\Photo' => $baseDir . '/Zotlabs/Module/Photo.php',
     'Zotlabs\\Module\\Photos' => $baseDir . '/Zotlabs/Module/Photos.php',
+    'Zotlabs\\Module\\Pin' => $baseDir . '/Zotlabs/Module/Pin.php',
     'Zotlabs\\Module\\Ping' => $baseDir . '/Zotlabs/Module/Ping.php',
     'Zotlabs\\Module\\Poco' => $baseDir . '/Zotlabs/Module/Poco.php',
     'Zotlabs\\Module\\Poke' => $baseDir . '/Zotlabs/Module/Poke.php',
@@ -1235,6 +1244,8 @@ return array(
     'Zotlabs\\Module\\Smilies' => $baseDir . '/Zotlabs/Module/Smilies.php',
     'Zotlabs\\Module\\Snap' => $baseDir . '/Zotlabs/Module/Snap.php',
     'Zotlabs\\Module\\Sources' => $baseDir . '/Zotlabs/Module/Sources.php',
+    'Zotlabs\\Module\\Sse' => $baseDir . '/Zotlabs/Module/Sse.php',
+    'Zotlabs\\Module\\Sse_bs' => $baseDir . '/Zotlabs/Module/Sse_bs.php',
     'Zotlabs\\Module\\Sslify' => $baseDir . '/Zotlabs/Module/Sslify.php',
     'Zotlabs\\Module\\Starred' => $baseDir . '/Zotlabs/Module/Starred.php',
     'Zotlabs\\Module\\Subthread' => $baseDir . '/Zotlabs/Module/Subthread.php',
@@ -1254,6 +1265,7 @@ return array(
     'Zotlabs\\Module\\View' => $baseDir . '/Zotlabs/Module/View.php',
     'Zotlabs\\Module\\Viewconnections' => $baseDir . '/Zotlabs/Module/Viewconnections.php',
     'Zotlabs\\Module\\Viewsrc' => $baseDir . '/Zotlabs/Module/Viewsrc.php',
+    'Zotlabs\\Module\\Vote' => $baseDir . '/Zotlabs/Module/Vote.php',
     'Zotlabs\\Module\\Wall_attach' => $baseDir . '/Zotlabs/Module/Wall_attach.php',
     'Zotlabs\\Module\\Wall_upload' => $baseDir . '/Zotlabs/Module/Wall_upload.php',
     'Zotlabs\\Module\\Webfinger' => $baseDir . '/Zotlabs/Module/Webfinger.php',
@@ -1265,6 +1277,7 @@ return array(
     'Zotlabs\\Module\\Xpoco' => $baseDir . '/Zotlabs/Module/Xpoco.php',
     'Zotlabs\\Module\\Xrd' => $baseDir . '/Zotlabs/Module/Xrd.php',
     'Zotlabs\\Module\\Xref' => $baseDir . '/Zotlabs/Module/Xref.php',
+    'Zotlabs\\Module\\Z6trans' => $baseDir . '/Zotlabs/Module/Z6trans.php',
     'Zotlabs\\Module\\Zfinger' => $baseDir . '/Zotlabs/Module/Zfinger.php',
     'Zotlabs\\Module\\Zot' => $baseDir . '/Zotlabs/Module/Zot.php',
     'Zotlabs\\Module\\Zot_probe' => $baseDir . '/Zotlabs/Module/Zot_probe.php',
@@ -1527,6 +1540,10 @@ return array(
     'Zotlabs\\Update\\_1232' => $baseDir . '/Zotlabs/Update/_1232.php',
     'Zotlabs\\Update\\_1233' => $baseDir . '/Zotlabs/Update/_1233.php',
     'Zotlabs\\Update\\_1234' => $baseDir . '/Zotlabs/Update/_1234.php',
+    'Zotlabs\\Update\\_1235' => $baseDir . '/Zotlabs/Update/_1235.php',
+    'Zotlabs\\Update\\_1236' => $baseDir . '/Zotlabs/Update/_1236.php',
+    'Zotlabs\\Update\\_1237' => $baseDir . '/Zotlabs/Update/_1237.php',
+    'Zotlabs\\Update\\_1238' => $baseDir . '/Zotlabs/Update/_1238.php',
     'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php',
     'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php',
     'Zotlabs\\Web\\HTTPSig' => $baseDir . '/Zotlabs/Web/HTTPSig.php',
@@ -1578,6 +1595,7 @@ return array(
     'Zotlabs\\Widget\\Photo' => $baseDir . '/Zotlabs/Widget/Photo.php',
     'Zotlabs\\Widget\\Photo_albums' => $baseDir . '/Zotlabs/Widget/Photo_albums.php',
     'Zotlabs\\Widget\\Photo_rand' => $baseDir . '/Zotlabs/Widget/Photo_rand.php',
+    'Zotlabs\\Widget\\Pinned' => $baseDir . '/Zotlabs/Widget/Pinned.php',
     'Zotlabs\\Widget\\Portfolio' => $baseDir . '/Zotlabs/Widget/Portfolio.php',
     'Zotlabs\\Widget\\Profile' => $baseDir . '/Zotlabs/Widget/Profile.php',
     'Zotlabs\\Widget\\Pubsites' => $baseDir . '/Zotlabs/Widget/Pubsites.php',