yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
cd2cf26274fc4f8f4db539903da38cd9f8f84387
Umbraco-CMS/src/Umbraco.Core
History
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
..
_Legacy/PackageActions
…
Cache
Remove unused CodeAnnotations attributes, obsolete stuff
2018-07-20 10:59:25 +02:00
CodeAnnotations
Remove unused CodeAnnotations attributes, obsolete stuff
2018-07-20 10:59:25 +02:00
Collections
Revert various changes
2018-05-08 16:41:30 +02:00
Components
Cleanup
2018-10-15 14:44:26 +02:00
Composing
Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089
2018-10-08 10:23:53 +02:00
Configuration
Merge remote-tracking branch 'origin/dev-v7' into temp8
2018-10-22 16:03:01 +11:00
Deploy
…
Diagnostics
…
Dictionary
Renormalize
2018-06-29 19:52:40 +02:00
Events
gets unpublish working
2018-10-03 14:27:48 +02:00
Exceptions
…
FileResources
…
IO
Uploading SVG's Causes Error (Depending on imageFileTypes Setting) (#3072)
2018-09-30 13:09:44 +02:00
Logging
Fix DisposableTimer messages
2018-09-27 10:51:29 +02:00
Macros
Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core.
2018-08-29 01:15:46 +10:00
Manifest
Updating example content app manifest
2018-10-21 10:41:17 +02:00
Media
reverts changes that shouldn't have been made, will manually merge these ones
2018-10-01 14:39:28 +02:00
Migrations
Fix bad LockDto primary key w/migration
2018-10-17 15:11:00 +02:00
Models
Merge remote-tracking branch 'origin/dev-v7' into temp8
2018-10-22 16:03:01 +11:00
Packaging
Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too
2018-08-17 15:41:58 +01:00
Persistence
Merge remote-tracking branch 'origin/dev-v7' into temp8
2018-10-22 16:03:01 +11:00
Properties
Renormalize
2018-06-29 19:52:40 +02:00
PropertyEditors
Added null check for EmailValidator value, fixed js error.
2018-10-09 08:19:36 +02:00
Publishing
Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too
2018-08-17 15:41:58 +01:00
Runtime
Fix KeyValueService for proper initialization
2018-10-17 15:11:00 +02:00
Scoping
FIRST PASS - Updates Umbraco.Core project to not use the func overload & to use new message template instead
2018-08-14 15:08:32 +01:00
Security
manual merge pass #1
2018-10-02 11:14:04 +02:00
Serialization
Renormalize
2018-06-29 19:52:40 +02:00
Services
Fix KeyValueService for proper initialization
2018-10-17 15:11:00 +02:00
Strings
U4-11546 [v7] Clean up to remove compiler warnings (#2823)
2018-07-31 10:41:15 +02:00
Sync
Merge remote-tracking branch 'origin/dev-v7' into temp8
2018-10-01 14:32:46 +02:00
Xml
Removes mention of Log4Net & the commented code with it as it's never invoked
2018-07-31 15:27:27 +01:00
AssemblyExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
AsyncLock.cs
…
Attempt.cs
Renormalize
2018-06-29 19:52:40 +02:00
AttemptOfTResult.cs
Super user is not a Zero
2018-03-02 16:00:15 +01:00
AttemptOfTResultTStatus.cs
…
BindingRedirects.cs
Removes the logic for the Log4Net binding redirect
2018-07-27 13:51:17 +01:00
ByteArrayExtensions.cs
…
Constants-Applications.cs
Merge branch 'temp8' into temp8-3087-tree-grouping
2018-10-09 09:25:00 +01:00
Constants-Composing.cs
More xslt removal
2018-05-01 00:45:05 +10:00
Constants-Conventions.cs
Merge remote-tracking branch 'origin/dev-v7' into temp8
2018-10-01 14:32:46 +02:00
Constants-DatabaseProviders.cs
…
Constants-DataTypes.cs
Implement typed labels
2018-06-04 11:37:19 +02:00
Constants-DeploySelector.cs
…
Constants-Examine.cs
Renormalize
2018-06-29 19:52:40 +02:00
Constants-Icons.cs
…
Constants-ObjectTypes.cs
umbPLfest hackathon - Removed obsolete methods and properties.
2018-09-20 13:56:02 +01:00
Constants-PackageRepository.cs
Updated our.umbraco.org to .com
2018-07-27 16:41:57 +01:00
Constants-Packaging.cs
Renormalize
2018-06-29 19:52:40 +02:00
Constants-PropertyEditors.cs
Renormalize
2018-06-29 19:52:40 +02:00
Constants-PropertyTypeGroups.cs
cleanup
2018-08-06 21:39:30 +10:00
Constants-Security.cs
Ensures ref integrity for all FKs to umbracoUser table but support NULL values
2018-05-31 23:05:35 +10:00
Constants-System.cs
Merge remote-tracking branch 'origin/dev-v7' into temp8
2018-10-01 14:32:46 +02:00
Constants-Web.cs
Removes unused and obsoleted code
2018-05-01 01:27:25 +10:00
Constants.cs
Renormalize
2018-06-29 19:52:40 +02:00
ContentExtensions.cs
Fix tests
2018-09-07 11:43:57 +02:00
ContentVariationExtensions.cs
Fix routing, AliasUrlProvider
2018-07-31 14:48:30 +02:00
CustomBooleanTypeConverter.cs
Renormalize
2018-06-29 19:52:40 +02:00
DataTableExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
DateTimeExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
DecimalExtensions.cs
…
DelegateEqualityComparer.cs
Renormalize
2018-06-29 19:52:40 +02:00
DelegateExtensions.cs
…
DictionaryExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
DisposableObject.cs
Renormalize
2018-06-29 19:52:40 +02:00
DisposableObjectSlim.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:22 +01:00
EmailSender.cs
…
Enum.cs
Renormalize
2018-06-29 19:52:40 +02:00
EnumerableExtensions.cs
umbPLfest hackathon - Remove obsolete methods
2018-09-20 13:14:16 +01:00
ExpressionExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
ExpressionHelper.cs
Renormalize
2018-06-29 19:52:40 +02:00
GuidUdi.cs
…
HashCodeCombiner.cs
Renormalize
2018-06-29 19:52:40 +02:00
HashCodeHelper.cs
…
HashGenerator.cs
Port v7@2aa0dfb2c5 - WIP
2018-03-22 11:25:22 +01:00
HttpContextExtensions.cs
Fix GetCurrentRequestIpAddress when there is no request
2018-09-27 10:52:02 +02:00
ICompletable.cs
…
IDisposeOnRequestEnd.cs
Renormalize
2018-06-29 19:52:40 +02:00
IEmailSender.cs
…
IfExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
IntExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
IRuntime.cs
…
IRuntimeState.cs
Fix Examine PR, fix migrations and upgrades
2018-03-29 11:31:33 +02:00
KeyValuePairExtensions.cs
…
LambdaExpressionCacheKey.cs
Renormalize
2018-06-29 19:52:40 +02:00
ListExtensions.cs
…
MainDom.cs
Refactored the error params, so that exception is before the message/template so its more in sync with Serilog signature & was an easy way to find some more logs I missed too
2018-08-17 15:41:58 +01:00
MonitorLock.cs
…
NamedUdiRange.cs
…
NameValueCollectionExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
NetworkHelper.cs
Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core.
2018-08-29 01:15:46 +10:00
ObjectExtensions.cs
Whoops, committed the wrong file! Revert "Fixes U4-11584 RelatedLinks2 throws exception with null value in Link field"
2018-08-24 11:07:55 +02:00
ReadLock.cs
Renormalize
2018-06-29 19:52:40 +02:00
ReflectionUtilities-Unused.cs
DataType refactoring - troubleshooting
2018-02-02 19:50:48 +01:00
ReflectionUtilities.cs
Cleanup
2018-10-16 10:58:17 +02:00
RenderingEngine.cs
Renormalize
2018-06-29 19:52:40 +02:00
RuntimeLevel.cs
…
RuntimeState.cs
Remove quotes within logging message templates - as when doing querying with logs makes these logs impossible to find
2018-09-11 08:44:58 +01:00
SafeCallContext.cs
…
SemVersionExtensions.cs
…
ServiceContextExtensions.cs
…
Settable.cs
…
StringExtensions.cs
manual merge pass #2
2018-10-02 12:57:19 +02:00
StringUdi.cs
…
SystemUtilities.cs
Renormalize
2018-06-29 19:52:40 +02:00
ThreadExtensions.cs
…
TypeExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00
Udi.cs
…
UdiDefinitionAttribute.cs
…
UdiEntityType.cs
More xslt removal
2018-05-01 00:45:05 +10:00
UdiGetterExtensions.cs
More xslt removal
2018-05-01 00:45:05 +10:00
UdiRange.cs
…
UdiType.cs
…
UdiTypeConverter.cs
…
Umbraco.Core.csproj
Fix bad LockDto primary key w/migration
2018-10-17 15:11:00 +02:00
UmbracoApplicationBase.cs
Cleanup logging
2018-08-30 19:08:55 +02:00
UpgradeableReadLock.cs
Renormalize
2018-06-29 19:52:40 +02:00
UriExtensions.cs
wip on preview
2018-09-11 08:54:04 +10:00
VersionExtensions.cs
…
WaitHandleExtensions.cs
…
WriteLock.cs
Renormalize
2018-06-29 19:52:40 +02:00
XmlExtensions.cs
Renormalize
2018-06-29 19:52:40 +02:00