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

170 Commits

Author SHA1 Message Date
Bjarke Berg
edca4af7f4 Fix MaxFailedAccessAttemptsBeforeLockout from config 2020-09-02 10:03:35 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Bjarke Berg
b5b492106d Clean up by moving stuff from Startup.cs into extention methods 2020-08-24 14:23:08 +02:00
Bjarke Berg
c0d4516e15 Updated default config files 2020-08-24 14:15:53 +02:00
Bjarke Berg
1c3090b078 Remove files that should not have been added to git 2020-08-20 11:51:51 +02:00
Bjarke Berg
091a777b62 Conditional load of netframework dlls 2020-08-19 19:51:06 +02:00
Bjarke Berg
bd4c536a47 renamed Umbraco to umbraco 2020-08-19 12:49:04 +02:00
Bjarke Berg
9049469f70 Bugfix cannot parse StringValues as bool. Use ToString first. 2020-08-19 08:42:45 +02:00
Bjarke Berg
5f6de61391 Fix iss issue 2020-08-18 11:36:45 +02:00
Bjarke Berg
6371fdbf4d post merge 2020-08-17 11:43:04 +02:00
Bjarke Berg
9ae878a185 Hardcode verion 9 in text, and change assembly versions to 0.5.0 2020-08-17 09:34:27 +02:00
Bjarke Berg
7b95494e30 Merge pull request #8572 from umbraco/netcore/bugfix/6970-backoffice-controller 
Migrates remaining non-oauth actions on back office controller to netcore
 2020-08-17 08:29:59 +02:00
Bjarke Berg
f9ba200c21 LazyLoad casing 2020-08-16 11:30:49 +02:00
Bjarke Berg
95c30d4cd0 Fix for packages 2020-08-12 15:59:30 +02:00
Bjarke Berg
996130b58d Post merge fix 2020-08-12 13:26:24 +02:00
Bjarke Berg
3ec13b3190 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	build/NuSpecs/UmbracoCms.SqlCe.nuspec
 2020-08-12 13:25:24 +02:00
Bjarke Berg
cdd2dc51b4 Copy files on publish 2020-08-12 10:03:40 +02:00
Bjarke Berg
f7e0b115aa copy language files on publish 2020-08-11 15:00:39 +02:00
Bjarke Berg
7b6d64872f 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 10:05:55 +02:00
Bjarke Berg
1481804014 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
 2020-08-11 10:01:17 +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
3c2f2ac0b3 Netcore: Let build.ps1 create the dotnet new templates (#8591) 
* Creates the Umbraco.Templates.nuspec on build

* Update nuspec to match nuget packages

* Updated namespace of Program.cs and Startup.cs and replace these with the project name in templates

* Bugfixes for sqlce

* Simplified template to have one template with --UseSqlCe as option

* Update build/build.ps1

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2020-08-11 08:28:16 +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
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
Bjarke Berg
379454cd4b fix appsettings.json 2020-08-07 14:36:45 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +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
Elitsa Marinovska
89633b2c21 Removing unused var 2020-08-04 20:30:11 +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
c672f61c53 Revert appsettings.json 2020-08-04 08:14:30 +02:00
Shannon
d9c2e5f55c Migrates remaining non-oauth actions on back office controller to netcore 2020-08-04 14:30:42 +10:00
Shannon
4edf7fdf83 Ensure all back office controllers are plugin controllers and use constant 2020-08-04 12:27:21 +10:00
Bjarke Berg
6dd896ea01 https://github.com/umbraco/Umbraco-CMS/pull/8458 cleanup 2020-08-03 14:28:23 +02:00
Elitsa Marinovska
717d8e6156 Migrating as many of the templates from Umbraco.Web.UI\Umbraco\PartialViewMacros\Templates 2020-07-21 08:12:29 +02:00
Bjarke Berg
41ef34547f Reintroduce missing files 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 14:32:35 +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
e0ae0551f8 Moved back invalid templates to legacy UI project 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 13:10:56 +02:00
Bjarke Berg
1c38b25cfb fix for csproj file 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 13:04:24 +02:00
Bjarke Berg
b4bc1f79b5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis 2020-07-10 13:03:35 +02:00
Elitsa Marinovska
498f01fa10 Removing duplicated folder reference 
which causes the proj to not load in Visual Studio
 2020-07-10 11:24:50 +02:00
Bjarke Berg
1625cb323d Moved lang-folder 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 06:44:56 +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