yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,840 Commits 4 Branches 7 Tags
8561d85f7af4b17681c6d84b5950a787fddabf7e
Commit Graph

388 Commits

Author SHA1 Message Date
Stephan
8561d85f7a porting 7.6-rc1 into 8 2017-05-24 12:25:39 +02:00
Stephan
a49af20275 More persistence layer refactoring 2016-11-29 10:31:25 +01:00
Stephan
74604c69f9 Fix tests after merge 2016-11-25 14:08:23 +01:00
Stephan
dc75b20bc6 Refactor build, tests configuration is always Debug 2016-11-05 15:40:45 +01:00
Stephan
b26b415096 Merge origin/dev-v7-deploy into dev-v8-zbwip (builds) 2016-11-03 10:31:44 +01:00
Stephan
1aade7c27c Version 7.6.0-alpha028 2016-10-20 13:30:52 +02:00
Stephan
a00ee8d275 Rename DependencyInjection into DI, cleanup components, compose 2016-10-17 11:00:12 +02:00
Stephan
3bee1d3bce Version 8.0.0-alpha0020 2016-10-17 11:00:07 +02:00
Stephan
198fff508d Version 7.6.0-alpha027 2016-10-05 09:57:45 +02:00
Stephan
37d8b71d5d Version 7.6.0-alpha021 2016-09-29 11:13:42 +02:00
Stephan
76461e866b Version 7.6.0-alpha020 2016-09-23 17:25:53 +02:00
Stephan
3f22e727f6 Some things need to be public/adjusted for Deploy 2016-09-23 16:42:42 +02:00
Stephan
b063928732 Version 7.6.0-alpha0016 2016-09-22 21:46:23 +02:00
Stephan
30c32da5e6 Version 7.6.0-alpha014 2016-09-21 16:02:32 +02:00
Stephan
5c2232aa3b Refactor logging and profiling, boot reporting 2016-09-19 16:33:47 +02:00
Stephan
0597eea72b Resvolution - Components, Runtime & Booting 2016-09-19 16:33:43 +02:00
Stephan
ab3b04c165 Fix SqlHelper so it uses to current db connection 2016-09-15 12:14:25 +02:00
Stephan
41fafaf7ae Merge branch origin/dev-v7 into dev-v7-deploy 2016-08-26 13:20:53 +02:00
Stephan
0789295701 Temp - 7.6.0-alpha003 - even with internals visible to, need IBackgroundTask to be public 2016-08-24 10:11:38 +02:00
Stephan
bb81298e84 Temp - 7.6.0-alpha002 + internals visible to deploy 2016-08-23 09:40:02 +02:00
Sebastiaan Janssen
f76fd360f1 Bumps version 2016-08-20 10:29:49 +02:00
Sebastiaan Janssen
9dfa9e2fb6 Bump the version 2016-08-16 13:37:05 +02:00
Claus
0142bc61bc U4-8671 Media Types Missing in 7.4 
renders child nodes in media type tree.
fixed up the context menus returned on nodes so you can create children if not disabled in config.
 2016-08-10 09:56:28 +02:00
Sebastiaan Janssen
85a3abf643 Adds a setting to be able to disable redirect URL tracking 2016-08-03 17:57:41 +02:00
Stephan
86968f218c Version 8.0.0-alpha0016 2016-07-21 11:07:34 +02:00
Stephan
b7421537c5 Version 8.0.0-alpha0015 2016-07-21 10:27:04 +02:00
Stephan
bd2fa49581 Version 8.0.0-alpha0011 2016-07-21 10:25:44 +02:00
Stephan
1f55f1c443 Version 8.0.0-alpha0007 2016-07-21 10:22:20 +02:00
Stephan
f584404324 U4-8551 - import NuCache code 2016-07-20 18:43:53 +02:00
Stephan
3d2a0b4a29 U4-8361 - from ids to guids 2016-07-04 18:22:06 +02:00
Sebastiaan Janssen
7f154e28de Add the beta label 2016-06-13 23:24:57 +02:00
Stephan
e231206555 U4-8361 - bugfix, get finder to work 2016-06-12 19:47:11 +02:00
Stephan
06574b8b40 U4-8447 - prepare for NuCache (work-in-progress) 2016-05-26 17:12:04 +02:00
Shannon
8127731f72 Namespace and file cleanup - Profiling --> Logging, root cache stuff moved to Cache, XmlHelper --> Xml, TypeFinder, etc.. --> Plugins 2016-05-18 23:34:56 +02:00
Stephan
4891bbf9a4 Update UmbracoVersion 2016-05-13 14:16:27 +02:00
Shannon
72cef006d3 bumps version 2016-04-20 15:56:06 +02:00
Shannon
df016813ea Merge remote-tracking branch 'origin/dev-v7.5' into dev-v8 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IContentRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
	src/Umbraco.Core/Services/ContentService.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Tests/UmbracoExamine/IndexInitializer.cs
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/UmbracoExamine/UmbracoMemberIndexer.cs
	src/umbraco.businesslogic/UmbracoSettings.cs
 2016-04-13 16:18:58 +02:00
Shannon
1361e017a2 Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222 
Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-04-12 18:07:25 +02:00
Shannon
b22fda1e80 fixes some ysods 2016-03-31 14:28:41 +02:00
Shannon
7d3ba43816 Removes lots of Dead Code - thanks NDepend! 2016-03-23 10:58:06 +01:00
Shannon
61f9845db0 bumps version 2016-03-23 10:06:53 +01:00
Shannon
b3c6654d41 bumps version 2016-03-17 17:31:36 +01:00
Shannon
7d20557937 Moves IAction and ActionsResolver to Web proj, removes IMenuElement, ITag, IUseTags 2016-03-17 15:26:22 +01:00
Shannon
bcd12172eb manually merges: U4-4075 umbracoSettings help section removed 2016-03-17 14:28:06 +01:00
Shannon
6ee5457a81 Fixes more merge issues, project builds and runs 2016-03-11 09:23:09 +01:00
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
1c2dec00fc bumps version 2016-02-16 13:32:03 +01:00
Shannon
5e46750cc4 nuspec and version 2016-02-11 16:34:15 +01:00
Shannon
aed4649ff5 changes version to RC1 2016-02-03 12:16:07 +01:00
Shannon
38a6f8c4a9 creates new EditorValidationResolver for external validators to work (internal for now), bumps version 2016-01-20 16:57:31 +01:00