From 99247d0c592658d2ebce549c97c06080e98c584f Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Mon, 5 Mar 2018 20:42:06 -0500 Subject: Improve rendering of Readme files in plugin settings --- view/css/mod_admin.css | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/view/css/mod_admin.css b/view/css/mod_admin.css index 409744402..5e22fc90c 100644 --- a/view/css/mod_admin.css +++ b/view/css/mod_admin.css @@ -70,3 +70,21 @@ margin-top: 0px !important; margin-left: 0px !important; } + +pre code { + background: #F5F5F5; + font-family: Courier, monospace; + font-size: 1em; + padding: 1em 1.5em; + display: block; + white-space: pre-wrap; +} + +code { + background: #F5F5F5; + font-family: Courier, monospace; + font-size: 1em; + display: inline; + padding: 0.2em 0.2em; + white-space: pre-wrap; +} \ No newline at end of file -- cgit v1.2.3 From da9fe27db16ae4fad69afff4534b951870b3ab1f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 6 Mar 2018 11:15:47 +0100 Subject: update changelog --- CHANGELOG | 126 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 126 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 6e540a04d..f1a214da8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,129 @@ +Hubzilla 3.2 (????-??-??) + - Improve rendering of Readme files in plugin settings + - Add pdl file for mod moderate + - Update redbasic theme screenshot + - Restrict mail messages to max_import_size + - Add pdl file for mod thing + - Add federation property to webfinger + - Provide new member widget which sits beneath the notifications for the first 60 days after an account creation + - Rename Addon/Feature settings to Addon Settings + - Move privacy groups to the newly created Access Control and Permissions tab + - Move oauth_client management and guest access tokens to features rather than auto-enabling at various feature levels + - Change undo_post_tagging() to emit quoted tags rather than using underscore replacement if they contain spaces + - Require directory servers to be using some modern form of encryption + - Change icon set from font-awesome to fork-awesome + - Provide opt-out link and text with notification emails + - Alter image selection widget to accept/submit on choose (github issue #979) + - If hide_in_statistics is set, only include the total channels count and no other statistical info in siteinfo.json + - Mark connections where we do not have post_comments permissions with an no entry sign + - Click your own profile photo to change it if loged in + - Remove street address info from the default basic profile fields + - Handle error logging in on cloud page (post method not implemented) + - Cloud 'view-as-tiles' toggle wasn't available for guests and they are the most likely to prefer that view + - Provide DB compatibility for poll and voting implementations across several platforms + - Remove the unused ZotDriver and ProtoDriver classes + - Move dreport from zot to lib + - Move Zotlabs\Zot\Verify to Zotlabs\Lib\Verify as part of the zot6 re-org + - Add event resource_id to iconfig so Diaspora can search on it without looking inside JSON objects + - Trim non-existent/deprecated plugins from siteinfo plugin list + - Add 'Validate' button to new_channel page + - Do not show summary if it is equal to body + - Update code tag styling so bbcode [code] blocks and wiki markdown inline code render nicely + - Crypto improvements (use pkcs1_oaep_padding instead of the older pkcs1_padding) + - Refactor OAuth2Server a bit + - Refactor of the DB update system + - Extend the oauth2 storage driver so that we can use our own channel table + - Provide option to block the public stream unless authenticated + - Refactor shares and urn shares into activities + - Show likes and dislikes in notices if always_show_in_notices is set + - Add hidden config to disallow anonymous comments (github issue #972) + - Add flexibility to prefix/suffix string translations for jquery.timeago + - Make post titles searchable (github issue #975) + - Implement zot6 delivery + - Remove mobile_detect library + - Separate the parsing of author information from the parsing of item/activity information in feedutils + - Provide summaries in feeds under very limited cases + - Redirect to the email_validation page if login was attempted after account creation but prior to successful verification + - Iprove workflow for form based email validation when auto_channel_create is in effect + - Provide a default video image if nothing else is available + - Surface the ability to change the landing page after channel creation + - Create the 'go' module to present several possible things to do after channel creation + - Add unit test for dba_pdo driver class + - Add unit test for \DBA factory + - Usability improvements to registration/verification workflow + - Don't do any bbcode translation within code blocks (except baseurl, observer, and linefeeds) + - Improve browser language detection + - Remove unused prototype importer template and obsolete reflection cms importer + - Update to bootstrap 4 stable + - Implement caching of notifications in browser session storage + - Code cleanup and simplification in mod_like + - Implement new cropper library + - Better notifications for edit post/comments which may have been originally posted long ago + - Ensure filter words are not empty in include/items.php + - Change query in mod search to be compatible with postgres + - Provide channel list function in the zot api + - Remove deprecated 'qcomment' feature + - Simplify webserver logic flow + - Simplify interactions with the get_features hook + - Provide a local pubstream option (content from this site only) + - Simplify dir_tagadelic dramatically + - Surface the article feature + - Add summary bbcode tag + - Move markdown-in-posts/comments feature to plugin + - Support tables in markdown posts/comments + + + Bugfixes + - Fix javascript error if there are no notifications + - Fix some issues with friend suggestions on standalone sites with no 'suggestme' volunteers + - Fix unable to reset profile fields to defaults in admin/profs by emptying the textarea + ⁻ Fix issues with accordions related to bootstrap upgrade + - Fix empty dob is set to the date of the first profile save + - Fix several email validation issues + - Fix issue if logged in locally and mod_display returns nothing owned by your uid; retry with known public uids rather than issue 'permission denied' + - Fix public stream app permission check to match the recent fixes to the Module + - Fix issues with delivery of edited posts to forums + - Fix autoname test + - Fix issue where self and pending connections were visible in connections when not loged in + - Fix bad query in mod defperms + - Fix issue where gnusocial likes were not recognised as like activity + - Fix manual queue invocation + - Fix unable to delete accounts using tickboxes on admin/accounts + - Fix a PHP7.2 warning when a channel has no cards + - Fix unable to delete permission groups with space in name (github issue #920) + + Addons + Statistic: fix reporting of incorrect register policy in nodeinfo + Diaspora: diaspora_init_relay: calls diaspora_import_author with too many arguments + Pubcrawl: provide a system 'allowed' for to match the system setting for other protocols + Diaspora: fix issue with sending diaspora profile change messages over diaspora_v2 + Diaspora: provide limited but hopefully adequate support for new Diaspora html5 audio/video + Pubcrawl: send zot context with follow requests + Pubcrawl: add video to the set of message types we process + Pubcrawl: support for activitypub media + Openclipatar: remove extra details for each image + Diaspora: initial work on event participation + Statistic: remove the friendica protocol from nodeinfo until it is fully implemented + Statistic: re-arrange the order of the .host-meta/nodeinfo links + Pubcrawl: add share verb to activitystreams translator + Pubcrawl: post public posts to syschannel + Statistics: fix legacy statistics.json interface + Gnusocial: improve error checking when processing a salmon message + Dirstats: fix sql syntax error + Pubcrawl: possibly reduce constraint violations for xchan_store_lowlevel (duplicate entry) + Diaspora: ensure we process Friendica-over-Diaspora yearless birthdays correctly + Chess: added simple history browsing controls to spectator view + Diaspora: support post/comment edits + Diaspora: don't redirect fetch requests for non-Diaspora wall-to-wall and forum posts unless they can be redirected to a Diaspora protocol site + Chess: added support for publicly visible games + Phpmailer: add quickstart notes + Chess: choose random color if no color is chosen + New Plugin: mdpost - markdown in posts/comments, migrated from core to addon + Diaspora: provide a configuration option to import the diaspora firehose, otherwise only import content matching subscribed tags + NSFW: load images only after click on the button + Twitter: provide configurable tweet length until such time as 280 becomes universal + + Hubzilla 3.0 (2018-01-09) - Updated homeinstall script - Sort cloud directory by 1. is_dir and 2. name -- cgit v1.2.3 From 0a876e1518e83636f65b35394076745254db019d Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 6 Mar 2018 11:39:49 -0800 Subject: don't add pending connections to the default privacy group until accepted --- include/zot.php | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/include/zot.php b/include/zot.php index 25e30ccbc..c11cace2a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -589,13 +589,16 @@ function zot_refresh($them, $channel = null, $force = false) { // If there is a default group for this channel, add this connection to it - - $default_group = $channel['channel_default_group']; - if($default_group) { - require_once('include/group.php'); - $g = group_rec_byhash($channel['channel_id'],$default_group); - if($g) - group_add_member($channel['channel_id'],'',$x['hash'],$g['id']); + // for pending connections this will happens at acceptance time. + + if(! intval($new_connection[0]['abook_pending'])) { + $default_group = $channel['channel_default_group']; + if($default_group) { + require_once('include/group.php'); + $g = group_rec_byhash($channel['channel_id'],$default_group); + if($g) + group_add_member($channel['channel_id'],'',$x['hash'],$g['id']); + } } unset($new_connection[0]['abook_id']); -- cgit v1.2.3 From f0f58dade886d88fc178b78c04e1a4067ddfda04 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 6 Mar 2018 15:31:45 -0800 Subject: federated polls: add poll_author which will be necessary for Diaspora federation --- Zotlabs/Update/_1208.php | 26 ++++++++++++++++++++++++++ boot.php | 2 +- install/schema_mysql.sql | 2 ++ install/schema_postgres.sql | 2 ++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 Zotlabs/Update/_1208.php diff --git a/Zotlabs/Update/_1208.php b/Zotlabs/Update/_1208.php new file mode 100644 index 000000000..4cbcf4322 --- /dev/null +++ b/Zotlabs/Update/_1208.php @@ -0,0 +1,26 @@ + Date: Wed, 7 Mar 2018 20:29:37 +0100 Subject: we do not support separate mobile themes anymore --- Zotlabs/Module/Admin/Site.php | 14 +++++++------- view/tpl/admin_site.tpl | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Zotlabs/Module/Admin/Site.php b/Zotlabs/Module/Admin/Site.php index 880dbbe4b..015c6535c 100644 --- a/Zotlabs/Module/Admin/Site.php +++ b/Zotlabs/Module/Admin/Site.php @@ -24,7 +24,7 @@ class Site { $siteinfo = ((x($_POST,'siteinfo')) ? trim($_POST['siteinfo']) : ''); $language = ((x($_POST,'language')) ? notags(trim($_POST['language'])) : ''); $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); - $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); +// $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); // $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); @@ -122,11 +122,11 @@ class Site { set_config('system','siteinfo',$siteinfo); set_config('system', 'language', $language); set_config('system', 'theme', $theme); - if ( $theme_mobile === '---' ) { - del_config('system', 'mobile_theme'); - } else { - set_config('system', 'mobile_theme', $theme_mobile); - } +// if ( $theme_mobile === '---' ) { +// del_config('system', 'mobile_theme'); +// } else { +// set_config('system', 'mobile_theme', $theme_mobile); +// } // set_config('system','site_channel', $site_channel); set_config('system','maximagesize', $maximagesize); @@ -305,7 +305,7 @@ class Site { '$siteinfo' => array('siteinfo', t('Site Information'), get_config('system','siteinfo'), t("Publicly visible description of this site. Displayed on siteinfo page. BBCode can be used here")), '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), - '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), +// '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), // '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl index 78e3ee245..10b367810 100755 --- a/view/tpl/admin_site.tpl +++ b/view/tpl/admin_site.tpl @@ -55,7 +55,7 @@ {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} - {{include file="field_select.tpl" field=$theme_mobile}} + {{* include file="field_select.tpl" field=$theme_mobile *}} {{include file="field_input.tpl" field=$frontpage}} {{include file="field_checkbox.tpl" field=$mirror_frontpage}} {{include file="field_checkbox.tpl" field=$login_on_homepage}} -- cgit v1.2.3 From d6812cf75e40ca5a364c5832929b2eaf62c0d2f5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 7 Mar 2018 20:47:18 +0100 Subject: more bootstrap accordion fixes --- view/tpl/admin_settings_features.tpl | 4 ++-- view/tpl/profile_edit.tpl | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/view/tpl/admin_settings_features.tpl b/view/tpl/admin_settings_features.tpl index 2d5cf7e0b..86f978e08 100644 --- a/view/tpl/admin_settings_features.tpl +++ b/view/tpl/admin_settings_features.tpl @@ -9,12 +9,12 @@
-
+
{{foreach $f.1 as $fcat}} {{include file="field_checkbox.tpl" field=$fcat.0}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 05137479f..95183fdf4 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -49,12 +49,12 @@
-
+
{{include file="field_input.tpl" field=$profile_name}} @@ -215,12 +215,12 @@
-
+
{{if $fields.address}} {{include file="field_input.tpl" field=$address}} @@ -260,12 +260,12 @@
-
+
{{if $fields.marital }}
@@ -307,12 +307,12 @@
-
+
{{if $fields.homepage}} {{include file="field_input.tpl" field=$homepage}} -- cgit v1.2.3 From 17c102ebe115bd8272da830bf9523b691ce115ee Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 7 Mar 2018 21:11:57 +0100 Subject: we need the javascript in the template since strings are involved --- Zotlabs/Module/Cover_photo.php | 6 +++ Zotlabs/Module/Profile_photo.php | 6 +++ view/js/mod_cover_photo.js | 80 ------------------------------------- view/js/mod_profile_photo.js | 82 -------------------------------------- view/tpl/cover_photo.tpl | 83 ++++++++++++++++++++++++++++++++++++++ view/tpl/profile_photo.tpl | 86 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 181 insertions(+), 162 deletions(-) delete mode 100644 view/js/mod_cover_photo.js delete mode 100644 view/js/mod_profile_photo.js diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index 047bcf3d4..2da99b447 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -364,6 +364,12 @@ class Cover_photo extends \Zotlabs\Web\Controller { '$embedPhotosModalTitle' => t('Use a photo from your albums'), '$embedPhotosModalCancel' => t('Cancel'), '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), '$form_security_token' => get_form_security_token("cover_photo"), /// @FIXME - yuk '$select' => t('Select existing photo'), diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 44b7c18c6..2ce8686b9 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -463,6 +463,12 @@ class Profile_photo extends \Zotlabs\Web\Controller { '$embedPhotosModalTitle' => t('Use a photo from your albums'), '$embedPhotosModalCancel' => t('Cancel'), '$embedPhotosModalOK' => t('OK'), + '$modalchooseimages' => t('Choose images to embed'), + '$modalchoosealbum' => t('Choose an album'), + '$modaldiffalbum' => t('Choose a different album'), + '$modalerrorlist' => t('Error getting album list'), + '$modalerrorlink' => t('Error getting photo link'), + '$modalerroralbum' => t('Error getting album'), '$form_security_token' => get_form_security_token("profile_photo"), '$select' => t('Select existing photo'), )); diff --git a/view/js/mod_cover_photo.js b/view/js/mod_cover_photo.js deleted file mode 100644 index 5b64b8b91..000000000 --- a/view/js/mod_cover_photo.js +++ /dev/null @@ -1,80 +0,0 @@ - var initializeEmbedPhotoDialog = function () { - $('.embed-photo-selected-photo').each(function (index) { - $(this).removeClass('embed-photo-selected-photo'); - }); - getPhotoAlbumList(); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('show'); - }; - - var choosePhotoFromAlbum = function (album) { - $.post("embedphotos/album", {name: album}, - function(data) { - if (data['status']) { - $('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); - $('#embedPhotoModalBodyAlbumDialog').html('\ - ') - $('#embedPhotoModalBodyAlbumDialog').append(data['content']); - $('#embedPhotoModalBodyAlbumDialog').click(function (evt) { - evt.preventDefault(); - var image = document.getElementById(evt.target.id); - if (typeof($(image).parent()[0]) !== 'undefined') { - var imageparent = document.getElementById($(image).parent()[0].id); - $(imageparent).toggleClass('embed-photo-selected-photo'); - var href = $(imageparent).attr('href'); - $.post("embedphotos/photolink", {href: href}, - function(ddata) { - if (ddata['status']) { - window.location.href = 'cover_photo/use/' + ddata['resource_id']; - } else { - window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']); - } - return false; - }, - 'json'); - $('#embedPhotoModalBodyAlbumDialog').html(''); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('hide'); - } - }); - - $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); - } else { - window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']); - } - return false; - }, - 'json'); - }; - - var getPhotoAlbumList = function () { - $.post("embedphotos/albumlist", {}, - function(data) { - if (data['status']) { - var albums = data['albumlist']; //JSON.parse(data['albumlist']); - $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}"); - $('#embedPhotoModalBodyAlbumList').html('
    '); - for(var i=0; i' + albumName + ''; - albumLink += ''; - $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); - } - $('#embedPhotoModalBodyAlbumDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none'); - } else { - window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); - } - return false; - }, - 'json'); - }; diff --git a/view/js/mod_profile_photo.js b/view/js/mod_profile_photo.js deleted file mode 100644 index c05c8e25e..000000000 --- a/view/js/mod_profile_photo.js +++ /dev/null @@ -1,82 +0,0 @@ - var initializeEmbedPhotoDialog = function () { - $('.embed-photo-selected-photo').each(function (index) { - $(this).removeClass('embed-photo-selected-photo'); - }); - getPhotoAlbumList(); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('show'); - }; - - var choosePhotoFromAlbum = function (album) { - $.post("embedphotos/album", {name: album}, - function(data) { - if (data['status']) { - $('#embedPhotoModalLabel').html("{{$modalchooseimages}}"); - $('#embedPhotoModalBodyAlbumDialog').html('\ - ') - $('#embedPhotoModalBodyAlbumDialog').append(data['content']); - $('#embedPhotoModalBodyAlbumDialog').click(function (evt) { - evt.preventDefault(); - var image = document.getElementById(evt.target.id); - if (typeof($(image).parent()[0]) !== 'undefined') { - var imageparent = document.getElementById($(image).parent()[0].id); - $(imageparent).toggleClass('embed-photo-selected-photo'); - var href = $(imageparent).attr('href'); - $.post("embedphotos/photolink", {href: href}, - function(ddata) { - if (ddata['status']) { - var pf = $('#profile-photo-profiles').val(); - var prof = ((typeof pf !== 'undefined') ? '?f=&pf=' + pf : ''); - window.location.href = 'profile_photo/use/' + ddata['resource_id'] + prof; - } else { - window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']); - } - return false; - }, - 'json'); - $('#embedPhotoModalBodyAlbumDialog').html(''); - $('#embedPhotoModalBodyAlbumDialog').off('click'); - $('#embedPhotoModal').modal('hide'); - } - }); - - $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none'); - } else { - window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']); - } - return false; - }, - 'json'); - }; - - var getPhotoAlbumList = function () { - $.post("embedphotos/albumlist", {}, - function(data) { - if (data['status']) { - var albums = data['albumlist']; //JSON.parse(data['albumlist']); - $('#embedPhotoModalLabel').html("{{$modalchoosealbum}}"); - $('#embedPhotoModalBodyAlbumList').html('
      '); - for(var i=0; i' + albumName + ''; - albumLink += ''; - $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink); - } - $('#embedPhotoModalBodyAlbumDialog').addClass('d-none'); - $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none'); - } else { - window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']); - } - return false; - }, - 'json'); - }; diff --git a/view/tpl/cover_photo.tpl b/view/tpl/cover_photo.tpl index cbcf46320..829a3a556 100755 --- a/view/tpl/cover_photo.tpl +++ b/view/tpl/cover_photo.tpl @@ -1,3 +1,86 @@ + +

      {{$title}}

      diff --git a/view/tpl/profile_photo.tpl b/view/tpl/profile_photo.tpl index edde6af3f..e48d05330 100755 --- a/view/tpl/profile_photo.tpl +++ b/view/tpl/profile_photo.tpl @@ -1,3 +1,89 @@ + + +

      {{$title}}

      -- cgit v1.2.3 From a454aad124f999e59e8bffb625c103b975aef107 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 7 Mar 2018 15:39:14 -0800 Subject: federated polls: GNU-Social requires us to preserve the original order of the poll answers for use in making a vote, unlike diaspora (which selects by guid) and activitypub (which selects by non-localisable text). --- Zotlabs/Update/_1209.php | 26 ++++++++++++++++++++++++++ boot.php | 2 +- install/schema_mysql.sql | 4 +++- install/schema_postgres.sql | 2 ++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 Zotlabs/Update/_1209.php diff --git a/Zotlabs/Update/_1209.php b/Zotlabs/Update/_1209.php new file mode 100644 index 000000000..5ec449395 --- /dev/null +++ b/Zotlabs/Update/_1209.php @@ -0,0 +1,26 @@ + Date: Wed, 7 Mar 2018 16:59:55 -0800 Subject: hashtag autocomplete --- Zotlabs/Module/Hashtags.php | 29 +++++++++++++++++++++++++++++ view/js/autocomplete.js | 16 +++++++++++++++- 2 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 Zotlabs/Module/Hashtags.php diff --git a/Zotlabs/Module/Hashtags.php b/Zotlabs/Module/Hashtags.php new file mode 100644 index 000000000..d87a82818 --- /dev/null +++ b/Zotlabs/Module/Hashtags.php @@ -0,0 +1,29 @@ + strtolower($rv['term']) ]; + } + } + logger(print_r($result,true)); + json_return_and_die($result); + } +} \ No newline at end of file diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js index 01def9900..2d017db18 100644 --- a/view/js/autocomplete.js +++ b/view/js/autocomplete.js @@ -74,6 +74,10 @@ function bbco_format(item) { return "
      " + item + "
      "; } +function tag_format(item) { + return "
      " + '#' + item.text + "
      "; +} + function editor_replace(item) { if(typeof item.replace !== 'undefined') { return '$1$2' + item.replace; @@ -202,6 +206,16 @@ function string2bb(element) { }; + // Autocomplete hashtags + tags = { + match: /(^|\s)(\#)([^ \n]{2,})$/, + index: 3, + search: function(term, callback) { $.getJSON('/hashtags/' + '$f=&t=' + term).done(function(data) { callback($.map(data, function(entry) { return entry.text.indexOf(term) === 0 ? entry : null; })); }); }, + replace: function(item) { return "$1$2" + item.text + ' '; }, + template: tag_format + }; + + smilies = { match: /(^|\s)(:[a-z_:]{2,})$/, index: 2, @@ -211,7 +225,7 @@ function string2bb(element) { template: smiley_format }; this.attr('autocomplete','off'); - this.textcomplete([contacts,forums,smilies], {className:'acpopup', zIndex:1020}); + this.textcomplete([contacts,forums,smilies,tags], {className:'acpopup', zIndex:1020}); }; })( jQuery ); -- cgit v1.2.3 From 1700aedbed9050ca2eee621c04c29e5b34150bc5 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 7 Mar 2018 17:29:01 -0800 Subject: remove extraneous logging --- Zotlabs/Module/Hashtags.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Zotlabs/Module/Hashtags.php b/Zotlabs/Module/Hashtags.php index d87a82818..edb631871 100644 --- a/Zotlabs/Module/Hashtags.php +++ b/Zotlabs/Module/Hashtags.php @@ -8,8 +8,6 @@ class Hashtags extends \Zotlabs\Web\Controller { function init() { $result = []; - logger(print_r($_REQUEST,true)); - $t = escape_tags($_REQUEST['t']); if(! $t) json_return_and_die($result); @@ -23,7 +21,7 @@ class Hashtags extends \Zotlabs\Web\Controller { $result[] = [ 'text' => strtolower($rv['term']) ]; } } - logger(print_r($result,true)); + json_return_and_die($result); } } \ No newline at end of file -- cgit v1.2.3 From 2105cfd433d30e0277e5ae3080cec8620747759a Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 8 Mar 2018 10:20:40 +0100 Subject: fix syntax error in postgres update --- Zotlabs/Update/_1204.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Zotlabs/Update/_1204.php b/Zotlabs/Update/_1204.php index 93c2e4e3f..0b9204b9b 100644 --- a/Zotlabs/Update/_1204.php +++ b/Zotlabs/Update/_1204.php @@ -8,11 +8,11 @@ class _1204 { if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) { $r1 = q("ALTER TABLE poll ADD poll_guid text NOT NULL"); - $r2 = q("create index \"poll_guid_idx\" on poll \"poll_guid\""); + $r2 = q("create index \"poll_guid_idx\" on poll (\"poll_guid\")"); $r3 = q("ALTER TABLE poll_elm ADD pelm_guid text NOT NULL"); - $r4 = q("create index \"pelm_guid_idx\" on poll_elm \"pelm_guid\""); + $r4 = q("create index \"pelm_guid_idx\" on poll_elm (\"pelm_guid\")"); $r5 = q("ALTER TABLE vote ADD vote_guid text NOT NULL"); - $r6 = q("create index \"vote_guid_idx\" on vote \"vote_guid\""); + $r6 = q("create index \"vote_guid_idx\" on vote (\"vote_guid\")"); $r = ($r1 && $r2 && $r3 && $r4 && $r5 && $r6); } -- cgit v1.2.3 From a0a1246efb74473269238f7b3e4d35f90c11b49e Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 8 Mar 2018 10:50:03 +0100 Subject: use dbunescbin() for cover photos --- Zotlabs/Module/Cover_photo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Cover_photo.php b/Zotlabs/Module/Cover_photo.php index 2da99b447..56e35f912 100644 --- a/Zotlabs/Module/Cover_photo.php +++ b/Zotlabs/Module/Cover_photo.php @@ -207,7 +207,7 @@ class Cover_photo extends \Zotlabs\Web\Controller { } } - $imagedata = (($os_storage) ? @file_get_contents($imagedata) : $imagedata); + $imagedata = (($os_storage) ? @file_get_contents(dbunescbin($imagedata)) : dbunescbin($imagedata)); $ph = photo_factory($imagedata, $filetype); if(! $ph->is_valid()) { -- cgit v1.2.3 From 7ac70e1f2375b4a320c27ca4e50f75ee0b958fe4 Mon Sep 17 00:00:00 2001 From: "Mathieu \"Thrar\" Bacou" Date: Thu, 8 Mar 2018 20:14:44 +0100 Subject: Fix code background in wiki pages Fix needed after commit c444e40c016c0faaec604335093b19661b3585b7 --- view/theme/redbasic/schema/dark.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 0a142a07f..98e2bac9a 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -343,6 +343,10 @@ pre { border:1px solid #090909; } +#wiki-content-container code { + background: #000; +} + .notif-item a { color: #ccc; } -- cgit v1.2.3 From 76a80060034b381ac14d9d897b18c9d650347dd8 Mon Sep 17 00:00:00 2001 From: "Mathieu \"Matbac\" Bacou" Date: Thu, 8 Mar 2018 20:56:23 +0100 Subject: Fix background of tags field --- view/theme/redbasic/schema/dark.css | 38 ++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index 98e2bac9a..edc6e5f65 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -20,8 +20,18 @@ textarea, input, select margin-bottom: 5px; } +#jot-category-wrap { + background: #000; + border-bottom: none; + margin-bottom: 5px; +} + +.bootstrap-tagsinput { + background: #333; +} + optgroup { - color: #CCC !important; + color: #CCC !important; } option { @@ -132,7 +142,7 @@ option { .abook-self { border: 1px solid #222; color: #555; - background-color:#111; + background-color:#111; } .modal-content { @@ -208,7 +218,7 @@ a.btn, aside a { } .btn-danger:hover, .btn-danger:focus, form#chat-destroy > input:hover, form#chat-destroy > input:focus { color: #FFF !important; - background-color: #C9302C !important; + background-color: #C9302C !important; border-color: #AC2925 !important; } @@ -278,7 +288,7 @@ nav .dropdown-menu { border-bottom:1px solid #333; } -.nav-tabs .nav-link.active { +.nav-tabs .nav-link.active { color: #fff; background-color: #111; border-color: #333; @@ -297,7 +307,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { background-color: #222; } -a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { +a, a:visited, a:link, .fakelink, .fakelink:visited, .fakelink:link { font-weight: bold; } @@ -356,23 +366,23 @@ pre { } .dropdown-menu { - background-color: #222; + background-color: #222; } .dropdown-menu >li > a { - color: #ccc; + color: #ccc; } .dropdown-menu > li > a:hover, .dropdown-menu > li > a:focus { - color: #ddd; - background-color: #333; + color: #ddd; + background-color: #333; background-image: none; } .open .dropdown-toggle.btn-default, .open .dropdown-toggle.btn-default:focus { - color: #ccc; - background-color: #222; - border-color: #222; + color: #ccc; + background-color: #222; + border-color: #222; } .pmenu-item:hover a { @@ -448,7 +458,7 @@ pre { .profile-match-wrapper { - width: 150px; + width: 150px; height: 120px; border: none; } @@ -466,5 +476,3 @@ pre { .widget-nav-pills-checkbox:hover + a { background-color: #222; } - - -- cgit v1.2.3 From f9cca2422adb05db69c13ebd48d79e6108291d8f Mon Sep 17 00:00:00 2001 From: "Mathieu \"Matbac\" Bacou" Date: Thu, 8 Mar 2018 21:02:51 +0100 Subject: Remove useless background spec for category field --- view/theme/redbasic/schema/dark.css | 1 - 1 file changed, 1 deletion(-) diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index edc6e5f65..ebcfcdd13 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -21,7 +21,6 @@ textarea, input, select } #jot-category-wrap { - background: #000; border-bottom: none; margin-bottom: 5px; } -- cgit v1.2.3 From 500b141341451b5dcf31b7818c2e085cd7a98303 Mon Sep 17 00:00:00 2001 From: "Mathieu \"Matbac\" Bacou" Date: Thu, 8 Mar 2018 21:12:33 +0100 Subject: Uniformize title input with other input fields Add rounded corners to mimic categories input field and main text area. --- view/theme/redbasic/schema/dark.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css index ebcfcdd13..d0154bfb1 100644 --- a/view/theme/redbasic/schema/dark.css +++ b/view/theme/redbasic/schema/dark.css @@ -15,6 +15,10 @@ textarea, input, select padding: 10px 0; } +#jot-title { + border-radius: 3px; +} + #jot-title-wrap { border-bottom: none; margin-bottom: 5px; -- cgit v1.2.3 From 3ee35b83c2651b9c9ab6a27cab4ea6517375744f Mon Sep 17 00:00:00 2001 From: zotlabs Date: Thu, 8 Mar 2018 14:23:34 -0800 Subject: notifications-btn-1 does not actually require the text-white class and this is known to cause issues on dark themes --- view/tpl/navbar_default.tpl | 2 +- view/tpl/navbar_tucson.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index b0b3198c6..92b067bcb 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -80,7 +80,7 @@ {{if $localuser || $nav.pubs}} - {{/if}} diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index b0b3198c6..92b067bcb 100755 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -80,7 +80,7 @@ {{if $localuser || $nav.pubs}} - {{/if}} -- cgit v1.2.3 From 9c02c66ed3838c753f4d50354716abdf0dcc2a6d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 9 Mar 2018 09:17:57 +0100 Subject: remove redundant comma --- install/schema_mysql.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index 62cf6a5f2..1f396ee0e 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -993,7 +993,7 @@ CREATE TABLE IF NOT EXISTS `poll_elm` ( KEY `pelm_guid` (`pelm_guid`), KEY `pelm_poll` (`pelm_poll`), KEY `pelm_result` (`pelm_result`), - KEY `pelm_order` (`pelm_order`), + KEY `pelm_order` (`pelm_order`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE TABLE IF NOT EXISTS `profdef` ( -- cgit v1.2.3 From 78040330b6be3681dd0d6fdd1d3d0960fd88bc06 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 9 Mar 2018 11:06:05 +0100 Subject: update changelog --- CHANGELOG | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index f1a214da8..ad5e004c8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -Hubzilla 3.2 (????-??-??) +Hubzilla 3.2 (2018-03-09) - Improve rendering of Readme files in plugin settings - Add pdl file for mod moderate - Update redbasic theme screenshot -- cgit v1.2.3