Commit Graph

3766 Commits

Author SHA1 Message Date
sbwalker
2a5713ed67 restrict to a single theme per site 2023-06-22 11:32:03 -04:00
Leigh Pointer
b7c36c07c6 Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-22 06:03:04 +02:00
Shaun Walker
de93281f3e
Merge pull request #2920 from sbwalker/dev
cleanup and ensure site level scripts work properly
2023-06-21 15:49:13 -04:00
sbwalker
86fbdced1b cleanup and ensure site level scripts work properly 2023-06-21 15:49:00 -04:00
Shaun Walker
43bcfb9a4e
Merge pull request #2910 from vnetonline/dev
[ENHANCE] - Added Module to NameSpace [Owner].Module.[Module]
2023-06-21 09:57:36 -04:00
Shaun Walker
0daf6af3b8
Merge pull request #2918 from sbwalker/dev
fix #2387 - improve container selection in Edit Page
2023-06-21 09:20:23 -04:00
sbwalker
c3bccbade8 fix #2387 - improve container selection in Edit Page 2023-06-21 09:20:05 -04:00
Leigh Pointer
3261628da4 Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-21 14:59:49 +02:00
Shaun Walker
1e39f48235
Merge pull request #2917 from sbwalker/dev
fix null handling in stylesheet logic
2023-06-21 08:47:39 -04:00
sbwalker
05b5d9da9b fix null handling in stylesheet logic 2023-06-21 08:47:25 -04:00
Leigh Pointer
3491dde94a Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-21 14:46:44 +02:00
Shaun Walker
db2aa920e2
Merge pull request #2916 from sbwalker/dev
fix #2912 - move JavaScript handling from ThemeBuilder to component OnAfterRenderAsync
2023-06-21 08:32:11 -04:00
sbwalker
8067b2e634 fix #2912 - move JavaScript handling from ThemeBuilder to component OnAfterRenderAsync 2023-06-21 08:31:51 -04:00
vnetonline
273c6d7dee
Merge branch 'oqtane:dev' into dev 2023-06-21 10:21:30 +10:00
Leigh Pointer
4d0149a4a0 Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-20 14:53:57 +02:00
Shaun Walker
d9f3db5bf3
Merge pull request #2914 from sbwalker/dev
integrate old logic for managing stylesheets using JS Interop
2023-06-20 08:52:18 -04:00
sbwalker
c8a679ecce integrate old logic for managing stylesheets using JS Interop 2023-06-20 08:52:02 -04:00
vnetonline
3abe47ae9e [ENHANCE] - Added Module to NameSpace [Owner].Module.[Module]
[ENHANCE] - Added Module to NameSpace [Owner].Module.[Module]
2023-06-20 16:58:30 +10:00
Leigh Pointer
725a8dc237 Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-20 07:50:00 +02:00
Shaun Walker
fcb05a7834
Merge pull request #2908 from sbwalker/dev
fix parent page selection in add page and fix navigation on save/cancel
2023-06-19 16:22:57 -04:00
sbwalker
02e22df4d5 fix parent page selection in add page and fix navigation on save/cancel 2023-06-19 16:22:49 -04:00
Leigh Pointer
694c0af146 Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-19 21:52:12 +02:00
Shaun Walker
8bfca2f10a
Merge pull request #2905 from sbwalker/dev
more optimizations of Head component
2023-06-19 15:11:07 -04:00
sbwalker
6bea9a087c more optimizations of Head component 2023-06-19 15:10:58 -04:00
Shaun Walker
3f4218f75f
Merge pull request #2904 from sbwalker/dev
fix #2900 - theme deletion and fallback
2023-06-19 12:29:51 -04:00
sbwalker
3849f59126 fix #2900 - theme deletion and fallback 2023-06-19 12:29:43 -04:00
Leigh Pointer
239b12cbb0 Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-19 17:03:37 +02:00
Shaun Walker
8ccee87378
Merge pull request #2898 from vnetonline/dev
[ENHANCE] - Added Theme to Name Space [Owner].Theme.[Theme]
2023-06-19 10:25:01 -04:00
Shaun Walker
9e518ffc4c
Merge pull request #2903 from sbwalker/dev
add defensive logic
2023-06-19 10:11:32 -04:00
sbwalker
e3233fd19f add defensive logic 2023-06-19 10:11:24 -04:00
Shaun Walker
d3af9b0f14
Merge pull request #2902 from sbwalker/dev
optimize head component rendering
2023-06-19 09:01:53 -04:00
sbwalker
08daca848b optimize head component rendering 2023-06-19 09:01:40 -04:00
Leigh Pointer
c5da8e3b10 Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-19 10:32:47 +02:00
vnetonline
3b0ffde1fb [ENHANCE] - Added Theme to Name Space [Owner].Theme.[Theme]
changes all template files to conform to  [Owner].Theme.[Theme]
2023-06-16 14:52:13 +10:00
Shaun Walker
6ca97e8d5d
Merge pull request #2897 from sbwalker/dev
allow selection of site template during installation
2023-06-15 19:10:52 -04:00
sbwalker
34a727b435 allow selection of site template during installation 2023-06-15 19:10:37 -04:00
Leigh Pointer
6a9c865fec Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-14 15:52:56 +02:00
Shaun Walker
b1b9100600
Merge pull request #2896 from sbwalker/dev
create AppendHeadContent method to consolidate logic
2023-06-14 09:37:48 -04:00
sbwalker
bda0943d58 create AppendHeadContent method to consolidate logic 2023-06-14 09:37:34 -04:00
Leigh Pointer
ad6db71f7e Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-14 15:11:40 +02:00
Shaun Walker
b21d202c7f
Merge pull request #2895 from vnetonline/dev 2023-06-14 07:32:11 -04:00
vnetonline
3ea8ea1e3b Fixing the Library needed for declaring new way of theme resources 2023-06-14 19:13:04 +10:00
vnetonline
ee897a9973 Fixed targeting .NET 7.0 in ThemeController and ModuleDefinitionController missed in #2888 and #2890 2023-06-14 16:51:23 +10:00
Leigh Pointer
bb9ea3f60f Merge remote-tracking branch 'oqtane/dev' into dev 2023-06-14 06:35:28 +02:00
Shaun Walker
5f8cfb9977
Merge pull request #2893 from sbwalker/dev
update Installer to use new method for including CSS
2023-06-13 17:26:23 -04:00
sbwalker
d7928a70bf update Installer to use new method for including CSS 2023-06-13 17:26:07 -04:00
Shaun Walker
93568af5a9
Merge pull request #2892 from sbwalker/dev
upgrade external theme template to Bootstrap 5.3
2023-06-13 17:14:13 -04:00
sbwalker
9e86d97253 upgrade external theme template to Bootstrap 5.3 2023-06-13 17:13:59 -04:00
Shaun Walker
84bac0c462
Merge pull request #2891 from sbwalker/dev
upgrade to Bootstrap 5.3
2023-06-13 17:10:03 -04:00
sbwalker
3c18a258ff upgrade to Bootstrap 5.3 2023-06-13 17:09:49 -04:00