Shaun Walker
|
2e947625cd
|
fix issue with HtmlText module rendering
|
2021-06-18 16:36:18 -04:00 |
|
Shaun Walker
|
8bc0402801
|
fix syntax error
|
2021-06-18 16:30:49 -04:00 |
|
Shaun Walker
|
dc44fcd0d9
|
Merge pull request #1493 from gjwalk/dev
create default rex files with static keys
|
2021-06-18 16:21:37 -04:00 |
|
gjwalk
|
f7363504c2
|
Merge branch 'dev' into dev
|
2021-06-18 15:35:20 -04:00 |
|
Grayson Walker
|
ae0edcfd2d
|
create default rex files with static keys
|
2021-06-18 14:45:38 -04:00 |
|
Shaun Walker
|
b180c260e5
|
Merge pull request #1492 from sbwalker/dev
improved error handling, improved consistency of console error messages, added ability to add a Decimal column in Migrations
|
2021-06-18 12:57:21 -04:00 |
|
Shaun Walker
|
3bc5744007
|
improved error handling, improved consistency of console error messages, added ability to add a Decimal column in Migrations
|
2021-06-18 13:01:42 -04:00 |
|
Shaun Walker
|
32c49f74d3
|
fix module template issues
|
2021-06-17 12:12:19 -04:00 |
|
Shaun Walker
|
8b70d1ccdc
|
Merge pull request #1491 from sbwalker/dev
fix module template issues
|
2021-06-17 12:08:03 -04:00 |
|
Shaun Walker
|
f330c4fcb6
|
add extension method for Localization which allows specification of key and value
|
2021-06-16 22:16:48 -04:00 |
|
Shaun Walker
|
a953ca752e
|
Merge pull request #1490 from sbwalker/dev
add extension method for Localization which allows specification of key and value
|
2021-06-16 22:12:48 -04:00 |
|
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 |
|