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

13158 Commits

Author SHA1 Message Date
Shannon
f6f54fd057 Merge branch 'master-v7' into dev-v8 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DataTypeDefinitionRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DictionaryRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
	src/Umbraco.Core/Persistence/Repositories/EntityContainerRepository.cs
	src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
	src/Umbraco.Core/Persistence/Repositories/RepositoryBase.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
	src/Umbraco.Core/Services/ContentTypeService.cs
	src/Umbraco.Core/Services/FileService.cs
	src/Umbraco.Core/Services/LocalizationService.cs
	src/Umbraco.Core/Services/MemberTypeService.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Tests/Persistence/Querying/ContentTypeSqlMappingTests.cs
	src/Umbraco.Tests/Persistence/Repositories/ContentTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/DataTypeDefinitionRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/DictionaryRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MediaTypeRepositoryTest.cs
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
	src/Umbraco.Web/Models/Mapping/ContentTypeModelMapper.cs
	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
	src/Umbraco.Web/Services/ApplicationTreeService.cs
	src/Umbraco.Web/Services/SectionService.cs
	src/Umbraco.Web/Trees/MemberTreeController.cs
	src/Umbraco.Web/UI/Pages/ClientTools.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadNodeTypes.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/channels/api.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasksBase.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/ItemRenderer.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
	src/umbraco.businesslogic/BasePages/ClientTools.cs
	src/umbraco.businesslogic/UmbracoSettings.cs
	src/umbraco.cms/businesslogic/CMSNode.cs
	src/umbraco.cms/businesslogic/Content.cs
	src/umbraco.cms/businesslogic/cache/Cache.cs
	src/umbraco.cms/businesslogic/datatype/DataTypeDefinition.cs
	src/umbraco.cms/businesslogic/propertytype/propertytype.cs
	src/umbraco.cms/businesslogic/web/Document.cs
	src/umbraco.cms/helpers/DeepLink.cs
	src/umbraco.editorControls/tinyMCE3/TinyMCE.cs
 2016-03-10 19:20:15 +01:00
Shannon
a26bb336f1 hard codes the en-US language until we get rid of ui calls. 2016-03-10 18:35:29 +01:00
Shannon
5659f8d3f7 fixes back office rendering 2016-02-17 17:39:12 +01:00
Shannon
e10fb4fd7e Gets the Services IoC working!! 2016-02-17 17:37:17 +01:00
Shannon
172c4a59d7 Creates a RegisterSingleton ext method for easier registration 2016-02-17 17:14:54 +01:00
Shannon
4fa1ce42dc WIP - moving tree and section service implementations to Web because they are web based and they need web based objects, there's no sense in coying all of the non-web objects to Core. Now we need to use IoC for the ServiceContext 2016-02-17 16:45:26 +01:00
Sebastiaan Janssen
d9f38a20af Merge remote-tracking branch 'origin/7.3.8' into dev-v7 2016-02-17 13:28:52 +01:00
Sebastiaan Janssen
a91669abc0 Fixes unit tests 2016-02-17 13:28:11 +01:00
Sebastiaan Janssen
35c3208b77 Fixes merge error 2016-02-17 12:30:42 +01:00
Shannon
3b9db8a92f tries fixing test for appveyor 2016-02-17 12:25:40 +01:00
Sebastiaan Janssen
7debe17c58 Merge remote-tracking branch 'origin/7.3.8' into dev-v7 
Conflicts:
	src/Umbraco.Web.UI/packages.config
 2016-02-17 11:56:24 +01:00
Sebastiaan Janssen
1bfc1229bd Merge pull request #1134 from umbraco/temp-738-U4-7996 
Upgrade SQL CE to hopefully fix SQL CE data loss bug
 2016-02-17 11:54:25 +01:00
Shannon
f941456af6 fixes namespace 2016-02-17 11:48:32 +01:00
Shannon
828e88e6f2 Merge remote-tracking branch 'origin/7.3.8' into dev-v7 
Conflicts:
	src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
	src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
 2016-02-17 11:46:33 +01:00
Sebastiaan Janssen
3d6fd2d785 Updates to SQL CE 4.0.0.1 2016-02-17 11:44:33 +01:00
Shannon
e56881abc6 adds unit tests for new ext methods 2016-02-17 11:21:15 +01:00
Shannon
d32991c30a re-organizing some namespaces for tests 2016-02-17 10:59:48 +01:00
Shannon
8758f9649b checks for null before assigning culture 2016-02-17 10:57:20 +01:00
rodyvansambeek
e807ee7d64 Changed allow upload whitelist to disallow extensions 
It is not possible to upload files in 7.4.0 with an extension different then the imageTypes in the Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes, in the single upload this was changed after beta 7.4.0-beta1 to Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles. However the change was not added to the drag-drop-uploader. This fixes that.
 2016-02-17 10:30:57 +01:00
Shannon
6f0f1ab2c3 fixes wrong constant used 2016-02-17 10:22:37 +01:00
Shannon
cd28240172 Moves strings to constants, adds ControllerContextExtensions to get the UmbracoContext from the hierarchy of ControllerContext's, changes RenderModelBinder to use this method to get the UmbracoContext, changes UmbracoViewPageOfTModel to use this method to get the UmbracoContext, adds RouteDataExtensions to get the UmbracoContext from routedata, adds extension methods on the HttpContext to get the UmbracoContext from it. 
Conflicts:
	src/Umbraco.Web/Mvc/RenderModelBinder.cs
 2016-02-17 10:22:22 +01:00
Sebastiaan Janssen
85ca85fd42 Merge pull request #1129 from umbraco/temp-U4-7577 
U4-7577 Remove dependency on UmbracoContext in CreateServiceContext /…
 2016-02-16 17:32:38 +01:00
Sebastiaan Janssen
4a10178697 Merge pull request #1123 from umbraco/temp-U4-8000 
U4-8000 NullReferenceException in RenderModelBinder when performing an async controller action
 2016-02-16 17:28:49 +01:00
Shannon
ccba7f14a0 tries fixing test for appveyor 2016-02-16 16:26:21 +01:00
Sebastiaan Janssen
b797e0d0c5 Merge pull request #1127 from umbraco/temp-U4-7953 
U4-7953 Creating Templates via new DocType have camelCased aliases, b…
 2016-02-16 15:39:35 +01:00
Sebastiaan Janssen
8220b033f3 Merge pull request #1125 from umbraco/temp-U4-7954 
U4-7954 Error upgrading database to 7.4.0 - [ FK_cmsPropertyTypeGroup…
 2016-02-16 15:20:53 +01:00
Shannon
6fffc8b45e U4-7577 Remove dependency on UmbracoContext in CreateServiceContext / RequestLifespanMessagesFactory 2016-02-16 15:07:42 +01:00
Shannon
b550b3dde3 Merge remote-tracking branch 'origin/7.3.8' into dev-v7 2016-02-16 14:52:14 +01:00
Shannon
7002291c41 adds tests for ShouldAuthenticateRequest for app configurations 2016-02-16 14:51:15 +01:00
Shannon
51bbf7ceb5 U4-7494 Installation Fails for 7.3.3 - Intermittent - Value cannot be null. Parameter name: sqlSyntax 2016-02-16 14:22:59 +01:00
Shannon
93d9f09fcc U4-7953 Creating Templates via new DocType have camelCased aliases, but from the Template section have PascalCase aliases 2016-02-16 14:20:29 +01:00
Sebastiaan Janssen
42a68cb770 U4-7494 Installation Fails for 7.3.3 - Intermittent - Value cannot be null. Parameter name: sqlSyntax 2016-02-16 14:00:28 +01:00
Shannon
1c2dec00fc bumps version 2016-02-16 13:32:03 +01:00
Shannon
fcea4c7fdd Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-02-16 13:30:21 +01:00
Shannon
b6ef4bf6b5 Merge branch '7.3.8' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2016-02-16 13:29:59 +01:00
Shannon
82297a6ff1 U4-7929 Label datatype strips leading zeros 2016-02-16 13:23:37 +01:00
Warren Buckley
3bf79f0a23 Merge pull request #1102 from umbraco/temp-U4-7837 
Fixes: U4-7837 Changing document type should refresh the current node
 2016-02-16 12:22:56 +00:00
Shannon
3f5aa3aa2b U4-7954 Error upgrading database to 7.4.0 - [ FK_cmsPropertyTypeGroup_cmsPropertyTypeGroup_id ] doesn't exist 2016-02-16 12:17:21 +01:00
Shannon
cc5ac1a84c bumps version 2016-02-16 11:57:10 +01:00
Shannon
6373add383 U4-7922 Preview is not working 2016-02-16 11:53:54 +01:00
Shannon
180099b718 U4-7890 XSLT Macro's not working - "Cannot use this obsoleted overload when the current provider" 2016-02-16 11:52:16 +01:00
Shannon
65f15125e1 U4-7939 - fix routes cache 2016-02-16 11:48:09 +01:00
Shannon
f026201c68 fixes wrong constant used 2016-02-16 11:35:38 +01:00
Shannon
640b2c0ee0 Moves strings to constants, adds ControllerContextExtensions to get the UmbracoContext from the hierarchy of ControllerContext's, changes RenderModelBinder to use this method to get the UmbracoContext, changes UmbracoViewPageOfTModel to use this method to get the UmbracoContext, adds RouteDataExtensions to get the UmbracoContext from routedata, adds extension methods on the HttpContext to get the UmbracoContext from it. 2016-02-16 11:17:47 +01:00
Shannon Deminick
bef7ad1196 Merge pull request #1120 from lars-erik/fix-silly-long-grid-translation 
Grid translations
 2016-02-16 10:12:02 +01:00
Shannon Deminick
33c6c8b473 Merge pull request #1121 from umbraco/temp-U4-7950 
Fixes another reported bug for U4-7950
 2016-02-16 10:05:09 +01:00
Sebastiaan Janssen
0a26e482aa Fixes another reported bug for U4-7950 2016-02-16 09:01:28 +01:00
Lars-Erik Aabech
d0de54e2d3 Grid translations: 
Fixed a silly long translation of "Add content".
Added missing keys.
Fixed a few spelling mistakes.
 2016-02-16 08:50:07 +01:00
Stephan
cbdabaa3b1 Merge pull request #1118 from umbraco/temp-U4-7950 
Use CultureInfo.CurrentCulture if UmbracoContext.PublishedContentRequ…
 2016-02-15 15:21:00 +01:00
Simon Busborg
a33d7da211 Fixes: U4-7945 Grid's Reorder bar covers content 
http://issues.umbraco.org/issue/U4-7945
 2016-02-15 12:55:44 +01:00