Commit Graph

2046 Commits

Author SHA1 Message Date
Charles Nurse
f2ae1e3bff Merge commit '42265cdda4ea03541522bf5cf5d104059927393f' into dev
# Conflicts:
#	Oqtane.Server/Infrastructure/DatabaseManager.cs
2021-05-24 15:40:35 -07:00
Charles Nurse
a0838cbc84 3rd attempt to resolve conflicts 2021-05-24 15:14:58 -07:00
Charles Nurse
17f5f39a54 2nd attempt to Fix conflict 2021-05-24 15:12:41 -07:00
Charles Nurse
4853a64cf9 Fix conflict 2021-05-24 15:08:44 -07:00
Charles Nurse
69376c5baf Missing files from previous commit 2021-05-24 14:46:54 -07:00
Charles Nurse
42265cdda4 Fix Upgrade issue with new componentized Database projects 2021-05-24 14:46:12 -07:00
Shaun Walker
6283fc9abb
Merge pull request #1396 from sbwalker/dev
remove Microsoft.EntityFrameworkCore.Relational from Oqtane.Shared as it is no longer needed
2021-05-24 16:39:33 -04:00
Shaun Walker
723002968a remove Microsoft.EntityFrameworkCore.Relational from Oqtane.Shared as it is no longer needed 2021-05-24 16:43:17 -04:00
Shaun Walker
1f7207bd5a
Merge pull request #1395 from sbwalker/dev
fix #1272 - add support for ref folder in package installation
2021-05-24 15:51:02 -04:00
Shaun Walker
72b06b16cf fix #1272 - add support for ref folder in package installation 2021-05-24 15:50:38 -04:00
Shaun Walker
8c70913a72
Merge pull request #1394 from cnurse/dev
Rename IOqtaneDatabase interface (and related base class)
2021-05-24 15:19:33 -04:00
Charles Nurse
4a609b444e Rename IOqtaneDatabase interface (and related base class) 2021-05-24 11:57:47 -07:00
Shaun Walker
791e786db8
Update appsettings.release.json 2021-05-24 09:03:57 -04:00
Shaun Walker
e5229626ab
Update appsettings.json 2021-05-24 09:03:04 -04:00
Shaun Walker
34ed19deda
Merge pull request #1393 from sbwalker/dev
added PackageName property to IModule and ITheme interfaces to allow creators to specify the Nuget package name associated to a specific module/theme. This is necessary for packages which contain multiple extensions.
2021-05-24 08:55:57 -04:00
Shaun Walker
5c21ab37ee added PackageName property to IModule and ITheme interfaces to allow creators to specify the Nuget package name associated to a specific module/theme. This is necessary for packages which contain multiple extensions. 2021-05-24 08:59:50 -04:00
Shaun Walker
41ed069072 fix #1389 - exception in PrincipalValidator 2021-05-24 08:17:46 -04:00
Shaun Walker
80c82a9ec3
Merge pull request #1392 from sbwalker/dev
fix #1389 - exception in PrincipalValidator
2021-05-24 08:14:56 -04:00
Shaun Walker
d69ceecb41
Merge pull request #1388 from sbwalker/dev
implemented Label component in Installer for consistency and removed redundant logic
2021-05-23 11:13:42 -04:00
Shaun Walker
63378e1654 implemented Label component in Installer for consistency and removed redundant logic 2021-05-23 11:17:23 -04:00
Shaun Walker
3f48c1f8fe fix #1367 - provides support for multiple entities in auth policy and makes parameter names more intuitive - backward compatible with entityid 2021-05-23 10:29:05 -04:00
Shaun Walker
35aaf476d0
Merge pull request #1387 from sbwalker/dev
fix #1367 - provides support for multiple entities in auth policy and makes parameter names more intuitive - backward compatible with entityid
2021-05-23 10:25:17 -04:00
Shaun Walker
fc3ba14d0f
Merge pull request #1385 from 2sic-forks/dev 2021-05-22 08:25:06 -04:00
Shaun Walker
76879163d4
Merge pull request #1386 from cnurse/dev 2021-05-22 08:21:26 -04:00
Charles Nurse
342dae4aa7 Fix bug with MySQL Installation caused by new Migration 2021-05-21 16:38:48 -07:00
iJungleboy
f533279dec Merge branch 'oqtane:dev' into dev 2021-05-21 18:30:03 +02:00
ijungleboy
1bccf449fc Add docs to 2 core interfaces IAliasService and IFileService 2021-05-21 18:29:25 +02:00
ijungleboy
de6acf0029 Tell all concrete implementations to be private / not show in the docs 2021-05-21 18:29:06 +02:00
ijungleboy
074b998bbc Document most models 2021-05-21 18:28:21 +02:00
ijungleboy
e4b12aa87f Document most core interfaces 2021-05-21 18:28:14 +02:00
Shaun Walker
6f123c0fff
Merge pull request #1383 from cnurse/dev
Convert Database projects so they build installable Packages
2021-05-20 17:04:06 -04:00
Charles Nurse
47c04dc150 Convert Database projects so they build installable Packages rather than deploy to bin and modify installation to deploy Databases on demand as needed. 2021-05-20 12:39:09 -07:00
Shaun Walker
4474d49c6a
Merge pull request #1379 from sbwalker/dev
fix #1359 - Image bug in src attribute - image is not displayed - caused by multi-tenancy refactoring
2021-05-19 13:28:48 -04:00
Shaun Walker
0b6efdbc57 fix #1359 - Image bug in src attribute - image is not displayed - caused by multi-tenancy refactoring 2021-05-19 13:32:34 -04:00
Shaun Walker
6f981e0928 revert unnecessary code change in router 2021-05-19 09:15:05 -04:00
Shaun Walker
bc53c9e443
Merge pull request #1374 from sbwalker/dev
revert unnecessary code change in router
2021-05-19 09:13:06 -04:00
Shaun Walker
9256c88fc4 update template to remove ASP.NET Core 3 reference 2021-05-19 09:08:59 -04:00
Shaun Walker
9d877bc072
Merge pull request #1373 from sbwalker/dev
update template to remove ASP.NET Core 3 reference
2021-05-19 09:05:16 -04:00
Shaun Walker
470c7bb2a9
Merge pull request #1355 from hishamco/folder-columns
Change Folder Name & Path length
2021-05-19 08:50:56 -04:00
Shaun Walker
bb195e4796
Merge pull request #1357 from hishamco/database-type
Database type name should use type AssemblyQualifiedName instead of magic string
2021-05-19 08:44:12 -04:00
Shaun Walker
4d59460fbb
Merge pull request #1358 from hishamco/unit-tests
Fix broken unit tests
2021-05-19 08:42:59 -04:00
Shaun Walker
ddc4254053
Merge pull request #1372 from sbwalker/dev
auth improvements related to multi-tenancy
2021-05-19 08:42:50 -04:00
Shaun Walker
09537ab0e4 auth improvements related to multi-tenancy 2021-05-19 08:46:02 -04:00
hishamco
07e8215919 Fix broken unit tests 2021-05-16 22:54:34 +03:00
hishamco
2324ae1ccb Database type name should use type AssemblyQualifiedName instead of maigic string 2021-05-16 22:50:39 +03:00
hishamco
b3d367329e Fix migration version name 2021-05-16 21:47:34 +03:00
hishamco
795e71278b Change Folder Name & Path length 2021-05-16 20:28:41 +03:00
Shaun Walker
943adec3a0 fixes for running on WebAssembly 2021-05-13 07:58:57 -04:00
Shaun Walker
6e21eb7327
Merge pull request #1347 from sbwalker/dev
fixes for running on WebAssembly
2021-05-13 07:55:31 -04:00
Shaun Walker
fe3b42feed
Merge pull request #1345 from cnurse/dev
Remove DbConfig and new constructors on DbContextBase and refactor Migrations
2021-05-12 20:20:02 -04:00