From 51c95e501e8da81c4e36c98dd67f754c63430d0e Mon Sep 17 00:00:00 2001 From: Andrew Embler Date: Wed, 6 Dec 2023 11:17:59 -0800 Subject: [PATCH 1/4] Fix error where mandatory internal attributes were not set to searchable, breaking certain functionality --- concrete/config/install/base/attributes.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/concrete/config/install/base/attributes.xml b/concrete/config/install/base/attributes.xml index 3a78e30f037..30c4138246f 100644 --- a/concrete/config/install/base/attributes.xml +++ b/concrete/config/install/base/attributes.xml @@ -230,9 +230,9 @@ - - - + + + From 6c8abdead4bb186539c7bcdd4fe5b2a9c2d5e9bc Mon Sep 17 00:00:00 2001 From: Andrew Embler Date: Wed, 6 Dec 2023 11:18:31 -0800 Subject: [PATCH 2/4] Updating version number --- build/tasks/build-release/download.js | 2 +- concrete/config/concrete.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/tasks/build-release/download.js b/build/tasks/build-release/download.js index 14f0647d180..0645ede9c22 100644 --- a/build/tasks/build-release/download.js +++ b/build/tasks/build-release/download.js @@ -3,7 +3,7 @@ const download = require('download'); module.exports = function(grunt, config, parameters, done) { - var zipUrl = parameters.releaseSourceZip || 'https://github.com/concretecms/concretecms/archive/refs/tags/9.2.3.zip'; + var zipUrl = parameters.releaseSourceZip || 'https://github.com/concretecms/concretecms/archive/refs/tags/9.2.4.zip'; var workFolder = parameters.releaseWorkFolder || './release'; function endForError(e) { process.stderr.write(e.message || e); diff --git a/concrete/config/concrete.php b/concrete/config/concrete.php index 905a25a23b1..aca03e05f55 100644 --- a/concrete/config/concrete.php +++ b/concrete/config/concrete.php @@ -6,8 +6,8 @@ * * @var string */ - 'version' => '9.2.3', - 'version_installed' => '9.2.3', + 'version' => '9.2.4', + 'version_installed' => '9.2.4', 'version_db' => '20231002142400', // the key of the latest database migration /* From c3275049c4122335575958793afa0a94c14db66b Mon Sep 17 00:00:00 2001 From: Andrew Embler Date: Wed, 6 Dec 2023 12:43:37 -0800 Subject: [PATCH 3/4] Improving appearance of X icon --- build/package-lock.json | 10 +++++----- build/package.json | 2 +- .../assets/social/scss/frontend/_share-this-page.scss | 6 ++++++ .../assets/social/scss/frontend/_social-links.scss | 6 ++++++ concrete/css/features/social/frontend.css | 2 +- concrete/js/cms.js | 2 +- concrete/js/features/documents/frontend.js | 2 +- concrete/src/Sharing/ShareThisPage/ServiceList.php | 2 +- concrete/src/Sharing/SocialNetwork/ServiceList.php | 2 +- concrete/themes/atomik/css/scss/features/_social.scss | 2 ++ concrete/themes/atomik/css/skins/default.css | 2 +- concrete/themes/atomik/css/skins/rustic-elegance.css | 2 +- concrete/themes/atomik/main.js | 2 +- concrete/themes/atomik/page_theme.php | 1 + concrete/themes/dashboard/main.js | 2 +- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/build/package-lock.json b/build/package-lock.json index f6ea02c311a..d393738eb52 100644 --- a/build/package-lock.json +++ b/build/package-lock.json @@ -12,7 +12,7 @@ "tui-image-editor": "^3.10.0" }, "devDependencies": { - "@concretecms/bedrock": "^1.4.10", + "@concretecms/bedrock": "^1.4.12", "cross-env": "^5.1.1", "download": "~8.0.0", "grunt": "^1.5.3", @@ -1654,9 +1654,9 @@ } }, "node_modules/@concretecms/bedrock": { - "version": "1.4.10", - "resolved": "https://registry.npmjs.org/@concretecms/bedrock/-/bedrock-1.4.10.tgz", - "integrity": "sha512-yNJcYh39C9MPK3+121wAjq5WoxQGubFNYfVCuqVZXt9qN71PJn1OSW1r+kUsGBBo06w1ScZW9qLV6szyWgrmXw==", + "version": "1.4.12", + "resolved": "https://registry.npmjs.org/@concretecms/bedrock/-/bedrock-1.4.12.tgz", + "integrity": "sha512-+sS4J2kLUD1JytyX+TKKAiNswvfwlc8oQ1wAyUAujz7wHf0N8cXJJN2ge705Xkpk+HfjdJy6wg00R2hGwsqSAw==", "dev": true, "dependencies": { "@fortawesome/fontawesome-free": "^5.15.1", @@ -1665,7 +1665,7 @@ "backstretch": "^1.2.2", "blueimp-file-upload": "^10.31.0", "bootbox": "github:makeusabrew/bootbox#master", - "bootstrap": "^5.2.0", + "bootstrap": "5.2.3", "bootstrap-select": "github:snapappointments/bootstrap-select", "bootstrap-tourist": "git+https://git@github.com/concrete5/bootstrap-tourist.git", "check-password-strength": "^2.0.7", diff --git a/build/package.json b/build/package.json index 145ed7d1e86..e4460874fcd 100644 --- a/build/package.json +++ b/build/package.json @@ -13,7 +13,7 @@ "production": "mix --production" }, "devDependencies": { - "@concretecms/bedrock": "^1.4.10", + "@concretecms/bedrock": "^1.4.12", "cross-env": "^5.1.1", "download": "~8.0.0", "grunt": "^1.5.3", diff --git a/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_share-this-page.scss b/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_share-this-page.scss index ceaea71400a..c661c94d973 100644 --- a/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_share-this-page.scss +++ b/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_share-this-page.scss @@ -10,3 +10,9 @@ margin-right: 10px; padding: 0; } + +.ccm-block-share-this-page { + svg { + max-height: 13px; + } +} diff --git a/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_social-links.scss b/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_social-links.scss index 3ae4f69ba35..5ce036fbdf8 100644 --- a/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_social-links.scss +++ b/concrete/bedrock/assets/@concretecms/bedrock/assets/social/scss/frontend/_social-links.scss @@ -10,3 +10,9 @@ margin-right: 10px; padding: 0; } + +.ccm-block-social-links { + svg { + max-height: 13px; + } +} diff --git a/concrete/css/features/social/frontend.css b/concrete/css/features/social/frontend.css index 7414f193ae8..e07121969ba 100644 --- a/concrete/css/features/social/frontend.css +++ b/concrete/css/features/social/frontend.css @@ -1 +1 @@ -.ccm-block-share-this-page ul.list-inline{display:inline-block;margin:0;padding:0}.ccm-block-share-this-page ul.list-inline li{display:inline-block;list-style-type:none;margin-right:10px;padding:0}.ccm-block-social-links ul.list-inline{display:inline-block;margin:0;padding:0}.ccm-block-social-links ul.list-inline li{display:inline-block;list-style-type:none;margin-right:10px;padding:0} +.ccm-block-share-this-page ul.list-inline{display:inline-block;margin:0;padding:0}.ccm-block-share-this-page ul.list-inline li{display:inline-block;list-style-type:none;margin-right:10px;padding:0}.ccm-block-share-this-page svg{max-height:13px}.ccm-block-social-links ul.list-inline{display:inline-block;margin:0;padding:0}.ccm-block-social-links ul.list-inline li{display:inline-block;list-style-type:none;margin-right:10px;padding:0}.ccm-block-social-links svg{max-height:13px} diff --git a/concrete/js/cms.js b/concrete/js/cms.js index 3ab37452dc7..372da079e12 100644 --- a/concrete/js/cms.js +++ b/concrete/js/cms.js @@ -1,4 +1,4 @@ -(()=>{var __webpack_modules__={8161:(e,t,i)=>{function n(e){return n="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},n(e)}!function(e,t){"use strict";function i(e){var i=this;e=e||{},e=t.extend({dataType:"json",type:"post",loader:"standard",error:function(e){i.error(e,i)},complete:function(){i.complete(i)},skipResponseValidation:!1},e),i.options=e,i.execute()}i.prototype={execute:function(){var e=this,i=e.options,n=i.success;i.success=function(t){e.success(t,e,n)},e.before(e),t.ajax(i)},before:function(e){e.options.loader&&t.fn.dialog.showLoader()},errorResponseToString:function(e){return i.renderErrorResponse(e,!0)},error:function(e,t){0!==e.readyState&&(ConcreteEvent.fire("AjaxRequestError",{response:e}),ConcreteAlert.dialog(ccmi18n.error,i.renderErrorResponse(e,!0)))},validateResponse:function(e,t){return e.error?(ConcreteEvent.fire("AjaxRequestError",{response:e}),ConcreteAlert.dialog(ccmi18n.error,i.renderJsonError(e),(function(){t&&t(!1,e)})),!1):(t&&t(!0,e),!0)},success:function(e,t,i){("json"!=t.options.dataType||t.options.skipResponseValidation||t.validateResponse(e))&&i&&i(e)},complete:function(e){e.options.loader&&t.fn.dialog.hideLoader()}},i.renderJsonError=function(e,i){if(!e)return"";var o=function(i,n){return"number"==typeof n&&t.isArray(e.htmlErrorIndexes)&&t.inArray(n,e.htmlErrorIndexes)>=0?i:t("
").text(i).html().replace(/\n/g,"
")},r="";if("object"===n(e.error)&&t.isArray(e.error.trace)){r='

'+o(e.error.message)+"

",r+='

'+ccmi18n.errorDetails+"

",r+='';for(var s,a=0;a";r+="
"+s.file+"("+s.line+"): "+s.class+"->"+s.function+"
"}else t.isArray(e.errors)&&e.errors.length>0&&"string"==typeof e.errors[0]?t.each(e.errors,(function(e,t){r+='

'+o(t,e)+"

"})):"string"==typeof e.error&&""!==e.error&&(r='

'+o(e.error)+"

");return r},i.renderErrorResponse=function(e,t){return i.renderJsonError(e.responseJSON,t)||e.responseText},i.validateResponse=i.prototype.validateResponse,i.errorResponseToString=i.prototype.errorResponseToString,t.concreteAjax=function(e){new i(e)},e.ConcreteAjaxRequest=i}(i.g,jQuery)},5499:(e,t,i)=>{!function(e,t){"use strict";function i(e,i){return i=t.extend({iframe:!0,task:!1,dragAreaBlockID:!1,dragArea:null,bID:!1,loader:!0},i),this.options=i,i.dragAreaBlockID&&e.find("input[name=dragAreaBlockID]").val(i.dragAreaBlockID),ConcreteAjaxForm.call(this,e,i),e}i.prototype=Object.create(ConcreteAjaxForm.prototype),i.prototype.before=function(e){t.fn.dialog.showLoader(),ConcreteEvent.fire("EditModeBeforeBlockSubmit",{form:e})},i.prototype.refreshBlock=function(e){var i=this,n=e.cID?e.cID:CCM_CID,o=new Concrete.getEditMode,r=o.getAreaByID(e.aID),s=r.getEnableGridContainer()?1:0,a=CCM_DISPATCHER_FILENAME+"/ccm/system/block/render";t.fn.dialog.closeTop(),t.get(a,{arHandle:r.getHandle(),cID:n,bID:e.bID,arEnableGridContainer:s,placeholder:"",tempFilename:e.tempFilename},(function(e){var n,s=Concrete.getEditMode(),a=r.inEditMode(s);if(ConcreteToolbar.disableDirectExit(),t.fn.dialog.hideLoader(),"add"==i.options.task){var l=a.getElem(),c=t(e);if(!c.hasClass("ccm-block-edit")){var u=c.find(".ccm-block-edit");u.length&&(n=new Concrete.Block(u,s)).setArea(a)}if(n||(n=new Concrete.Block(c,s)).setArea(a),"core_area_layout"===i.options.btHandle)l.children(".ccm-area-block-list").append(c);else{var d=t(i.options.placeholder);d.length?d.replaceWith(c):l.children(".ccm-area-block-list").prepend(c)}ConcreteAlert.notify({message:ccmi18n.addBlockMsg,title:ccmi18n.addBlock}),t.fn.dialog.closeAll(),i.options.btSupportsInlineAdd&&(o.destroyInlineEditModeToolbars(),ConcreteEvent.fire("EditModeExitInlineComplete",{block:n})),ConcreteEvent.fire("EditModeAddBlockComplete",{block:n})}else{var h=(n=a.getBlockByID(i.options.bID)).replace(e);ConcreteAlert.notify({message:ccmi18n.updateBlockMsg,title:ccmi18n.updateBlock}),i.options.btSupportsInlineEdit&&(o.destroyInlineEditModeToolbars(),ConcreteEvent.fire("EditModeExitInlineComplete",{block:h})),ConcreteEvent.fire("EditModeUpdateBlockComplete",{block:h})}}))},i.prototype.success=function(e,i){var n=i.$form[0];if(e.newbID&&n){var o=n.action,r=o.substring(o.indexOf("&bID=")),s=o.replace(r,"&bID="+e.newbID);t(n).attr("action",s)}i.options.progressiveOperation?i.handleProgressiveOperation(e,(function(e){i.refreshBlock(e)})):i.validateResponse(e)&&i.refreshBlock(e)},t.fn.concreteAjaxBlockForm=function(e){return t.each(t(this),(function(n,o){new i(t(this),e)}))},e.ConcreteAjaxBlockForm=i}(i.g,jQuery)},1002:(e,t,i)=>{!function(e,t){"use strict";function i(e,i){var n=this;return i=i||{},(i=t.extend({progressiveOperation:!1,progressiveOperationTitle:"",progressiveOperationElement:null,beforeSubmit:n.before,complete:n.complete,data:{},error:null,skipResponseValidation:!1},i)).data||(i.data={}),i.data.__ccm_consider_request_as_xhr="1",n.$form=e,ConcreteAjaxRequest.call(n,i),n.$form}i.prototype=Object.create(ConcreteAjaxRequest.prototype),i.prototype.execute=function(){var e=this,t=e.options,i=t.success,n=t.error;e.$form.ajaxForm({type:t.type,data:t.data,url:t.url,dataType:t.dataType,beforeSubmit:function(){t.beforeSubmit(e)},error:function(t){e.error(t,e,n)},success:function(t){e.success(t,e,i)},complete:function(){t.complete(e)}})},i.prototype.handleProgressiveOperation=function(e,t){jQuery.fn.dialog.hideLoader(),new ConcreteProgressiveOperation({response:e,title:this.options.progressiveOperationTitle,element:this.options.progressiveOperationElement,onComplete:function(){t(e)}})},i.prototype.error=function(e,t,i){ConcreteAjaxRequest.prototype.error(e,t),i&&i(e)},i.prototype.doFinish=function(e){ConcreteEvent.publish("AjaxFormSubmitSuccess",{response:e,form:this.$form.attr("data-dialog-form")}),e.redirectURL?window.location.href=e.redirectURL:e.reloadCurrentPage?window.location.reload():(this.$form.attr("data-dialog-form")&&t.fn.dialog.closeTop(),e.message&&ConcreteAlert.notify({message:e.message,title:e.title}))},i.prototype.success=function(e,t,i){(t.options.skipResponseValidation||t.validateResponse(e))&&(i?t.options.progressiveOperation?t.handleProgressiveOperation(e,(function(e){i(e)})):i(e):t.options.progressiveOperation?t.handleProgressiveOperation(e,(function(e){t.doFinish(e)})):t.doFinish(e))},t.fn.concreteAjaxForm=function(e){return t.each(t(this),(function(n,o){new i(t(this),e)}))},e.ConcreteAjaxForm=i}(i.g,jQuery)},3157:()=>{!function(e,t){"use strict";var i={getAssetURL:function(e){var t=-1!=e.indexOf("?")?"&ts=":"?ts=";return e+t+(new Date).getTime()},loadJavaScript:function(e){if(!t('script[src*="'+e+'"]').length&&!t('script[data-source~="'+e+'"]').length){var i=this.getAssetURL(e);t("head").append('