From dc9fa7cf64ee41e0c9457737079aee16093a4b9c Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 Jul 2016 16:04:00 -0700 Subject: include attach.php at the module level since 2d4b75428a87038 wasn't backported to dev and we're about to branch an RC --- Zotlabs/Module/Cloud.php | 3 +++ Zotlabs/Module/Dav.php | 1 + Zotlabs/Storage/Directory.php | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Zotlabs/Module/Cloud.php b/Zotlabs/Module/Cloud.php index 9845c5658..68d84e070 100644 --- a/Zotlabs/Module/Cloud.php +++ b/Zotlabs/Module/Cloud.php @@ -13,6 +13,9 @@ use \Zotlabs\Storage; // composer autoloader for SabreDAV require_once('vendor/autoload.php'); +require_once('include/attach.php'); + + /** * @brief Fires up the SabreDAV server. * diff --git a/Zotlabs/Module/Dav.php b/Zotlabs/Module/Dav.php index 9b4b576c8..ba2394388 100644 --- a/Zotlabs/Module/Dav.php +++ b/Zotlabs/Module/Dav.php @@ -14,6 +14,7 @@ use \Zotlabs\Storage; // composer autoloader for SabreDAV require_once('vendor/autoload.php'); +require_once('include/attach.php'); /** * @brief Fires up the SabreDAV server. diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index b524b3cab..6242d5274 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -206,7 +206,6 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota { throw new DAV\Exception\Forbidden('Permission denied.'); } - require_once('include/attach.php'); $mimetype = z_mime_content_type($name); -- cgit v1.2.3 From fc78ba7c2fce72a0ace3a853b782b7fd20c0ff40 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 Jul 2016 16:38:21 -0700 Subject: change std_version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index fd9f1752a..b4a54e180 100755 --- a/boot.php +++ b/boot.php @@ -44,7 +44,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.9.1' ); +define ( 'STD_VERSION', '1.10RC' ); define ( 'ZOT_REVISION', '1.1' ); define ( 'DB_UPDATE_VERSION', 1180 ); -- cgit v1.2.3 From c3617f5d1efd8d2d25041b58326231f503e68f18 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 Jul 2016 18:32:38 -0700 Subject: jquery update issue prevents comments from reloading and resetting watch cursor --- view/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/js/main.js b/view/js/main.js index 8280d2ddb..a288f98f5 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -640,7 +640,7 @@ function updateConvItems(mode,data) { var bimgcount = bimgs.length; if (bimgcount) { - bimgs.load(function() { + bimgs.on('load',function() { bimgcount--; if (! bimgcount) { collapseHeight(); -- cgit v1.2.3 From 4febdc3bcdb140d06acdc904f1429bce7c0a8755 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 Jul 2016 18:32:38 -0700 Subject: jquery update issue prevents comments from reloading and resetting watch cursor --- view/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/js/main.js b/view/js/main.js index 8280d2ddb..a288f98f5 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -640,7 +640,7 @@ function updateConvItems(mode,data) { var bimgcount = bimgs.length; if (bimgcount) { - bimgs.load(function() { + bimgs.on('load',function() { bimgcount--; if (! bimgcount) { collapseHeight(); -- cgit v1.2.3 From 25b2a6e0cf6ba9304bbe074afee0fed466cab506 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 Jul 2016 19:54:59 -0700 Subject: update changelog --- CHANGELOG | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7fc5835a7..bfb5ad2b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,44 @@ +Hubzilla 1.10 + Wiki: + Lots of enhanced functionality, usability improvements, and bugfixes from v1.8 + Turned into an optional feature (default on) but disabled in UNO + Sync: + Items are now relocated (links patched) when syncing to clones + Access Tokens: + New feature - allows members to create access controlled guest logins and create/share 'dropbox' style links to protected resources. + UI: + Use icons instead of iconic text constructs + Only request geolocation permission when creating a post, not on page load + provide 'redeliver' option on Delivery Report page for when things really stuff up + CalDAV/CardDAV management pages with heaps of functionality + Lib: + z_fetch_url() updated to accept different request methods and request bodies + item_store(), item_store_update() now return the stored items + vcard microformat changes to remain spec compliant + microformat meta tags added to post/comments + AbConfig API changed to use channel_id rather than channel_hash, which was overly complicated to use + SuperCurl class added to provide a framework for re-use of obscure CURL options + Allow absolute links to CSS/JS files on CDN + Add Let'sEncrypt intermediate cert to lib in case you forget to install it on the server + Update fullcalendar and jquery (3.1) libs + Update sabre/dav to 3.2.0 + Change content export from a month/year system to begin/end + Use streaming I/O for delivering large photos + Allow multiple App description files in a single plugin directory + optimise a couple of troublesome/inefficient SQL queries + avoid sending clone sync packets to dead sites + Resolved Issues: + channel home page not providing content to clients with javascript disabled + Replace '@' obfuscation with html entity rather than the unicode look-alike + xchan_query() failing to detect duplicates, resulting in inefficient queries + issues with 'use existing photo' for profile photo + layout editor "list all layouts" returned empty + oembed - better detect video file URLs so they aren't loaded into memory. + handcrafted bbcode tables could end up with way too much whitespace due to CRLF translation + refresh permissions whitescreen in 1.8 + force immediate profile photo update on local site + regression: 'save bookmarks' post action missing + Hubzilla 1.8 Administration: Cleanup and resolve some edge cases with addon repository manager -- cgit v1.2.3 From 883fc5d7532f05ffa782d5f0edeca6b3e8b2d39e Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 Jul 2016 19:54:59 -0700 Subject: update changelog --- CHANGELOG | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 7fc5835a7..bfb5ad2b2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,44 @@ +Hubzilla 1.10 + Wiki: + Lots of enhanced functionality, usability improvements, and bugfixes from v1.8 + Turned into an optional feature (default on) but disabled in UNO + Sync: + Items are now relocated (links patched) when syncing to clones + Access Tokens: + New feature - allows members to create access controlled guest logins and create/share 'dropbox' style links to protected resources. + UI: + Use icons instead of iconic text constructs + Only request geolocation permission when creating a post, not on page load + provide 'redeliver' option on Delivery Report page for when things really stuff up + CalDAV/CardDAV management pages with heaps of functionality + Lib: + z_fetch_url() updated to accept different request methods and request bodies + item_store(), item_store_update() now return the stored items + vcard microformat changes to remain spec compliant + microformat meta tags added to post/comments + AbConfig API changed to use channel_id rather than channel_hash, which was overly complicated to use + SuperCurl class added to provide a framework for re-use of obscure CURL options + Allow absolute links to CSS/JS files on CDN + Add Let'sEncrypt intermediate cert to lib in case you forget to install it on the server + Update fullcalendar and jquery (3.1) libs + Update sabre/dav to 3.2.0 + Change content export from a month/year system to begin/end + Use streaming I/O for delivering large photos + Allow multiple App description files in a single plugin directory + optimise a couple of troublesome/inefficient SQL queries + avoid sending clone sync packets to dead sites + Resolved Issues: + channel home page not providing content to clients with javascript disabled + Replace '@' obfuscation with html entity rather than the unicode look-alike + xchan_query() failing to detect duplicates, resulting in inefficient queries + issues with 'use existing photo' for profile photo + layout editor "list all layouts" returned empty + oembed - better detect video file URLs so they aren't loaded into memory. + handcrafted bbcode tables could end up with way too much whitespace due to CRLF translation + refresh permissions whitescreen in 1.8 + force immediate profile photo update on local site + regression: 'save bookmarks' post action missing + Hubzilla 1.8 Administration: Cleanup and resolve some edge cases with addon repository manager -- cgit v1.2.3 From 571b8cc85b3a770f16aed021bb39b889e0275ed6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sun, 17 Jul 2016 19:57:19 -0700 Subject: roll version --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot.php b/boot.php index fd9f1752a..a967636d2 100755 --- a/boot.php +++ b/boot.php @@ -44,7 +44,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '1.9.1' ); +define ( 'STD_VERSION', '1.11' ); define ( 'ZOT_REVISION', '1.1' ); define ( 'DB_UPDATE_VERSION', 1180 ); -- cgit v1.2.3 From f44ca74e9962dd2ae109c854924840b0adb0fc58 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 18 Jul 2016 13:48:09 +0200 Subject: do not transform hashes to tags in [code=xxx] or [code] blocks --- include/text.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/text.php b/include/text.php index 0b4f039af..d4d151f2e 100644 --- a/include/text.php +++ b/include/text.php @@ -687,7 +687,7 @@ function get_tags($s) { // ignore anything in a code block - $s = preg_replace('/\[code\](.*?)\[\/code\]/sm','',$s); + $s = preg_replace('/\[code(.*?)\](.*?)\[\/code\]/sm','',$s); // ignore anything in [style= ] $s = preg_replace('/\[style=(.*?)\]/sm','',$s); -- cgit v1.2.3 From 3beb94dc522453a0cfbf2705ed335b20aad5bc76 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 18 Jul 2016 13:52:26 +0200 Subject: whitespace --- boot.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/boot.php b/boot.php index b5740cde5..a967636d2 100755 --- a/boot.php +++ b/boot.php @@ -44,9 +44,7 @@ require_once('include/account.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); - define ( 'STD_VERSION', '1.11' ); - define ( 'ZOT_REVISION', '1.1' ); define ( 'DB_UPDATE_VERSION', 1180 ); -- cgit v1.2.3 From 269b3cef726a72460d77d3f533911a05fa78676a Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 18 Jul 2016 22:33:26 -0700 Subject: runaway cron emails --- boot.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/boot.php b/boot.php index a967636d2..08da2a9d6 100755 --- a/boot.php +++ b/boot.php @@ -2457,24 +2457,16 @@ function check_cron_broken() { set_config('system','lastcroncheck',datetime_convert()); return; } - $t = get_config('system','lastcroncheck'); - if($t === false) { - // This is serious. Config storage isn't working. - // We just set lastcroncheck. The system is horked. - // However don't add insult to injury by sending an email - // to the admin every time a page is accessed. - // just quietly - return; - } if($t > datetime_convert('UTC','UTC','now - 3 days')) { // Wait for 3 days before we do anything so as not to swamp the admin with messages return; } + set_config('system','lastcroncheck',datetime_convert()); + if(($d) && ($d > datetime_convert('UTC','UTC','now - 3 days'))) { // Scheduled tasks have run successfully in the last 3 days. - set_config('system','lastcroncheck',datetime_convert()); return; } -- cgit v1.2.3 From f4b658d7b15fda1369cfc07246ffed96215194d8 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 19 Jul 2016 05:13:18 -0700 Subject: issue #411 --- include/plugin.php | 1 + 1 file changed, 1 insertion(+) diff --git a/include/plugin.php b/include/plugin.php index 6dfda1cc9..cb206d944 100755 --- a/include/plugin.php +++ b/include/plugin.php @@ -626,6 +626,7 @@ function head_get_js() { $str = ''; if(App::$js_sources) { + ksort(App::$js_sources,SORT_NUMERIC); foreach(App::$js_sources as $sources) { if(count($sources)) { foreach($sources as $source) { -- cgit v1.2.3 From 9421e42dad0bee6e0aa292d390cf249e1d7f7df4 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Tue, 19 Jul 2016 17:04:38 -0700 Subject: doc correction --- Zotlabs/Storage/BasicAuth.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Storage/BasicAuth.php b/Zotlabs/Storage/BasicAuth.php index 60fc2c988..9c73b47b9 100644 --- a/Zotlabs/Storage/BasicAuth.php +++ b/Zotlabs/Storage/BasicAuth.php @@ -231,7 +231,7 @@ class BasicAuth extends DAV\Auth\Backend\AbstractBasic { } /** - * @brief Sets the timezone from the channel in RedBasicAuth. + * @brief Sets the timezone from the channel in BasicAuth. * * Set in mod/cloud.php if the channel has a timezone set. * -- cgit v1.2.3