Commit Graph

2317 Commits

Author SHA1 Message Date
Shaun Walker
d32b622f7e allow order to be defined in page templates 2021-06-16 17:24:45 -04:00
Shaun Walker
8354d66c84
Merge pull request #1489 from sbwalker/dev
allow order to be defined in page templates
2021-06-16 17:20:53 -04:00
Shaun Walker
7ee9923b52
Merge pull request #1483 from leigh-pointer/SResControlPanel
Introduce SharedResource Localisation to ControlPanel
2021-06-16 16:27:52 -04:00
Shaun Walker
31c412a886
Merge pull request #1488 from sbwalker/dev
improvements to refresh logic, module template enhancements
2021-06-16 16:26:53 -04:00
Shaun Walker
72ff6fa0e7 improvements to refresh logic, module template enhancements 2021-06-16 16:31:02 -04:00
Shaun Walker
c6e12a614a
Merge pull request #1485 from hishamco/database-projects
Add missing Oqtane.Server into Databases solution
2021-06-16 10:09:26 -04:00
Shaun Walker
cec24e7446 improve multi-tenancy navigation 2021-06-16 08:30:41 -04:00
Shaun Walker
05d7c7fc74
Merge pull request #1484 from hishamco/localization-cookie
Fix parsing localization cookie when the value is not present
2021-06-16 08:26:50 -04:00
Shaun Walker
0d10645d57
Merge pull request #1486 from sbwalker/dev
improve multi-tenancy navigation
2021-06-16 08:26:36 -04:00
hishamco
1bfe4fbd4f Add missing Oqtane.Server to Databases solutions 2021-06-16 11:55:36 +03:00
hishamco
c62a4ae8ae Fix parsing localization cookie when the value is not present 2021-06-16 11:02:12 +03:00
Leigh
4fcfb2ab4e Introduce SharedResource Localisation
Updated the ControlPanel to use Shared resources for;
 Add, Edit, Delete, Cancel

Corrected the SharedResources.cs namespace.
2021-06-16 09:46:33 +02:00
Leigh Pointer
0f208f3c30
Merge pull request #1 from oqtane/dev
merge
2021-06-16 09:19:09 +02:00
Shaun Walker
65a14da5a9 improve validation and exception handling in API Controllers 2021-06-15 19:11:00 -04:00
Shaun Walker
53f3245f1d
Merge pull request #1482 from sbwalker/dev
improve validation and exception handling in API Controllers
2021-06-15 19:06:52 -04:00
Shaun Walker
ffbabcfb28
Update README.md 2021-06-15 09:18:17 -04:00
Shaun Walker
0a2293119e added back missing ITenantManager registration removed in #1245 2021-06-15 08:32:39 -04:00
Shaun Walker
abd9e2798d
Merge pull request #1480 from sbwalker/dev
added back missing ITenantManager registration removed in #1245
2021-06-15 08:28:44 -04:00
Shaun Walker
f6cc11bd3b add logic removed in #1245 back to HttpClient creation 2021-06-15 08:23:26 -04:00
Shaun Walker
3e3bf937fd
Merge pull request #1479 from sbwalker/dev
add logic removed in #1245 back to HttpClient creation
2021-06-15 08:19:20 -04:00
Shaun Walker
0fd16fbb59 added Oqtane.Client to _Imports so it can find the new SharedResources class 2021-06-15 07:59:05 -04:00
Shaun Walker
b2098bb2db
Merge pull request #1478 from sbwalker/dev
added Oqtane.Client to _Imports so it can find the new SharedResources class
2021-06-15 07:54:54 -04:00
Shaun Walker
87c99e2ba7 Merge branch 'oqtane:dev' into dev 2021-06-15 07:46:51 -04:00
Shaun Walker
4a11524db3
Merge pull request #1245 from hishamco/clean-startup
Clean Startup Class
2021-06-15 07:45:12 -04:00
Shaun Walker
a9efc2792e
Merge pull request #96 from oqtane/dev
sync
2021-06-15 07:42:22 -04:00
Shaun Walker
9558894a4f moved SharedResources class to proper location 2021-06-15 07:43:12 -04:00
Shaun Walker
abfb451290
Merge branch 'dev' into dev 2021-06-15 07:42:02 -04:00
Shaun Walker
e279bca8ad
Merge pull request #1476 from leigh-pointer/SharedResource
SharedResources to reside at the project root.
2021-06-15 07:40:27 -04:00
Leigh
f2b3d6bc5f SharedResources to reside at the project root.
Namespace was changed from Oqtane to Oqtane.Client
2021-06-15 07:09:22 +02:00
Shaun Walker
28694fc11f added defensive logic to app.razor, relocated shared resource definition in preparation for utilizing shared resources 2021-06-14 17:29:23 -04:00
Shaun Walker
e99d62d5c7
Merge pull request #1475 from sbwalker/dev
added defensive logic to app.razor, relocated shared resource definition in preparation for utilizing shared resources
2021-06-14 17:25:23 -04:00
gjwalk
216dd39474 Merge branch 'oqtane:dev' into dev 2021-06-13 15:24:05 -04:00
Shaun Walker
643895b62b add icon for reuse 2021-06-12 09:21:24 -04:00
Shaun Walker
bd0ee1370c
Merge pull request #1471 from sbwalker/dev
add icon for reuse
2021-06-12 09:17:10 -04:00
hishamco
7c181b65cd Fix merge conflict 2021-06-12 00:18:57 +03:00
Shaun Walker
bdf36fc49c bug fixes 2021-06-11 17:07:54 -04:00
Shaun Walker
965b935128
Merge pull request #1470 from sbwalker/dev
bug fixes
2021-06-11 17:03:57 -04:00
hishamco
126024991c Merge remote-tracking branch 'upstream/dev' into clean-startup
# Conflicts:
#	Oqtane.Client/Program.cs
#	Oqtane.Server/Startup.cs
2021-06-11 23:54:38 +03:00
Shaun Walker
8f944e29ac set the DefaultDBType as the default database option in the Installer and Add Site UI 2021-06-11 08:43:46 -04:00
Shaun Walker
7b26ecfec8
Merge pull request #1467 from sbwalker/dev
set the DefaultDBType as the default database option in the Installer and Add Site UI
2021-06-11 08:40:17 -04:00
Shaun Walker
aa5aca3a8e back out auth policy header support as Blazor HttpClient is registered as Scoped and can not support variable headers 2021-06-11 07:54:02 -04:00
Shaun Walker
c46ef0fbc4
Merge pull request #1466 from sbwalker/dev
back out auth policy header support as Blazor HttpClient is registered as Scoped and can not support variable headers
2021-06-11 07:50:00 -04:00
Shaun Walker
d82fc8be90 added IsClickable Page property #1092, improve validation in Role Management, display database information in SQL Management, improve HttpClient header support 2021-06-10 20:10:46 -04:00
Shaun Walker
a51e7c2b44
Merge pull request #1465 from sbwalker/dev
added IsClickable Page property #1092, improve validation in Role Management, display database information in SQL Management, improve HttpClient header support
2021-06-10 20:06:41 -04:00
Shaun Walker
52d9c14d78
Update README.md 2021-06-10 13:06:05 -04:00
Shaun Walker
4bee097e66 fix Site Settings issue 2021-06-10 10:55:59 -04:00
Shaun Walker
6899a7cbb2
Merge pull request #1464 from sbwalker/dev
fix Site Settings issue
2021-06-10 10:51:49 -04:00
Shaun Walker
edc0e2a8fe
Merge pull request #1462 from albahadly/dev
fix issue: WebAssembly with IDM app
2021-06-10 10:46:52 -04:00
salwan albahadly
f5f374d2ae #1460 fix issue: WebAssembly with IDM app 2021-06-11 01:06:20 +12:00
Shaun Walker
ece90c39cb
Merge pull request #1461 from sbwalker/dev
refactoring, enhancements, and some fixes
2021-06-10 08:13:35 -04:00