diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy index 7b4c9f477..f3f187d43 100755 --- a/.openshift/action_hooks/deploy +++ b/.openshift/action_hooks/deploy @@ -185,7 +185,6 @@ util/config system expire_delivery_reports 3 util/config system feed_contacts 0 util/config system diaspora_enabled 0 util/config system disable_discover_tab 1 -util/config system directory_server https://blablanet.com util/config directory safemode 0 util/config directory globaldir 1 util/config directory pubforums 0 @@ -199,3 +198,8 @@ util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAdd echo "Try to add or update Hubzilla themes" cd ${OPENSHIFT_REPO_DIR} util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes + +# Hubzilla ownMapp +echo "Try to add or update Hubzilla ownMapp" +cd ${OPENSHIFT_REPO_DIR} +util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp diff --git a/boot.php b/boot.php index 1faeaf15a..8d99c300e 100755 --- a/boot.php +++ b/boot.php @@ -50,7 +50,8 @@ define ( 'PLATFORM_NAME', 'hubzilla' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1159 ); +define ( 'DB_UPDATE_VERSION', 1160 ); + /** * @brief Constant with a HTML line break. @@ -82,6 +83,7 @@ $DIRECTORY_FALLBACK_SERVERS = array( 'https://hubzilla.site', 'https://red.zottel.red', 'https://gravizot.de', + 'https://blablanet.com', 'https://my.federated.social' ); @@ -421,6 +423,7 @@ define ( 'TERM_SAVEDSEARCH', 6 ); define ( 'TERM_THING', 7 ); define ( 'TERM_BOOKMARK', 8 ); define ( 'TERM_HIERARCHY', 9 ); +define ( 'TERM_COMMUNITYTAG', 10 ); define ( 'TERM_OBJ_POST', 1 ); define ( 'TERM_OBJ_PHOTO', 2 ); @@ -936,26 +939,6 @@ class App { return $this->groups; } - function set_widget($title,$html, $location = 'aside') { - $this->widgets[] = array('title' => $title, 'html' => $html, 'location' => $location); - } - - function get_widgets($location = '') { - if($location && count($this->widgets)) { - $ret = array(); - foreach($this->widgets as $w) { - if ($w['location'] == $location) - $ret[] = $w; - } - $arr = array('location' => $location, 'widgets' => $ret); - call_hooks('get_widgets', $arr); - return $arr['widgets']; - } - $arr = array('location' => $location, 'widgets' => $this->widgets); - call_hooks('get_widgets', $arr); - return $arr['widgets']; - } - function set_pager_total($n) { $this->pager['total'] = intval($n); } @@ -2075,15 +2058,8 @@ function construct_page(&$a) { $a->build_pagehead(); - $arr = $a->get_widgets(); - ksort($arr, SORT_NUMERIC); - if(count($arr)) { - foreach($arr as $x) { - if(! array_key_exists($x['location'], $a->page)) - $a->page[$x['location']] = ''; - - $a->page[$x['location']] .= $x['html']; - } + if($a->page['pdl_content']) { + $a->page['content'] = comanche_region($a,$a->page['content']); } // Let's say we have a comanche declaration '[region=nav][/region][region=content]$nav $content[/region]'. @@ -2100,6 +2076,7 @@ function construct_page(&$a) { call_hooks('construct_page', $arr); $a->layout = $arr['layout']; + foreach($a->layout as $k => $v) { if((strpos($k, 'region_') === 0) && strlen($v)) { if(strpos($v, '$region_') !== false) { diff --git a/doc/Widgets.md b/doc/Widgets.md index 7acd9241b..7c506dea7 100644 --- a/doc/Widgets.md +++ b/doc/Widgets.md @@ -108,6 +108,13 @@ Some/many of these widgets have restrictions which may restrict the type of page
 
+* album - provides a widget containing a complete photo album from albums belonging to the page owner; this may be too large to present in a sidebar region as is best implemented as a content region widget. + * args: + * album - album name + * title - optional title, album name is used if not present +
 
+ + Creating New Widgets ==================== diff --git a/doc/api/statuses_update.bb b/doc/api/statuses_update.bb new file mode 100644 index 000000000..acad440de --- /dev/null +++ b/doc/api/statuses_update.bb @@ -0,0 +1,23 @@ +[h2]statuses/update[/h2] +Parameters + + title: Title of the status + status: Status in text [or bbcode] format + htmlstatus: Status in HTML format + in_reply_to_status_id + lat: latitude + long: longitude + media: image data + source: Application name + group_allow + contact_allow + group_deny + contact_deny + + +Example + +[code] +curl -u theUsername:thePassword http://mywebsite/api/statuses/update.xml -d status='Hello world' +[/code] + diff --git a/doc/bbcode.html b/doc/bbcode.html index 4fe47842f..3e9bda1d9 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -7,11 +7,11 @@
  • [u]underlined[/u] - underlined
  • [s]strike[/s] - strike
  • [color=red]red[/color] - red
    -
  • [url=https://redmatrix.me]$Projectname[/url] $Projectname
    -
  • [img]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
  • [img float=left]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
  • [url=https://zothub.com]$Projectname[/url] $Projectname
    +
  • [img]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
  • [img float=left]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    -
  • [img float=right]https://redmatrix.me/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
    +
  • [img float=right]https://zothub.com/images/default_profile_photos/rainbow_man/48.jpg[/img] Image/photo
  • [code]code[/code] code
  • [quote]quote[/quote]
    quote

    @@ -50,8 +50,8 @@

    $Projectname specific codes