yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ba7cd48b8fff3abf1ff289c1ef7b85c13aa07e2f
Umbraco-CMS/src/Umbraco.Web/Models
History
Shannon ba7cd48b8f Merge remote-tracking branch 'origin/v8/dev' into v8/merge/v715 
# Conflicts:
#	src/Umbraco.Core/Constants-DataTypes.cs
#	src/Umbraco.Core/Migrations/Install/DatabaseDataCreator.cs
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
2019-07-02 10:49:20 +10:00
..
ContentEditing
manual merging/fixing, project builds now, but need to manually merge the remaining
2019-06-28 13:24:13 +10:00
Mapping
Merge remote-tracking branch 'origin/v8/dev' into v8/merge/v715
2019-07-02 10:49:20 +10:00
PublishedContent
Make IPublishedContent changes less breaking and more friendly
2019-06-06 16:54:00 +02:00
TemplateQuery
moves class to separate file
2019-01-30 20:31:44 +11:00
Trees
Swapped all System.Root string conversions
2019-03-29 12:06:23 +00:00
BackOfficeTour.cs
…
BackOfficeTourFile.cs
…
BackOfficeTourStep.cs
…
ChangingPasswordModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
ContentModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
ContentModelOfTContent.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
ContentTypeImportModel.cs
Package installing is working
2019-01-15 22:08:08 +11:00
IContentModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
ImageCropAnchor.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
ImageCropMode.cs
Temp8 - Fixing spelling / typos etc in Umbraco.Web (#4148)
2019-01-26 16:52:19 +01:00
ImageCropRatioMode.cs
…
Link.cs
Add Multi Url Picker
2019-01-22 16:00:15 +01:00
LinkType.cs
Add Multi Url Picker
2019-01-22 16:00:15 +01:00
LocalPackageInstallModel.cs
v8: Add package contributors (#4385)
2019-02-14 16:00:58 +01:00
LoginModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
LoginStatusModel.cs
IContainer.die.die.die
2018-11-28 12:59:40 +01:00
PackageInstallModel.cs
Temp8 - Fixing spelling / typos etc in Umbraco.Web (#4148)
2019-01-26 16:52:19 +01:00
PackageInstallResult.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
PartialViewMacroModel.cs
Fixes issue with rendering macro content when the page doesn't exist
2019-02-04 13:42:07 +11:00
PartialViewMacroModelExtensions.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
PasswordChangedModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
PostRedirectModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
ProfileModel.cs
IContainer.die.die.die
2018-11-28 12:59:40 +01:00
PublishedContentBase.cs
Fixes debugger display attribute
2019-06-21 15:46:16 +10:00
RegisterModel.cs
Temp8 - Fixing spelling / typos etc in Umbraco.Web (#4148)
2019-01-26 16:52:19 +01:00
RequestPasswordResetModel.cs
…
SendCodeViewModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
SetPasswordModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
TagModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
UmbracoProperty.cs
Fixing all the TODO, FIXME & HACK comments so they all follow the same layout.
2019-01-27 11:16:00 +01:00
UnLinkLoginModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
UpgradeCheckResponse.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00
UserTourStatus.cs
…
ValidatePasswordResetCodeModel.cs
Revert "Temp8 tinymce"
2018-11-22 14:05:51 +00:00