yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,604 Commits 4 Branches 7 Tags
03eb878d30464c682a28d92ad4f19cdf95515a01
Commit Graph

178 Commits

Author SHA1 Message Date
Stephan
d34a425dd1 porting 7.6@5c5baca into 8 2017-05-30 12:54:22 +02:00
Shannon
b78c334589 Merge remote-tracking branch 'origin/master-v7' into dev-v7 2017-05-19 12:04:27 +10:00
Shannon
73e47402cb Fixes docs build 2017-05-19 10:20:00 +10:00
Sebastiaan Janssen
c6956b5e98 Merge branch 'dev-v7' into dev-v7.6 
# Conflicts:
#	.gitignore
#	build/Build.bat
 2017-05-05 14:30:08 +02:00
Sebastiaan Janssen
fcf5ecc166 Uses vswhere to figure out where VS17 is installed (if needed) 
Removes targets file that was almost unused, moved the relevant bits to the main csproj
Updates BuildBelle.bat to be completely independent of installed version of node & npm on the machine
 2017-05-05 14:14:37 +02:00
Mads Rasmussen
28d7a4a6dc Merge branch 'dev-v7.6' into temp-gulp-spike 
# Conflicts:
#	src/Umbraco.Web.UI.Client/bower.json
 2017-05-05 13:01:24 +02:00
Per Ploug
ee9deacf92 ignore lib-bower temp folder 2017-01-07 01:26:47 +01:00
Stephan
8e056aba66 Merge origin/dev-v7.6 into dev-v8-zbwip (builds, not tested) 2016-11-23 10:33:12 +01:00
Stephan
35aac2cdec Merge origin/dev-v7 into dev-v7.6 2016-11-18 09:52:45 +01:00
Sebastiaan Janssen
0a883ae109 Make sure Umbraco runs in Visual Studio 2017 2016-11-16 18:55:12 +01:00
Stephan
b26b415096 Merge origin/dev-v7-deploy into dev-v8-zbwip (builds) 2016-11-03 10:31:44 +01:00
Stephan
a279be1b47 Build TLC 2016-10-05 14:35:44 +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
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
Sebastiaan Janssen
afd62caa73 Ignore ClientDependency.config, building the solution will automatically create it 2016-06-21 10:55:18 +02: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
Stephan
df99edba18 GitIgnore Umbraco.Tests/media 2016-03-22 14:37:48 +01:00
Stephan
5774ce68c7 GitIgnore Umbraco.Tests/media 2016-03-22 14:37:22 +01:00
Shannon
5f6ae3683e removes files that shouldn't be committed 2015-12-21 15:03:10 +01:00
Shannon
1f4ba9cfdc ignores file that shouldn't be there 2015-11-26 10:36:15 +01:00
Stephan
3612780d15 git-ignore loader.dev.js 2015-09-22 11:18:06 +02:00
Sebastiaan Janssen
b0ccb040a1 Makes sure we can have nightlies for non-pre-releases as well 2015-07-07 15:11:57 +02:00
Sebastiaan Janssen
25237995eb It's nice to unzip a build in the build folder, so just ignore it for git :) 2014-12-04 12:41:39 +01:00
Sebastiaan Janssen
043139caae Fixes build for people without git in path and with various VS versions installed (no more need to have at least VS2012 installed) 2014-10-19 13:00:54 +02:00
antoine
b8034fa325 canvasdesigner.*.js added to ignore file 
Conflicts:
	.gitignore
 2014-09-30 09:24:38 +02:00
Sebastiaan Janssen
900dcfdc33 #U4-1503 Fixed 
Adds UmbracoExamine.PDF to the output of the build (both a ZIP and NuGet package)
Adds canvas.editors.config.js to the output in the config folder
 2014-09-27 15:35:03 +02:00
Shannon
07035f6b23 Fixes issue with duplicate dictionary entries when wiring up property data 2014-09-01 12:55:10 +10:00
warrenbuckley
4b46cf9a42 Update .gitignore for output files generated by ng-docs 2014-08-26 14:54:37 +01:00
antoine
54c3e68f32 Ignore Preview folder 2014-07-01 13:57:04 +02:00
antoine
89ed75f5dc Right .gitignore file 2014-06-30 19:36:45 +02:00
antoine
16d8481ad9 Tuning new concept, config throught json config or/and html5 data tags 2014-06-30 19:28:33 +02:00
antoine
65bb1e1e20 gridRow default less 2014-05-30 20:03:34 +02:00
Shannon
27e6b8c80c Adds bower to node dependencies, uses bower to get the typeahead dependency, gets bower dependencies on npm install 2014-05-05 15:55:48 +10:00
Sebastiaan Janssen
b3f6a8c71b Merge branch '7.0.3' into 7.1.0 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
 2014-02-03 11:52:36 +01:00
Shannon
7de1b2d09d Fixes ServerVariablesParser to have a proper event declared! :P 2014-01-29 09:33:14 +11:00
Shannon
b314bff127 Creates powershell file to do the build, this detects if you have sandcastle installed first, also overwrites the default TOC.css file with a custom slightly nicer version for the output. 2014-01-24 18:23:37 +11:00
Shannon
d66e2e52e9 adds additional bat files to the sln files for editing, adds the sandcastle help file config file that can be used to build the docs when sandcastle is installed. 2014-01-24 16:31:49 +11:00
Shannon
a052fc42b1 Fixes: U4-3682 Can not create new documents (javascript error) 2013-11-26 14:03:00 +11:00
Shannon
d9c42e2aca Fixes initial part with legacy trees and legacy actions - now a modal window can launch - but now we need to get the legacy umb client manager js tree stuff hooked in. 2013-10-14 18:47:34 +11:00
Shannon
db6b8930ab Removes appsettings,connectionstring configs from the repo and adds them to the ignore list. 2013-10-04 12:18:05 +10:00
Sebastiaan Janssen
1138e54672 Unignore macroscripts/web.config and add an empty config as a placeholder for now 2013-09-26 15:52:16 +02:00
Shannon
0026f7bd01 More ignores 2013-09-05 14:55:55 +10:00
Shannon
0b1cad7687 Fixes app.dev to not include ui.sortable. Fixes server vars mocks to have an entry for dashboardApiBaseUrl, adds dashboard.mocks to not throw an exception when trying access that data. 2013-09-05 14:54:40 +10:00
Shannon
038780614c Re-deletes files that should not be committed! Seriously WHY DOES THIS KEEP HAPPENING??! Have updated the ignore to try and stop this 2013-09-05 14:38:22 +10:00
Shannon
70eb3e8613 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Controllers/RegisterController.cs
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
 2013-09-03 17:30:08 +10:00
Sebastiaan Janssen
437408464f Merge branch '6.1.5' into 6.2.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
 2013-09-02 12:29:47 +02:00
Shannon
da1c33a034 Fixes unit test 2013-09-02 12:57:56 +10:00