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

188 Commits

Author SHA1 Message Date
Bjarke Berg
bf4023afa7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
 2020-02-25 11:57:11 +01:00
Warren Buckley
4ed69d21a0 Merge branch 'v8/8.6' up into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
 2020-02-24 15:11:58 +00:00
Warren Buckley
8bf457a88d Set v8/dev to 8.7.0 with powershell .\build setumbracoversion 8.7.0 2020-01-24 09:10:54 +00:00
Warren Buckley
3ad1bb9e12 Added "rc" to AssemblyInformationalVersion for 8.6.0-rc 2020-01-24 09:06:33 +00:00
Bjarke Berg
a97e131891 Bump version o 8.6 (8.5 reserved for MB release) 2019-11-14 14:00:49 +01:00
Bjarke Berg
3df329deb2 bump version and remove unused references 2019-11-05 16:52:22 +01:00
Bjarke Berg
88e57277fa Bump version to 8.4.0 2019-11-04 12:58:08 +01:00
Bjarke Berg
1a9ed95235 Bumb version to 8.3 2019-09-26 10:05:41 +02:00
Warren Buckley
61a18297d9 Make v8/dev now 8.2.0 2019-07-12 13:03:20 +01:00
Warren Buckley
03a4b75176 Ran .\build SetUmbracoVersion 8.1.1 to bump version 2019-07-11 15:11:37 +01:00
Sebastiaan Janssen
4b489b52ef Bump version again 2019-02-23 14:21:44 +01:00
Bjarke Berg
aaa8e881f8 Version number revert 2019-02-21 14:45:12 +01:00
Sebastiaan Janssen
91c52cffc8 And revert again 2019-02-19 15:57:40 +01:00
Sebastiaan Janssen
03e7779afb Update install screen 2019-02-19 15:57:06 +01:00
Sebastiaan Janssen
15562ec12f Bump version 2019-02-19 15:01:26 +01:00
Sebastiaan Janssen
6e8862954a Bump version 2019-02-19 15:00:58 +01:00
Stephan
6125643c3f Bump copyright year 2019-02-05 13:43:04 +01:00
Stephan
a1400d33fd Fixes, version 8.0.0-alpha.58 2019-01-07 19:41:23 +01:00
Stephan
775dd67254 Version 8.0.0-alpha-57 2019-01-07 09:46:11 +01:00
Stephan
81a9807206 Version 8.0.0-alpha.56 2019-01-02 18:14:48 +01:00
Shannon
c6a67f79ac Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/GlobalSettings.cs
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Models/IContentTypeBase.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MemberGroupRepository.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/media.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
#	src/Umbraco.Web.UI.Client/src/common/services/umbrequesthelper.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/buttons.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-tabs.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/hacks.less
#	src/Umbraco.Web.UI.Client/src/less/modals.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/approvedcolorpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/imaging/umb-image-gravity.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/media/mediadashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardvideos.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.html
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/Umbraco/dialogs/protectPage.aspx
#	src/Umbraco.Web.UI/Umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
#	src/Umbraco.Web.UI/umbraco_client/Dialogs/PublishDialog.js
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/HealthCheck/Checks/DataIntegrity/DatabaseSchemaValidationHealthCheck.cs
#	src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
#	src/Umbraco.Web/Models/Trees/TreeNodeExtensions.cs
#	src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/EmailAddressPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
#	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
#	src/Umbraco.Web/Routing/ContentFinderByUrlAlias.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebServices/SaveFileController.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/FileSystemTree.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/controls/dualSelectBox.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/protectPage.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/rollBack.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
 2018-10-22 16:03:01 +11:00
Paul Seal
cbc3ca0768 Updated copyright year 2018-10-09 10:56:18 +02:00
Stephan
00017a0624 Version 8.0.0-alpha.52 for ModelsBuilder 2018-10-08 16:46:23 +02:00
Stephan
a1a06609b9 Version 8.0.0-alpha.50 with 3 NuGet packages 2018-09-04 09:36:58 +02:00
Stephan
f791198817 Version 8.0.0-alpha.49 for ModelsBuilder 2018-08-28 18:45:37 +02:00
Sebastiaan Janssen
276810be6c Bump to v7.13.0 2018-08-26 17:56:13 +02:00
Sebastiaan Janssen
18b690f11a Bump the version to 7.12.2 2018-08-23 20:45:49 +02:00
Sebastiaan Janssen
39e8a9fa67 Bump version to 7.12.1 2018-08-15 15:47:21 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Sebastiaan Janssen
61bde607c7 Bumps version to 7.12 2018-06-18 21:53:13 +02:00
Stephan
062a47f2aa Use ModelsBuilder from NuGet, -alpha.44 2018-06-04 11:37:19 +02:00
Stephan
f92a03b996 Use ModelsBuilder from NuGet, -alpha.43 2018-06-04 11:32:53 +02:00
Stephan
baba390c7b Version 8.0.0-alpha.41 2018-05-21 23:04:18 +02:00
Stephan
bd07a1ba5c Version 8.0.0-alpha.40 2018-05-21 11:49:20 +02:00
Stephan
c13e3ec220 Version 8.0.0-alpha.37 2018-05-18 09:39:02 +02:00
Stephan
6e7bb41190 Version 8.0.0-alpha.36 2018-05-17 15:33:38 +02:00
Stephan
f44c5ad757 Cleanup nuget, bindings, build 2018-05-17 12:17:42 +02:00
Stephan
fc56126820 Cleanup Solution 2018-05-16 15:46:51 +02:00
Stephan
d56af5872d Implement basic fallback plumbing (in progress) 2018-05-02 13:38:45 +02:00
Stephan
dc589f9b96 Fix csproj, nuspec 2018-04-16 16:08:26 +02:00
Sebastiaan Janssen
28cbb0a517 Bumps version to 7.11.0 2018-04-12 13:41:56 +02:00
Sebastiaan Janssen
95d40049f5 Bumps version to 7.10.2 2018-04-09 08:30:39 +02:00
Shannon
047a05cfb3 bumps version 2018-04-03 11:38:13 +10:00
Shannon
e019c94207 changes back to correct version 2018-04-03 10:42:57 +10:00
Sebastiaan Janssen
8c0ec489c2 Bump version to 7.11 2018-03-23 09:54:11 +01:00
Sebastiaan Janssen
19e5715a84 Whoops, that was not supposed to say beta 2018-03-22 14:55:02 +01:00
Stephan
32e6aa4f6b Version alpha.32 for ModelsBuilder 2018-03-20 16:21:26 +01:00
Shannon
05c38db54c updates naming of the extending preview property and fixes the angular rendering on ng-init 2018-03-14 15:24:30 +11:00
Shannon
830f460b7e bumps version 2018-03-14 13:58:48 +11:00
Sebastiaan Jansssen
213ea6470f Bump version to 7.9.2 2018-03-01 15:09:04 +01:00