yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,663 Commits 4 Branches 7 Tags
3dbebfb153a20e7e18aeaaafbb6325bfca0cf526
Commit Graph

1118 Commits

Author SHA1 Message Date
Bjarke Berg
2ce67dcf9a Merge branch 'netcore/feature/non-static-iohelper' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project 
# Conflicts:
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Tests/Composing/CompositionTests.cs
 2019-11-08 07:55:23 +01:00
Bjarke Berg
563f58afa6 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-11-07 14:34:45 +01:00
Bjarke Berg
c6ca955d5a Move some of the config to Umbraco.Configuration 2019-11-07 13:02:29 +01:00
Bill Bixby
6307a0173b Edit text file to remove reference to App_Data\NuGetBackup folder 2019-11-07 11:24:31 +00:00
Bjarke Berg
bf16a5936e Merge remote-tracking branch 'origin/v8/feature/mb-embed' into v8/feature/mb-embed 2019-10-31 12:32:51 +01:00
Bjarke Berg
1436441f78 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/mb-embed 2019-10-29 16:09:43 +01:00
Bjarke Berg
17e28b6840 AB3389 - Move the stuff from App_Plugins/ModelsBuilder into Umbraco.Web.UI.Client and handle dashboard as code. 2019-10-29 14:28:54 +01:00
Shannon
2c9939e516 restores the MB enable flag 2019-10-29 11:02:18 +11:00
Shannon
3b6abbb936 Renames project: Umbraco.ModelsBuilder.Embedded and namespaces since we need a different assembly, updates nuspec, changes file path of MB app_plugins 2019-10-29 00:25:03 +11:00
Callum Whyte
6301371e59 Updating references to our.umbraco.org 2019-10-23 18:07:53 +02:00
Bjarke Berg
c5bee77537 AB3267 - removed option to disable modelsbuilder - dont make sense for v8, and everything is broken when if you did it. 2019-10-23 14:40:52 +02:00
Bjarke Berg
35cae68214 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/mb-embed 2019-10-22 08:07:27 +02:00
Rasmus John Pedersen
1362a953f2 Fix wrong assembly name for UmbracoModule 2019-10-21 16:50:39 +02:00
Bjarke Berg
e1c6f721b0 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/mb-embed 2019-10-21 13:33:59 +02:00
Ronald Barendse
0dea83543e Removed Microsoft.Net.Compilers dependency (#6501) 2019-10-14 13:39:53 +02:00
Niels Lyngsø
aafa314f0e Separate gulp script for docs (#6409) 2019-09-25 10:52:33 +02:00
Shannon
6839397206 bumps examine requirements 2019-09-13 11:58:32 +10:00
Shannon
a9805e2b5a bumps cdf requirements 2019-09-13 11:57:12 +10:00
Stephan
cbf6801d5a Merge branch v8/dev into v8/feature/mb-embed 2019-09-12 09:33:10 +02:00
Sebastiaan Janssen
303d709a73 Fixes #6229 - Upgrading to 8.1.3 adds an extra dependentAssembly to web.config 2019-08-29 16:44:18 +02:00
Callum Whyte
563a352953 Correcting ASCII art in README (#6156) 
(cherry picked from commit a24e5bd10c)
 2019-08-29 14:22:49 +02:00
Shannon
5da1e64bbc Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev 2019-07-02 19:15:20 +10:00
Shannon
7b0979f9fd Fixes install.ps1 and updates sln to remove old ps1 file 2019-07-02 19:15:04 +10:00
Claus
178b1ccf40 Merge pull request #5743 from umbraco/v8/feature/sourcelink-update 
V8: Adds in SourceLink Debugging Feature
 2019-07-02 10:49:11 +02:00
Warren Buckley
3effc66b2c Need to update NuSpec to ensure the PDB are getting coppied into the bin when Nuget pacakeg installed into a project 2019-07-01 11:53:22 +01:00
Warren Buckley
23a7654cea Merge branch 'v8/dev' into v8/feature/sourcelink-update 2019-06-28 12:37:20 +01:00
Shannon
84aa861a5b Merge remote-tracking branch 'origin/v7/dev' into v8/dev - Iniital commit (broken) 
# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/Constants-DataTypes.cs
#	src/Umbraco.Core/Models/DataTypeDefinition.cs
#	src/Umbraco.Core/Models/DataTypeExtensions.cs
#	src/Umbraco.Core/Models/IDataTypeDefinition.cs
#	src/Umbraco.Core/Models/UmbracoEntity.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/Persistence/Factories/DataTypeDefinitionFactory.cs
#	src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/DataTypeService.cs
#	src/Umbraco.Core/Services/EntityService.cs
#	src/Umbraco.Core/Services/IContentService.cs
#	src/Umbraco.Core/Services/IDataTypeService.cs
#	src/Umbraco.Core/Services/IEntityService.cs
#	src/Umbraco.Core/Services/IRelationService.cs
#	src/Umbraco.Core/Services/Implement/RelationService.cs
#	src/Umbraco.Tests/Models/UmbracoEntityTests.cs
#	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
#	src/Umbraco.Tests/Services/EntityServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/search.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/contentpicker/contentpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/HtmlHelperRenderExtensions.cs
#	src/Umbraco.Web/Models/ContentEditing/ContentPropertyBasic.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
#	src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
#	src/Umbraco.Web/Mvc/RenderRouteHandler.cs
#	src/Umbraco.Web/PropertyEditors/ContentPicker2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MediaPicker2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiNodeTreePicker2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/MultiUrlPickerPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RelatedLinks2PropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPreValueEditor.cs
#	src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
#	src/Umbraco.Web/Security/UmbracoAntiForgeryAdditionalDataProvider.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/Trees/MediaTreeController.cs
#	src/Umbraco.Web/Trees/TreeControllerBase.cs
#	src/Umbraco.Web/Trees/TreeQueryStringParameters.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
#	src/Umbraco.Web/WebBootManager.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseMediaTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/BaseTree.cs
#	src/umbraco.cms/businesslogic/web/Access.cs
 2019-06-28 13:03:36 +10:00
Stephan
834aeee107 Fix slimmed down ModelsBuilder 2019-06-27 12:47:40 +02:00
Stephan
347c2e8238 Upgrade to ModelsBuilder 8.1.0 2019-06-26 12:30:13 +02:00
Warren Buckley
60ed6f6b20 Remove snupkg aka newer Symbol nuget packages 2019-06-24 13:18:20 +01:00
Warren Buckley
601d48277e Update NuSpecs with the XML MetaData for SourceLink 2019-06-23 19:53:57 +01:00
Maarten v.d. Donk
3d2379d582 Correct location for Visual Studio xml documentation files (5588) 2019-06-05 11:34:42 +02:00
Bjarke Berg
206f47bf52 Added missing nuget dependencies to the nuspec-file of UmbracoCms.Core 2019-05-16 14:24:09 +02:00
Shannon Deminick
a43359e440 Merge pull request #5272 from umbraco/v8/spike/api-docs 
Regenerating API docs
 2019-05-10 13:53:37 +10:00
Shannon
8fce680430 removes unused line, updates gitignore 2019-05-10 13:07:06 +10:00
elitsa
3d80d511a4 Adding a parameter for enabling docfx into the script. 2019-05-08 14:27:44 +02:00
Bjarke Berg
96cd42b316 #5373 - Removed configuration options that we don't want to support. The other options can be archived using the original file sink. 2019-05-07 08:25:43 +02:00
Shannon
64eff0ba0f adds serilog xdt file 2019-05-06 15:51:28 +10:00
Elitsa Marinovska
6cd77df1ad Updating the base link 2019-05-01 15:30:58 +02:00
Elitsa Marinovska
adf762bdf8 Integrate docs script with the main build script 2019-05-01 15:25:47 +02:00
Elitsa Marinovska
6b17248f64 Updating base link 2019-05-01 15:22:10 +02:00
Elitsa Marinovska
7e064cee83 Optimizing scripts 2019-04-28 21:14:32 +02:00
Stephan
56d7755487 Merge branch 'v8/dev' into v8/spike/api-docs 2019-04-25 09:05:21 +02:00
Warren Buckley
103c92bc69 Update powershell to use the snupkg format for symbol package to be hosted on nuget.org symbol server 
Advisory from Nuget team is to no longer include the C# .cs files in the src folder of a nuget package
 2019-04-24 12:31:05 +01:00
Elitsa Marinovska
dba241ef50 Adding build script for API docs 2019-04-15 22:04:55 +02:00
Stephan
c5f934930e Merge branch 'v8/dev' into v8/feature/284-auto-mapper 2019-04-02 12:03:05 +02:00
Stephan
70c2090a56 Refactor more mappers - AutoMapper gone now 2019-03-27 09:15:32 +01:00
Paul Seal
bb23fbbf8d increased length of line under the word umbraco 2019-03-19 22:59:28 +01:00
Paul Seal
30b47ff15f Update the umbraco ascii art 
I thought it would be a good idea to update the ascii art to a font similar to the one in the umbraco logo on the umbraco.com website.
 2019-03-19 22:59:28 +01:00
Sebastiaan Janssen
fe7c6bd1ed Merge branch 'patch-8.0.1' into dev-v8 2019-03-19 09:46:14 +01:00