swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,583 Commits 73 Branches 219 Tags
a4274ba76727273eb8d7cfb02b97fc5bdcd3e9cc
Commit Graph

872 Commits

Author SHA1 Message Date
Shannon 885595b1e6 Hides and Obsoletes crappy extension methods that rely on ApplicationContext.Current and updates all usages to not use them - this is most important because the services were using extensions methods that go back out to the ApplicationContext.Current (booo!) 2016-05-18 16:06:59 +02:00
Shannon fb55b0a60b U4-8371 Dont ship with the {machinename} token for Examine 2016-05-10 18:32:32 +02:00
Stephan 271f4e7a4a U4-8413 - fix missing ServersLock object 2016-05-10 12:29:13 +02:00
AndyButland 1b4d7c3733 Migrated user permissions tree to new format; updated icon to indicate single user being acted on 2016-05-07 23:52:47 +02:00
Shannon 209e9373d0 Rebuild on startup working 
Gets indexes rebuilding at startup, gets indexes rebuilding with published content which required some updates to the content service/repo to pass in a more robust filter when paging. Added more tasks to fix up more of the examine parts like the local storage sync which currently just throws exceptions.
 2016-04-29 00:50:26 +02:00
Shannon 2027cd7b07 Merge branch 'dev-v8' into dev-v8-persistclr 
Conflicts:
	src/Umbraco.Core/Persistence/UmbracoDatabase.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2016-04-21 12:19:14 +02:00
Shannon 7e13781d8b fixes merge issue 2016-04-20 16:04:35 +02:00
Stephan 3b612bf346 Core.Persistence - more cleanup 2016-04-14 18:20:07 +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 82b4b4e668 Merge remote-tracking branch 'origin/7.5-ListViewCustomFieldSorting' into dev-v7.5 
Conflicts:
	src/Umbraco.Web/WebApi/Filters/DisableBrowserCacheAttribute.cs
 2016-04-13 14:44:22 +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 80d7443bd3 fix build 2016-04-05 16:00:49 +02:00
Shannon c6a586274e Merge branch 'U4-8189' of https://github.com/danlister/Umbraco-CMS into danlister-U4-8189 
Conflicts:
	src/Umbraco.Core/Constants-Applications.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-31 19:40:07 +02:00
Shannon 79bebb9e14 Merge remote-tracking branch 'origin/dev-v8' into dev-v8 
Conflicts:
	src/Umbraco.Web.UI/config/trees.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-30 16:08:08 +02:00
Shannon 74e1078c31 Merge branch 'U4-8198_file_system' of https://github.com/yannisgu/Umbraco-CMS into yannisgu-U4-8198_file_system 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-30 16:07:45 +02:00
Warren Buckley 659af0ba48 Merge branch 'U4-8194' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-8194 
# Conflicts:
#	src/Umbraco.Web/Umbraco.Web.csproj
 2016-03-30 14:44:03 +01:00
James Coxhead efa8bf44f9 Merge remote-tracking branch 'upstream/dev-v8' into U4-8194 
# Conflicts:
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs
 2016-03-24 20:56:44 +00:00
James Coxhead d99aef5ee8 Updated config transforms 2016-03-24 20:30:31 +00:00
Yannis Guedel bb7d5b4bd2 U4-8193 replaced loadMacros with MacrosTreeController 2016-03-23 22:56:42 +01:00
Shannon 61f9845db0 bumps version 2016-03-23 10:06:53 +01:00
Shannon eb59d33f42 updates dictionary tree sort + config and ensures that all new users by default have access to translations 2016-03-22 12:34:25 +01:00
Shannon 4fb69e0c59 updates trees sort order and trees.Release.config 2016-03-22 12:26:37 +01:00
James Coxhead a04506ba60 Created new dictionary tree controller 2016-03-21 23:31:22 +00:00
Yannis Guedel 4db83be874 U4-7543 Move data type tree to settings 
data type tree belongs in settings since it is heavily tied to content
types.
 2016-03-21 22:38:40 +01:00
Dan Lister 1e08f5f9ce U4-8190 Converted umbraco.cms.presentation.Trees.UserTypes to use the new tree structure 2016-03-18 14:58:24 +00:00
Shannon bcd12172eb manually merges: U4-4075 umbracoSettings help section removed 2016-03-17 14:28:06 +01:00
Shannon 9ac2d04aea User and User type from the old businesslogic assembly are GONE! 2016-03-16 17:52:08 +01:00
Shannon d37d31246e Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Tests/Persistence/SyntaxProvider/MySqlSyntaxProviderTests.cs
	src/Umbraco.Web.UI/umbraco/create/content.ascx
	src/Umbraco.Web.UI/umbraco/create/member.ascx
	src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
	src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
 2016-03-16 15:02:53 +01:00
Sebastiaan Janssen fb42574c34 Revert "U4-5334 Richtext editor inserts extra p - tags to html output" - apparently it does just as much harm as it does good 
This reverts commit 9ad3b6a337.
 2016-03-12 21:02:05 +01:00
Sebastiaan Janssen 9ad3b6a337 U4-5334 Richtext editor inserts extra p - tags to html output 
#U4-5334 Fixed
 2016-03-12 12:58:53 +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
Sebastiaan Janssen b2407eab98 Merge pull request #1107 from bjarnef/dev-v7-tinymce-font-icons 
Change icons for richtext editor config
 2016-03-10 17:47:46 +01:00
Stephan b6a9734755 Fix ModelsBuilder integration 2016-02-09 11:46:26 +01:00
bjarnef 0bfc5f1272 Change icons in tinymce config 2016-02-08 15:07:16 +01:00
Shannon e423864781 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs
	src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicyFactory.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/DomainRepository.cs
	src/Umbraco.Core/Persistence/Repositories/LanguageRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MediaTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PublicAccessRepository.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Cache/FullDataSetCachePolicyTests.cs
	src/Umbraco.Web.UI.Client/src/common/directives/components/grid/grid.rte.directive.js
	src/Umbraco.Web.UI.Client/src/less/hacks.less
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/WebBootManager.cs
 2016-02-03 12:30:11 +01:00
Shannon 6faa7e2fc9 dont' have RebuildOnAppStart set for dev purposes! 2016-01-28 18:31:47 +01:00
Shannon adc3c1e927 updates to latest MB 2016-01-20 18:08:34 +01:00
Shannon 8fc44699bc U4-7768 - Fixes validation issue with new CTs and invalid server side validation, adds validation check for all ct aliases across all types 2016-01-20 16:07:47 +01:00
Sebastiaan Janssen 49bafe51b7 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 15:24:39 +01:00
Stephan fb1a72600e Upgrade to Umbraco.ModelsBuilder 2.2.0-beta002 2016-01-15 12:37:15 +01:00
Shannon b79c7407e6 Removes unecessary promise wrapping for localizing, fixes localization service so that it's not double requesting and fixes how it deals with promise returns. 2016-01-15 11:49:29 +01:00
Simon Busborg e47d72a51f Added localize to dialogs 2016-01-14 11:44:29 +01:00
Shannon 20f2773f38 removes the config option registered in the file 2016-01-13 17:09:55 +01:00
Claus cb05f3fe03 Reverted changes no longer needed after work on inherited/nested doctypes. 
Changed default to allow inherited doctypes.
 2016-01-11 14:04:03 +01:00
Claus a7212f6b60 Changing config setting to the default. 
Referencing wrong config element.
 2016-01-11 12:07:34 +01:00
Claus e509099cdb Setting for enabling inherited documenttypes. 2016-01-11 12:06:35 +01:00
Sebastiaan Janssen 701dea5de7 Merge pull request #969 from umbraco/temp-U4-7591 
U4-7591 File cleanup for old editor 'tasks' and 'create' dialogs
 2016-01-06 13:43:14 +01:00
Shannon c6dbb0f7fa reverts member tree order 2015-12-28 10:35:54 +01:00
Shannon 1aa52b4cc9 removes old helpers/url 2015-12-22 16:43:11 +01:00
Shannon afe06ffb02 U4-5424 Upgrade to latest .Net framework version (4.6.1) 2015-12-21 19:23:13 +01:00