diff --git a/app/admin/assets/package-lock.json b/app/admin/assets/package-lock.json index e298b5f469..b7061febba 100644 --- a/app/admin/assets/package-lock.json +++ b/app/admin/assets/package-lock.json @@ -4613,9 +4613,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "dev": true, "funding": [ { @@ -12854,9 +12854,9 @@ } }, "follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.4", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz", + "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==", "dev": true }, "forwarded": { diff --git a/app/admin/classes/PermissionManager.php b/app/admin/classes/PermissionManager.php index 5801751b0c..e8812ae7e8 100644 --- a/app/admin/classes/PermissionManager.php +++ b/app/admin/classes/PermissionManager.php @@ -74,6 +74,10 @@ public function listGroupedPermissions() $grouped[$group] = []; } + if (isset($permission->group)) { + $permission->group = $group; + } + $grouped[$group][] = $permission; } diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-au.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-au.min.js deleted file mode 100644 index b8d5f41cfa..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-au.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["en-AU"]={days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",monthsTitle:"Months",clear:"Clear",weekStart:1,format:"d/mm/yyyy"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-ca.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-ca.min.js deleted file mode 100644 index 7b1070f74d..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-ca.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["en-CA"]={days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",monthsTitle:"Months",clear:"Clear",weekStart:0,format:"yyyy-mm-dd"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-gb.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-gb.min.js deleted file mode 100644 index 2966f5414e..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-gb.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["en-GB"]={days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",monthsTitle:"Months",clear:"Clear",weekStart:1,format:"dd/mm/yyyy"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-ie.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-ie.min.js deleted file mode 100644 index dc8f71c026..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-ie.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["en-IE"]={days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",monthsTitle:"Months",clear:"Clear",weekStart:1,format:"dd/mm/yyyy"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-nz.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-nz.min.js deleted file mode 100644 index c374a8d40c..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-nz.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["en-NZ"]={days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",monthsTitle:"Months",clear:"Clear",weekStart:1,format:"d/mm/yyyy"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-za.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-za.min.js deleted file mode 100644 index 885a928cba..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.en-za.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["en-ZA"]={days:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],daysShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],daysMin:["Su","Mo","Tu","We","Th","Fr","Sa"],months:["January","February","March","April","May","June","July","August","September","October","November","December"],monthsShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],today:"Today",monthsTitle:"Months",clear:"Clear",weekStart:1,format:"yyyy/mm/d"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.fr-ch.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.fr-ch.min.js deleted file mode 100644 index 1c6bcdcbfc..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.fr-ch.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates.fr={days:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],daysShort:["Dim","Lun","Mar","Mer","Jeu","Ven","Sam"],daysMin:["D","L","Ma","Me","J","V","S"],months:["Janvier","Février","Mars","Avril","Mai","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre"],monthsShort:["Jan","Fév","Mar","Avr","Mai","Jui","Jul","Aou","Sep","Oct","Nov","Déc"],today:"Aujourd'hui",monthsTitle:"Mois",clear:"Effacer",weekStart:1,format:"dd.mm.yyyy"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.it-ch.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.it-ch.min.js deleted file mode 100644 index 7e1adbb95d..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.it-ch.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates.it={days:["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],daysShort:["Dom","Lun","Mar","Mer","Gio","Ven","Sab"],daysMin:["Do","Lu","Ma","Me","Gi","Ve","Sa"],months:["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre"],monthsShort:["Gen","Feb","Mar","Apr","Mag","Giu","Lug","Ago","Set","Ott","Nov","Dic"],today:"Oggi",clear:"Cancella",weekStart:1,format:"dd.mm.yyyy"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.nl-be.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.nl-be.min.js deleted file mode 100644 index 85d3146df1..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.nl-be.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["nl-BE"]={days:["zondag","maandag","dinsdag","woensdag","donderdag","vrijdag","zaterdag"],daysShort:["zo","ma","di","wo","do","vr","za"],daysMin:["zo","ma","di","wo","do","vr","za"],months:["januari","februari","maart","april","mei","juni","juli","augustus","september","oktober","november","december"],monthsShort:["jan","feb","mrt","apr","mei","jun","jul","aug","sep","okt","nov","dec"],today:"Vandaag",monthsTitle:"Maanden",clear:"Leegmaken",weekStart:1,format:"dd/mm/yyyy"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.pt-br.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.pt-br.min.js deleted file mode 100644 index 2d3f8afdac..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.pt-br.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["pt-BR"]={days:["Domingo","Segunda","Terça","Quarta","Quinta","Sexta","Sábado"],daysShort:["Dom","Seg","Ter","Qua","Qui","Sex","Sáb"],daysMin:["Do","Se","Te","Qu","Qu","Se","Sa"],months:["Janeiro","Fevereiro","Março","Abril","Maio","Junho","Julho","Agosto","Setembro","Outubro","Novembro","Dezembro"],monthsShort:["Jan","Fev","Mar","Abr","Mai","Jun","Jul","Ago","Set","Out","Nov","Dez"],today:"Hoje",monthsTitle:"Meses",clear:"Limpar",format:"dd/mm/yyyy"}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.zh-cn.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.zh-cn.min.js deleted file mode 100644 index 8e6920b0c8..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.zh-cn.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["zh-CN"]={days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],daysShort:["周日","周一","周二","周三","周四","周五","周六"],daysMin:["日","一","二","三","四","五","六"],months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthsShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],today:"今天",monthsTitle:"选择月份",clear:"清除",format:"yyyy-mm-dd",titleFormat:"yyyy年mm月",weekStart:1}}(jQuery); \ No newline at end of file diff --git a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.zh-tw.min.js b/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.zh-tw.min.js deleted file mode 100644 index e309c1d7d6..0000000000 --- a/app/admin/formwidgets/datepicker/assets/vendor/datepicker/locales/bootstrap-datepicker.zh-tw.min.js +++ /dev/null @@ -1 +0,0 @@ -!function(a){a.fn.datepicker.dates["zh-TW"]={days:["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],daysShort:["週日","週一","週二","週三","週四","週五","週六"],daysMin:["日","一","二","三","四","五","六"],months:["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],monthsShort:["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],today:"今天",format:"yyyy年mm月dd日",weekStart:1,clear:"清除"}}(jQuery); \ No newline at end of file diff --git a/app/admin/widgets/form/assets/js/form.js b/app/admin/widgets/form/assets/js/form.js index 116cf4b99a..625f804684 100644 --- a/app/admin/widgets/form/assets/js/form.js +++ b/app/admin/widgets/form/assets/js/form.js @@ -34,4 +34,4 @@ $(function () { $('[data-form-save-action]').attr('name', $selectedAction).attr('value', '1') Cookies.set('ti_activeFormSaveAction', JSON.stringify($selectedAction)) }) -}) +}); diff --git a/app/system/classes/UpdateManager.php b/app/system/classes/UpdateManager.php index ad1beb9411..9949ec44ce 100644 --- a/app/system/classes/UpdateManager.php +++ b/app/system/classes/UpdateManager.php @@ -390,8 +390,7 @@ public function requestUpdateList($force = false) $update['installedVer'] = params('ti_version'); if ($this->disableCoreUpdates) continue; - } - else { + } else { if ($this->isMarkedAsIgnored($update['code'])) { $ignoredItems[] = $update; continue; @@ -516,10 +515,12 @@ public function extractCore($fileCode) $configBackup = base_path('/config-backup'); File::moveDirectory($configDir, $configBackup); - $result = $this->extractFile($fileCode); - - File::copyDirectory($configBackup, $configDir); - File::deleteDirectory($configBackup); + try { + $result = $this->extractFile($fileCode); + } finally { + File::copyDirectory($configBackup, $configDir); + File::deleteDirectory($configBackup); + } return $result; } diff --git a/app/system/libraries/Country.php b/app/system/libraries/Country.php index 5a7a516d14..10476e8c60 100644 --- a/app/system/libraries/Country.php +++ b/app/system/libraries/Country.php @@ -14,7 +14,7 @@ class Country const ISO_CODE_3 = 3; protected $defaultFormat = [ - "{address_1}\n{address_2}\n{city} {postcode}\n{state}\n{country}", + "{address_1} \n{address_2} \n{city} {postcode}\n{state}\n{country}", ]; protected $requiredAddressKeys = [ diff --git a/themes/demo/_pages/home.blade.php b/themes/demo/_pages/home.blade.php index d7c8db361b..fa905fdab1 100755 --- a/themes/demo/_pages/home.blade.php +++ b/themes/demo/_pages/home.blade.php @@ -16,8 +16,8 @@

Learn more on themes and extension, see the Themes documentation.

- TastyIgniter Frontend + TastyIgniter Frontend

- \ No newline at end of file +