5 Commits

Author	SHA1	Message	Date
Kenn Jacobsen	655befde42	Read image dimensions via GDI if EXIF fails with an exception	2019-04-22 12:19:36 +02:00
Sebastiaan Janssen	dcf2e4830f	Merge branch 'dev-v7' into temp8 ... # Conflicts: # src/SolutionInfo.cs # src/Umbraco.Core/Configuration/UmbracoVersion.cs # src/Umbraco.Core/IO/MediaFileSystem.cs # src/Umbraco.Core/Media/Exif/ImageFile.cs # src/Umbraco.Core/PropertyEditors/ValueConverters/TagsValueConverter.cs # src/Umbraco.Core/Services/MediaService.cs # src/Umbraco.Web.UI.Client/src/canvasdesigner.loader.js # src/Umbraco.Web.UI.Client/src/common/directives/components/buttons/umbtoggle.directive.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js # src/Umbraco.Web/Editors/ContentController.cs # src/Umbraco.Web/umbraco.presentation/umbraco/translation/details.aspx.cs	2019-01-11 10:23:27 +01:00
Warren Buckley	54a2aa00a7	Revert "Temp8 tinymce"	2018-11-22 14:05:51 +00:00
Shannon	edc9744397	manual merge pass #1	2018-10-02 11:14:04 +02:00
Shannon	029eff1f8a	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