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

550 Commits

Author SHA1 Message Date
Stephan
16fb2cee26 Fix build batch (is it real? take3) 2016-07-20 15:37:14 +02:00
Stephan
f4aad94505 Fix build batch (is it real?) 2016-07-20 15:10:33 +02:00
Stephan
77c2766d55 Merge branch origin/dev-v7 into dev-v8 2016-07-18 14:42:06 +02:00
Sebastiaan Janssen
c617599fef Use the newest version of ImageProcessor 2016-07-18 11:25:56 +02:00
Sebastiaan Janssen
6f2aac14fc Revert "Adds a pause after build succeeds and when not running on the build server" 
This reverts commit de9c0d5cf1.
 2016-07-15 12:00:11 +02:00
Sebastiaan Janssen
13ed60b77b In upgrades, the new install views weren't being copied over 2016-07-15 11:49:14 +02:00
Sebastiaan Janssen
de9c0d5cf1 Adds a pause after build succeeds and when not running on the build server 2016-07-15 09:23:42 +02:00
Shannon
ff0711f786 bumps version txt file 2016-07-11 10:09:17 +02:00
Stephan
e19471fea7 Build - cleanup build.bat 2016-07-08 19:10:34 +02:00
Stephan
3c7245f9ba Merge origin/dev-v7 into dev-v8 2016-07-08 16:32:06 +02:00
Sebastiaan Janssen
444c431527 Improving Build.bat and appveyor build output 2016-07-08 14:51:02 +02:00
Stephan
9792aebf00 Build - fix InstallGit.cmd 2016-07-08 14:16:36 +02:00
Stephan
263109d6ad Can we fix build.bat? 2016-07-08 13:47:32 +02:00
Sebastiaan Janssen
45e48c483d Makes the build of the Tests project quiet too 
Do not PAUSE if the build fails, the build server will get stuck or an hour
 2016-07-08 13:47:19 +02:00
Sebastiaan Janssen
423df156c1 Makes the build output only show warnings and errors so it's easier to pinpoint problems 2016-07-08 13:47:07 +02:00
Stephan
853e2c7888 Build - cleanup InstallGit 2016-07-08 13:46:23 +02:00
Sebastiaan Janssen
0f19937aec Making sure the media/web.config is correctly installed from nuget 2016-07-06 16:48:30 +02:00
Shannon
eec0e4f946 Merge branch 'U4-8588' of https://github.com/JimBobSquarePants/Umbraco-CMS into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI/packages.config
 2016-06-27 14:20:13 +02:00
Sebastiaan Janssen
7f154e28de Add the beta label 2016-06-13 23:24:57 +02:00
Sebastiaan Janssen
b2cd4820be Updates Examine 2016-06-13 23:24:19 +02:00
James Jackson-South
c9c1aea8ab Update ImageProcessor, clean up log message 2016-06-14 04:54:26 +10:00
James Jackson-South
b7ef324287 Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into U4-8588 2016-06-14 04:24:46 +10:00
Sebastiaan Janssen
d83d7956bb Dev v7 health check (#1220) 
Adds health check feature including some initial checks
 2016-06-13 17:42:05 +02:00
James Jackson-South
b0a4cc3333 Updates ImageProcessor 💥 
- Update versions
- Add ImageProcessorLogger
 2016-06-13 22:43:05 +10:00
Sebastiaan Janssen
347732463f Continued from PR 1254 (#1296) 
* Changes Umbraco.Core to use project.json for package references, instead of nuget (next is the Web proj)

Changes the build to use correct version of MSBuild
Updates the Web.UI project to reference Microsoft.CodeDom.Providers.DotNetCompilerPlatform so that we can use c# 6 in views
Updates all other projects to use auto-package restore instead of the legacy nuget target restore

* Updates Umbraco.Web to use project.json - removes the lock file (will ignore)

* updates ignore to ignore lock files

* forgot about the tests project, removed the old nuget targets

* Need to restore some packages before we can build

* Update to latest nuget.exe which understands project.json

* This happened automatically, I'm guessing new NuGet removed these

* Correctly restore all necessary packages

* Fix merge problems and package version dependency conflicts

* Removes unnecessary file

* Removes unnecessary file

* Some things didn't make it during the merge, re-applying

* And even more changes that got reverted

* And even more changes that got reverted
 2016-06-01 12:37:52 +02:00
Shannon
6a5a736877 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSeven/UpdateRelatedLinksData.cs
#	src/Umbraco.Core/Services/DataTypeService.cs
#	src/Umbraco.Core/Xml/XmlHelper.cs
#	src/Umbraco.Tests/Routing/UrlRoutingTestBase.cs
#	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
#	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/config/ClientDependency.config
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/LabelPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultipleMediaPickerPropertyEditor.cs
#	src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
#	src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/content.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/language.ascx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Python/editPython.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/sendToTranslation.aspx.cs
#	src/umbraco.cms/businesslogic/Packager/Installer.cs
#	src/umbraco.cms/businesslogic/translation/Translation.cs
 2016-05-31 16:00:32 +02:00
Sebastiaan Janssen
720a46686b U4-8500 Get c# docs building (#1291) 
fetches docfx, builds the metadata and builds the docs with the correct filters
builds the UI docs from the same powershell script
 2016-05-30 12:02:13 +02:00
Sebastiaan Janssen
c902649768 U4-8438 Umbraco 7.4.3 NuGet package missing file 2016-05-23 10:47:54 +02:00
Stephan
04ae479476 Fix build.bat so it supports C# 6 2016-05-13 14:16:47 +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
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
Shannon
295368fc2b Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
Conflicts:
	.gitignore
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
 2016-03-23 11:04:06 +01:00
Shannon
61f9845db0 bumps version 2016-03-23 10:06:53 +01:00
Shannon
fb104004e0 Updates LightInject 2016-03-22 16:39:52 +01:00
Shannon
4355761da1 U4-8228 Update to latest Newtonsoft.Json 2016-03-22 16:35:23 +01:00
Shannon
9baf344ad3 U4-8227 Change Umbraco.Core.Models.Mapping.MapperConfiguration and Umbraco.Core.Models.Mapping.IMapperConfiguration implementations AND U4-6923 Update to latest Automapper - with signed assembly 2016-03-22 16:29:04 +01:00
Sebastiaan Janssen
8113b7e66c Fixes NuGet build 2016-03-21 20:23:43 +01:00
Sebastiaan Janssen
75c2b07ad3 Update ModelsBuilder dependency for the NuGet package 2016-03-18 16:32:05 +01:00
Shannon
b3c6654d41 bumps version 2016-03-17 17:31:36 +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
111ee66b60 Update ModelsBuilder dependency for the NuGet package 2016-03-15 17:15:39 +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
f6e48243a6 U4-8088 NuGet upgrade of UmbracoCms pacakage doesn't add ModelsBuilder keys to web.config 2016-03-08 13:39:35 +01:00
Sebastiaan Janssen
55e7159f7d Forgot to remove them from the nuspec files 2016-03-08 10:35:57 +01:00
Sebastiaan Janssen
390a94e323 U4-8054 Issue with NuGet Uninstall.ps1 (running on updates) 
#U4-8054 Fixed
 2016-03-08 10:34:19 +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
3d6fd2d785 Updates to SQL CE 4.0.0.1 2016-02-17 11:44:33 +01:00
Shannon
1c2dec00fc bumps version 2016-02-16 13:32:03 +01:00