Skip to content

Commit d21a135

Browse files
committed
Merge branch 'develop'
* develop: (41 commits) Fix styling Refactor CodeEditor component: Add methods for custom styles, themes, and minimum height configuration Add custom code editor component with theme support Implement code changes to enhance functionality and improve performance Add GuardPageTrait: Implement access control logic for permission checking Refactor LicenseManager: Update endpoint handling and add support email retrieval method Enhance license verification: Prioritize offline verification and cache results for improved efficiency Refactor LicenseManager: Move getLicenseKey method to public scope and remove duplicate private method Bugfix: Refactor navigation data processing to improve clarity and efficiency in getNavigation method Add user menu items for version display and configure action alignment in CmsPanelProvider Refactor LicenseCheck middleware to improve alert creation by chaining methods for type and size. Fix styling Refactor findByRoutePatternWithLangId method to use whereRaw for improved query safety Add language management functionality to ImportDataService Refactor SampleSeeder to streamline featured blogs configuration, enhance route handling in Content entity, and improve ImportDataService for language management and route upsertion. Refactor sidebar close button icon, remove unnecessary whitespace in AboutIndex, update BlogCardItem excerpt to use property, streamline BlogIndex pagination logic, enhance CaseStudyIndex layout by adjusting column sizes and removing sidebar elements. Update image asset paths from 'image' to 'images' in blogrock and know-press templates Refactor blog paths in seeders and templates to use 'blog-management' instead of 'blogs' Add new templates for Blog, Case Study, Contact, and Home pages Fix styling ...
2 parents f27ae93 + 3212459 commit d21a135

File tree

115 files changed

+2385
-859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

115 files changed

+2385
-859
lines changed

bin/build.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,9 @@ compile({
4747
...defaultOptions,
4848
entryPoints: ['./resources/js/index.js'],
4949
outfile: './resources/dist/inspirecms.js',
50+
})
51+
compile({
52+
...defaultOptions,
53+
entryPoints: ['./resources/js/components/code-editor.js'],
54+
outfile: './resources/dist/components/code-editor.js',
5055
})

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"filament/spatie-laravel-translatable-plugin": "^3.2",
2929
"guava/filament-icon-picker": "^2.0",
3030
"pboivin/filament-peek": "^2.0",
31-
"solution-forest/filament-field-group": "^1.0.10",
31+
"solution-forest/filament-field-group": "^1.0.14",
3232
"solution-forest/filament-tree": "^2.1.0",
3333
"solution-forest/inspirecms-support": "self.version",
3434
"spatie/laravel-package-tools": "^1.15.0",

0 commit comments

Comments
 (0)