8fce680430
removes unused line, updates gitignore
2019-05-10 13:07:06 +10:00
5e38cadacc
publishes js test results to xml so that Azure DevOps can read the results, re-enables js test building, fixes an issue with one of the tests
2019-02-14 12:30:36 +11:00
7aebfce579
Update gitignore to exclude serilog config files
2019-02-13 12:43:26 +00:00
5cc0f58f7d
Git will now ignorer files that contains *.ignorer.*
2019-01-17 15:10:58 +01:00
2fcb30e54e
Merge remote-tracking branch 'origin/dev-v7' into temp8
...
# Conflicts:
# .editorconfig
# .gitignore
# src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
# src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
# src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
# src/Umbraco.Web.UI.Client/src/less/components/buttons/umb-era-button.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/overlays/contenttypeeditor/compositions/compositions.html
# src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/content.restore.controller.js
# src/Umbraco.Web.UI.Client/src/views/content/restore.html
# src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html
# src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
# src/Umbraco.Web.UI.Client/src/views/media/move.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
# src/Umbraco.Web.UI/config/umbracoSettings.Release.config
# src/Umbraco.Web.UI/umbraco/config/lang/en.xml
# src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
# src/Umbraco.Web/Controllers/UmbLoginController.cs
# src/Umbraco.Web/Controllers/UmbLoginStatusController.cs
# src/Umbraco.Web/Controllers/UmbProfileController.cs
# src/Umbraco.Web/Controllers/UmbRegisterController.cs
# src/Umbraco.Web/Editors/ContentController.cs
# src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
# src/Umbraco.Web/HtmlHelperRenderExtensions.cs
# src/Umbraco.Web/Trees/ContentTreeController.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/editXslt.aspx.cs
# src/Umbraco.Web/umbraco.presentation/umbraco/webservices/codeEditorSave.asmx.cs
2018-12-20 16:58:01 +11:00
1d9bb4605b
Improvement to the .editorconfig file ( #3795 )
2018-12-09 17:44:11 +01:00
54a2aa00a7
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
6e36755de5
updates gitignore
2018-07-31 15:37:47 +10:00
190b16626f
updates gitignore
2018-07-31 15:26:09 +10:00
8c815cf47e
Git-ignore local directory
2018-05-16 15:54:08 +02:00
5798d8e57b
Enable src/preserve.belle to stop rebuilding Belle all the time
2018-05-03 15:11:25 +02:00
881fbb7f76
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
...
# Conflicts:
# build/Modules/Umbraco.Build/Umbraco.Build.psm1
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/IO/FileSystemProviderManager.cs
# src/Umbraco.Core/ObjectExtensions.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
# src/Umbraco.Core/Services/IdkMap.cs
# src/Umbraco.Core/Services/UserService.cs
# src/Umbraco.Core/packages.config
# src/Umbraco.Tests.Benchmarks/app.config
# src/Umbraco.Tests/UI/LegacyDialogTests.cs
# src/Umbraco.Web/Cache/MediaCacheRefresher.cs
# src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Features/DisabledFeatures.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
# src/Umbraco.Web/PublishedContentQuery.cs
# src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
2018-03-29 20:01:14 +11:00
0cbfebe21c
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:08 +01:00
13c675d718
updating route to use the old url.
...
removing leftover index.html.
adding migration for renaming preview folder on disk.
2018-02-28 12:04:39 +01:00
1f7de81cd2
ignore file update
2018-01-02 15:25:42 +11:00
0fe96a58c1
Migrate to Umbraco.Build
2017-10-20 17:53:41 +02:00
890b87a1cf
More build fixing
2017-10-16 17:51:53 +02:00
d54658009c
Port 7.7 - WIP
2017-09-18 15:33:13 +02:00
3423d8b2cc
Merge branch 'dev-v7' into temp-u4-10006
...
# Conflicts:
# .gitignore
# build/Build.bat
# build/Build.proj
# build/BuildBelle.bat
# build/UmbracoVersion.txt
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2017-09-09 14:54:48 +02:00
9946d36d00
Ignore npm-debug.log
2017-09-08 14:12:53 +02:00
ba82885b6d
Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into temp-gulp-spike
...
# Conflicts:
# build/BuildBelle.bat
2017-08-07 14:05:53 +02:00
d37100e2d8
Build with PS
2017-06-28 13:38:06 +02:00
7d8fdff6c1
U4-10006 - adjust projects to new build
2017-06-15 15:50:50 +02:00
d34a425dd1
porting 7.6@5c5baca into 8
2017-05-30 12:54:22 +02:00
b78c334589
Merge remote-tracking branch 'origin/master-v7' into dev-v7
2017-05-19 12:04:27 +10:00
73e47402cb
Fixes docs build
2017-05-19 10:20:00 +10:00
c6956b5e98
Merge branch 'dev-v7' into dev-v7.6
...
# Conflicts:
# .gitignore
# build/Build.bat
2017-05-05 14:30:08 +02:00
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
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
ee9deacf92
ignore lib-bower temp folder
2017-01-07 01:26:47 +01:00
8e056aba66
Merge origin/dev-v7.6 into dev-v8-zbwip (builds, not tested)
2016-11-23 10:33:12 +01:00
35aac2cdec
Merge origin/dev-v7 into dev-v7.6
2016-11-18 09:52:45 +01:00
0a883ae109
Make sure Umbraco runs in Visual Studio 2017
2016-11-16 18:55:12 +01:00
b26b415096
Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)
2016-11-03 10:31:44 +01:00
a279be1b47
Build TLC
2016-10-05 14:35:44 +02:00
3c7245f9ba
Merge origin/dev-v7 into dev-v8
2016-07-08 16:32:06 +02:00
444c431527
Improving Build.bat and appveyor build output
2016-07-08 14:51:02 +02:00
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
afd62caa73
Ignore ClientDependency.config, building the solution will automatically create it
2016-06-21 10:55:18 +02:00
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
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
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
df99edba18
GitIgnore Umbraco.Tests/media
2016-03-22 14:37:48 +01:00
5774ce68c7
GitIgnore Umbraco.Tests/media
2016-03-22 14:37:22 +01:00
5f6ae3683e
removes files that shouldn't be committed
2015-12-21 15:03:10 +01:00
1f4ba9cfdc
ignores file that shouldn't be there
2015-11-26 10:36:15 +01:00
3612780d15
git-ignore loader.dev.js
2015-09-22 11:18:06 +02:00
b0ccb040a1
Makes sure we can have nightlies for non-pre-releases as well
2015-07-07 15:11:57 +02:00
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
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
Shannon