diff options
| author | zotlabs <mike@macgirvin.com> | 2017-08-15 03:55:17 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-08-15 03:55:17 -0700 |
| commit | 8000d6b5d4de2e11de2413990dc5c0e1a7f9c1e5 (patch) | |
| tree | 6f12de365398d5b4ecc178cd4ae92e57325548aa | |
| parent | e9679d251cea59c3948bcaa9c651f47338783384 (diff) | |
| parent | 4b0d0df781b06cd892faba75a0d891f59d50e186 (diff) | |
| download | volse-hubzilla-8000d6b5d4de2e11de2413990dc5c0e1a7f9c1e5.tar.gz volse-hubzilla-8000d6b5d4de2e11de2413990dc5c0e1a7f9c1e5.tar.bz2 volse-hubzilla-8000d6b5d4de2e11de2413990dc5c0e1a7f9c1e5.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | vendor/composer/autoload_classmap.php | 4 | ||||
| -rw-r--r-- | vendor/composer/autoload_static.php | 4 |
3 files changed, 8 insertions, 3 deletions
@@ -1,4 +1,5 @@ Hubzilla 2.6 (2017-??-??) + - Upgrade to bootstrap-4 beta - Consolidate disable_discover_tab config - Fix some bbcode to markdown conversion issues - Improved finding of recursive attachment permissions @@ -60,7 +61,7 @@ Hubzilla 2.6 (2017-??-??) - Deprecate server_role - Introduce automatic language selection for help, webpages, and wiki content - Provide ability to order apps in app-tray - - Replace Mardownify library with html-to-markdown library + - Replace Markdownify library with html-to-markdown library Bugfixes - Fix channel manager and nav channel select visible if in a delegate session diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 9260e7056..a894ef263 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -748,6 +748,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\\ActivityStreams2' => $baseDir . '/Zotlabs/Lib/ActivityStreams2.php', 'Zotlabs\\Lib\\Api_router' => $baseDir . '/Zotlabs/Lib/Api_router.php', 'Zotlabs\\Lib\\Apps' => $baseDir . '/Zotlabs/Lib/Apps.php', 'Zotlabs\\Lib\\Cache' => $baseDir . '/Zotlabs/Lib/Cache.php', @@ -786,6 +787,7 @@ return array( 'Zotlabs\\Module\\Admin\\Security' => $baseDir . '/Zotlabs/Module/Admin/Security.php', 'Zotlabs\\Module\\Admin\\Site' => $baseDir . '/Zotlabs/Module/Admin/Site.php', 'Zotlabs\\Module\\Admin\\Themes' => $baseDir . '/Zotlabs/Module/Admin/Themes.php', + 'Zotlabs\\Module\\Ap_probe' => $baseDir . '/Zotlabs/Module/Ap_probe.php', 'Zotlabs\\Module\\Api' => $baseDir . '/Zotlabs/Module/Api.php', 'Zotlabs\\Module\\Appman' => $baseDir . '/Zotlabs/Module/Appman.php', 'Zotlabs\\Module\\Apporder' => $baseDir . '/Zotlabs/Module/Apporder.php', @@ -799,6 +801,7 @@ return array( 'Zotlabs\\Module\\Branchtopic' => $baseDir . '/Zotlabs/Module/Branchtopic.php', 'Zotlabs\\Module\\Cal' => $baseDir . '/Zotlabs/Module/Cal.php', 'Zotlabs\\Module\\Cdav' => $baseDir . '/Zotlabs/Module/Cdav.php', + 'Zotlabs\\Module\\Changeaddr' => $baseDir . '/Zotlabs/Module/Changeaddr.php', 'Zotlabs\\Module\\Channel' => $baseDir . '/Zotlabs/Module/Channel.php', 'Zotlabs\\Module\\Chanview' => $baseDir . '/Zotlabs/Module/Chanview.php', 'Zotlabs\\Module\\Chat' => $baseDir . '/Zotlabs/Module/Chat.php', @@ -916,7 +919,6 @@ return array( 'Zotlabs\\Module\\Share' => $baseDir . '/Zotlabs/Module/Share.php', 'Zotlabs\\Module\\Sharedwithme' => $baseDir . '/Zotlabs/Module/Sharedwithme.php', 'Zotlabs\\Module\\Siteinfo' => $baseDir . '/Zotlabs/Module/Siteinfo.php', - 'Zotlabs\\Module\\Siteinfo_json' => $baseDir . '/Zotlabs/Module/Siteinfo_json.php', 'Zotlabs\\Module\\Sitelist' => $baseDir . '/Zotlabs/Module/Sitelist.php', 'Zotlabs\\Module\\Smilies' => $baseDir . '/Zotlabs/Module/Smilies.php', 'Zotlabs\\Module\\Snap' => $baseDir . '/Zotlabs/Module/Snap.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index ed29b2bc9..496252906 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -877,6 +877,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Identity\\ProfilePhoto\\ProfilePhoto' => __DIR__ . '/../..' . '/Zotlabs/Identity/ProfilePhoto.php', 'Zotlabs\\Lib\\AConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/AConfig.php', 'Zotlabs\\Lib\\AbConfig' => __DIR__ . '/../..' . '/Zotlabs/Lib/AbConfig.php', + 'Zotlabs\\Lib\\ActivityStreams2' => __DIR__ . '/../..' . '/Zotlabs/Lib/ActivityStreams2.php', 'Zotlabs\\Lib\\Api_router' => __DIR__ . '/../..' . '/Zotlabs/Lib/Api_router.php', 'Zotlabs\\Lib\\Apps' => __DIR__ . '/../..' . '/Zotlabs/Lib/Apps.php', 'Zotlabs\\Lib\\Cache' => __DIR__ . '/../..' . '/Zotlabs/Lib/Cache.php', @@ -915,6 +916,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Admin\\Security' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Security.php', 'Zotlabs\\Module\\Admin\\Site' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Site.php', 'Zotlabs\\Module\\Admin\\Themes' => __DIR__ . '/../..' . '/Zotlabs/Module/Admin/Themes.php', + 'Zotlabs\\Module\\Ap_probe' => __DIR__ . '/../..' . '/Zotlabs/Module/Ap_probe.php', 'Zotlabs\\Module\\Api' => __DIR__ . '/../..' . '/Zotlabs/Module/Api.php', 'Zotlabs\\Module\\Appman' => __DIR__ . '/../..' . '/Zotlabs/Module/Appman.php', 'Zotlabs\\Module\\Apporder' => __DIR__ . '/../..' . '/Zotlabs/Module/Apporder.php', @@ -928,6 +930,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Branchtopic' => __DIR__ . '/../..' . '/Zotlabs/Module/Branchtopic.php', 'Zotlabs\\Module\\Cal' => __DIR__ . '/../..' . '/Zotlabs/Module/Cal.php', 'Zotlabs\\Module\\Cdav' => __DIR__ . '/../..' . '/Zotlabs/Module/Cdav.php', + 'Zotlabs\\Module\\Changeaddr' => __DIR__ . '/../..' . '/Zotlabs/Module/Changeaddr.php', 'Zotlabs\\Module\\Channel' => __DIR__ . '/../..' . '/Zotlabs/Module/Channel.php', 'Zotlabs\\Module\\Chanview' => __DIR__ . '/../..' . '/Zotlabs/Module/Chanview.php', 'Zotlabs\\Module\\Chat' => __DIR__ . '/../..' . '/Zotlabs/Module/Chat.php', @@ -1045,7 +1048,6 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'Zotlabs\\Module\\Share' => __DIR__ . '/../..' . '/Zotlabs/Module/Share.php', 'Zotlabs\\Module\\Sharedwithme' => __DIR__ . '/../..' . '/Zotlabs/Module/Sharedwithme.php', 'Zotlabs\\Module\\Siteinfo' => __DIR__ . '/../..' . '/Zotlabs/Module/Siteinfo.php', - 'Zotlabs\\Module\\Siteinfo_json' => __DIR__ . '/../..' . '/Zotlabs/Module/Siteinfo_json.php', 'Zotlabs\\Module\\Sitelist' => __DIR__ . '/../..' . '/Zotlabs/Module/Sitelist.php', 'Zotlabs\\Module\\Smilies' => __DIR__ . '/../..' . '/Zotlabs/Module/Smilies.php', 'Zotlabs\\Module\\Snap' => __DIR__ . '/../..' . '/Zotlabs/Module/Snap.php', |