Commit Graph

3953 Commits

Author SHA1 Message Date
Leigh Pointer
bd23ec268b Merge remote-tracking branch 'oqtane/dev' into dev 2023-08-08 15:34:25 +02:00
Shaun Walker
1d5f23c3c7
Merge pull request #3123 from leigh-pointer/TransKeys
Trans keys
2023-08-08 09:33:43 -04:00
Leigh Pointer
f424bf53b3 Revert Title to "Folder Management"
This is due to the public virtual string Title can not use the Localize instance as it not yet created so error with null reference.
2023-08-08 15:30:39 +02:00
Leigh Pointer
efbdf0006e Merge remote-tracking branch 'oqtane/dev' into TransKeys 2023-08-08 15:22:03 +02:00
Shaun Walker
625b173ee4
Merge pull request #3122 from leigh-pointer/TransKeys
Updated the Settings Heading
2023-08-08 08:05:21 -04:00
Leigh Pointer
0a8d9bc3d3 Updated the Settings Heading 2023-08-08 14:01:45 +02:00
Shaun Walker
0d0909a461
Merge pull request #3120 from leigh-pointer/TransKeys
Translation for thread #3094
2023-08-08 07:55:35 -04:00
Shaun Walker
ebb0a538f8
Merge pull request #3121 from sbwalker/dev
improve sync service to always rely on server dates
2023-08-08 07:51:26 -04:00
sbwalker
337a566617 improve sync service to always rely on server dates 2023-08-08 07:51:07 -04:00
Leigh Pointer
fecee7a12b Translation for thread #3094
Updated the Missing or incorrect keys
2023-08-08 13:30:10 +02:00
Leigh Pointer
282ec99ce8 Merge remote-tracking branch 'oqtane/dev' into dev 2023-08-08 12:14:18 +02:00
Shaun Walker
17a4985ebe
Merge pull request #3119 from sbwalker/dev
fix Section component localization
2023-08-07 17:11:36 -04:00
sbwalker
13b17d91a9 fix Section component localizatioon 2023-08-07 17:11:17 -04:00
Shaun Walker
5782005007
Merge pull request #3118 from sbwalker/dev
improve reload in router to prevent looping
2023-08-07 15:40:00 -04:00
sbwalker
258f2dbe8f improve reload in router to prevent looping 2023-08-07 15:39:44 -04:00
Shaun Walker
e7b35bd0c2
Merge pull request #3117 from sbwalker/dev
fix #3094 - localization of admin module titles
2023-08-07 12:14:11 -04:00
sbwalker
176bd229e6 fix #3094 - localization of admin module titles 2023-08-07 12:13:53 -04:00
Leigh Pointer
c12f1251b0 Merge remote-tracking branch 'oqtane/dev' into dev 2023-08-07 18:07:11 +02:00
Shaun Walker
0710736661
Merge pull request #3116 from sbwalker/dev
improve code documentation
2023-08-07 10:39:40 -04:00
sbwalker
51ebe520f4 improve code documentation 2023-08-07 10:39:24 -04:00
Shaun Walker
1ef566c824
Merge pull request #3115 from sbwalker/dev
fix issue where user could not be shared across multiple sites
2023-08-07 09:58:41 -04:00
sbwalker
96cf06fe8d fix issue where user could not be shared across multiple sites 2023-08-07 09:58:24 -04:00
Shaun Walker
38ebfdcd0c
Merge pull request #3114 from sbwalker/dev
fix #3108 - raise reload event after user logs out
2023-08-07 09:34:37 -04:00
sbwalker
b5649e2a6f fix #3108 - raise reload event after user logs out 2023-08-07 09:34:20 -04:00
Shaun Walker
5fc6dadeae
Merge pull request #3113 from sbwalker/dev
prepare for 4.0.2 release
2023-08-06 08:34:05 -04:00
sbwalker
22cfec9276 prepare for 4.0.2 release 2023-08-06 08:33:36 -04:00
Shaun Walker
0a82ec5f0a
Update README.md 2023-08-06 08:32:05 -04:00
Shaun Walker
3bdd1f6c4f
Merge pull request #3112 from sbwalker/dev
use new GetJsonAsync method in external module template
2023-08-06 08:19:16 -04:00
sbwalker
1e466dc1fe use new GetJsonAsync method in external module template 2023-08-06 08:17:56 -04:00
Shaun Walker
3b302d2f86
Merge pull request #3111 from sbwalker/dev
change Help button style
2023-08-06 07:58:50 -04:00
sbwalker
7f108eebf9 change Help button style 2023-08-06 07:58:27 -04:00
Leigh Pointer
9d41fee2fe Merge remote-tracking branch 'oqtane/dev' into dev 2023-08-06 09:39:41 +02:00
Shaun Walker
bef686f95a
Merge pull request #3110 from sbwalker/dev
change defaultvalue parameter to defaultResult to make more intuitive
2023-08-05 16:35:04 -04:00
sbwalker
4bdcb974bd change defaultvalue parameter to defaultResult to make more intuitive 2023-08-05 16:34:41 -04:00
Shaun Walker
af042bd23c
Merge pull request #3109 from sbwalker/dev
introduce new GetJsonAsync method with default value parameter
2023-08-05 09:01:03 -04:00
sbwalker
19e3cef7dd introduce new GetJsonAsync method with default value parameter 2023-08-05 09:00:38 -04:00
Shaun Walker
085ab4bfb4
Merge pull request #3107 from sbwalker/dev
add transparency support on image resizing
2023-08-04 16:07:50 -04:00
sbwalker
f7bd03d051 add transparency support on image resizing 2023-08-04 16:07:37 -04:00
Shaun Walker
b48d751717
Merge pull request #3106 from sbwalker/dev
update Module and Theme Install UI to match Marketplace - including logos and support for sorting
2023-08-04 15:17:36 -04:00
sbwalker
92a4a1b210 update Module and Theme Install UI to match Marketplace - including logos and support for sorting 2023-08-04 15:17:17 -04:00
Shaun Walker
6a57fcc04a
Merge pull request #3103 from sbwalker/dev
fix GetFolderByPath to support root folder path
2023-08-03 17:29:26 -04:00
sbwalker
749e11762f fix GetFolderByPath to support root folder path 2023-08-03 17:29:02 -04:00
Shaun Walker
61817726c3
Merge pull request #3102 from sbwalker/dev
fix issue where meta name="description" tags were being excluded from output
2023-08-03 16:02:49 -04:00
sbwalker
808354e969 fix issue where meta name="description" tags were being excluded from output 2023-08-03 16:02:34 -04:00
Shaun Walker
d2f594ff4a
Merge pull request #3101 from sbwalker/dev
fix #3069 - exclude templates from release packages
2023-08-03 15:27:05 -04:00
sbwalker
fa18467cdd fix #3069 - exclude templates from release packages 2023-08-03 15:26:23 -04:00
Shaun Walker
4c940d02ef
Merge pull request #3100 from sbwalker/dev
add error handling and logging to folder creation logic
2023-08-03 14:48:58 -04:00
sbwalker
04202a6b70 Merge branch 'dev' of https://github.com/sbwalker/oqtane.framework into dev 2023-08-03 14:45:39 -04:00
sbwalker
4483901270 fix #3072 - add error handling and logging to folder creation logic 2023-08-03 14:45:27 -04:00
Leigh Pointer
f02d894697 Merge remote-tracking branch 'oqtane/dev' into dev 2023-08-03 20:25:17 +02:00