yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,912 Commits 4 Branches 7 Tags
5e04f1d024241e0f0006de34a77136ad41b3cb77
Commit Graph

206 Commits

Author SHA1 Message Date
Bjarke Berg
0a2ebcd1f1 Use SqlMainDomLock if not windows 2020-08-19 09:39:11 +02:00
Bjarke Berg
6371fdbf4d post merge 2020-08-17 11:43:04 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 08:33:11 +02:00
Bjarke Berg
94e1056dd9 Merge pull request #8603 from umbraco/netcore/feature/6976-migrate-preview-middleware 
Migrates preview auth Middleware
 2020-08-11 08:24:57 +02:00
Bjarke Berg
d98d1d8373 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/6976-migrate-preview-middleware 2020-08-11 07:30:50 +02:00
Bjarke Berg
a02b5e93a5 Merge pull request #8598 from umbraco/netcore/feature/6972-migrate-non-oauth-auth-controller 
Migrates remaining non-oauth AuthenticationController actions to netcore
 2020-08-11 07:30:23 +02:00
Shannon Deminick
2aae974281 Merge pull request #8394 from umbraco/netcore/feature/fix-integration-tests 
Netcore: More tests migrated..
 2020-08-11 11:54:37 +10:00
Bjarke Berg
6d51dc4afa Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/6976-migrate-preview-middleware 2020-08-10 14:30:25 +02:00
Shannon
cfc4933170 Merge branch 'netcore/netcore' into netcore/feature/fix-integration-tests 2020-08-10 15:50:05 +10:00
Bjarke Berg
499ffdfe97 Merge pull request #8584 from umbraco/netcore/feature/request-localization-from-user 
Netcore: Added request localization from the current user.
 2020-08-10 07:04:20 +02:00
Shannon
cca7303abd Migrates preview auth Middleware 
Migrates UriExtensionsTests to netcore, fixes preview controller bits, adds tests for preview path for back office route check, fixes virtual paths for views,
 2020-08-07 00:48:32 +10:00
Shannon
1239975b07 Ensures all back office controllers have the thread culture set, we do this with a new application model targeting all back office controllers. 2020-08-06 22:08:27 +10:00
Shannon
b9a4a75656 Migrates remaining non-oauth AuthenticationController actions to netcore 2020-08-06 19:09:05 +10:00
Bjarke Berg
53d8cfcfe4 Updated rc version of ImageSharp.Web 2020-08-05 08:48:18 +02:00
Bjarke Berg
23a6de30ec Merge pull request #8458 from umbraco/netcore/feature/AB7479-macro-templates-migration 
NetCore: Migrating Macro Templates
 2020-08-04 15:05:25 +02:00
Bjarke Berg
38ee3c322d Moved needed extension methods for the Gallery snippet.. 2020-08-04 14:12:22 +02:00
Bjarke Berg
1dac8779c2 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/7619 - Added request localization from the current user 2020-08-04 12:54:54 +02:00
Bjarke Berg
7490f0cd92 Updated Smidge to 3.1.1 2020-08-04 08:29:45 +02:00
Bjarke Berg
03bb780c16 Added missing registration 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 14:40:44 +02:00
Bjarke Berg
5f47e75231 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 14:15:38 +02:00
Bjarke Berg
add44c4139 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/fix-integration-tests 2020-07-10 13:50:44 +02:00
Bjarke Berg
3daad871ce Merge pull request #8396 from umbraco/netcore/feature/AB4827-sqlce-nuget 
NuGet package specifications for SQL CE
 2020-07-10 13:49:42 +02:00
Bjarke Berg
66a549c89b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis 2020-07-09 18:03:15 +02:00
Bjarke Berg
1dcacda036 Moved umbraco cshtml files into the umbraco folder 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-08 11:18:23 +02:00
Elitsa Marinovska
6282ac4a5b Merged changes from base branch 2020-07-08 09:07:54 +02:00
Bjarke Berg
6bb33c865f Small fixes to build.ps1 and added xml doc generation to projects 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 20:40:44 +02:00
Bjarke Berg
6e5dfbf8da fixed issue with formatting, by changing order of attributes 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 15:03:31 +02:00
Bjarke Berg
351fa02df2 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 2020-07-07 14:10:21 +02:00
Bjarke Berg
2372e5307c Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/fix-integration-tests 2020-07-07 14:02:48 +02:00
Bjarke Berg
34979566ea Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-07-07 14:02:25 +02:00
Bjarke Berg
7a3f658ccc Dispose StreamReaders 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 14:00:47 +02:00
Bjarke Berg
0a759553a7 fixed issue with formatting, by changing order of attributes 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 13:56:14 +02:00
Bjarke Berg
a67629e9c0 Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/fix-integration-tests 2020-07-07 13:25:58 +02:00
Bjarke Berg
f3614d51fa Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/UmbracoAuthorizeFilter.cs
 2020-07-07 13:17:08 +02:00
Bjarke Berg
8400b53f70 Cleanup based on review 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-06 12:55:23 +02:00
Bjarke Berg
f85204eaa1 Fixed lot of small issues for linux 2020-07-04 15:07:07 +02:00
Bjarke Berg
7b546e6cee Attempts to fix issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-30 20:11:39 +02:00
Bjarke Berg
ce4c6f7965 Do not use camelcase as default in AngularJsonMediaTypeFormatter 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 14:36:23 +02:00
Bjarke Berg
0676e9d35f Added unittest of IgnoreRequiredAttributesResolver 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 12:35:08 +02:00
Bjarke Berg
adb38dceb5 Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-06-28 14:00:26 +02:00
Bjarke Berg
3d65cb96e1 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 
# Conflicts:
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
 2020-06-28 13:59:33 +02:00
Bjarke Berg
6d993eb63b Cleanup 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 13:58:15 +02:00
Bjarke Berg
7ef840702f Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-06-26 09:49:03 +02:00
Bjarke Berg
e181c94cf4 Added async version of GetRawBodyString 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-26 08:20:36 +02:00
Bjarke Berg
e14a81c72d Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-06-25 11:47:12 +02:00
Bjarke Berg
ba38055ee9 Merge branch 'netcore/dev' into bug/use-sql-main-dom-lock-when-linux 2020-06-25 11:39:11 +02:00
Bjarke Berg
0714fc4734 Migrated some of the UserControllerTests 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 14:11:01 +02:00
Bjarke Berg
1594a84d80 migated remaining backoffice controllers 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 10:08:08 +02:00
Bjarke Berg
558c0b03ee Migrated MemberController 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-18 21:03:11 +02:00
Bjarke Berg
73123704cd Added JsonDateTimeFormatAttribute 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-18 19:40:13 +02:00