yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,226 Commits 4 Branches 7 Tags
39458017ec061d0b6b7dcf8f48be222c48e285bd
Commit Graph

21742 Commits

Author SHA1 Message Date
Shannon
39458017ec removes old tag API 2018-10-02 15:29:17 +02:00
Shannon
7196c855b2 Fixes tests 2018-10-02 15:19:01 +02:00
Shannon
0c5cf5256b manual merge pass #2 2018-10-02 12:57:19 +02:00
Shannon
edc9744397 manual merge pass #1 2018-10-02 11:14:04 +02:00
Shannon
7349b545b0 manually merging new media detectors 2018-10-02 09:38:27 +02:00
Shannon
549d8d83ce reverts changes that shouldn't have been made, will manually merge these ones 2018-10-01 14:39:28 +02:00
Shannon
b96ba05d22 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.nuspec
#	build/NuSpecs/tools/Readme.txt
#	src/Umbraco.Core/Configuration/UmbracoConfig.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IContentSection.cs
#	src/Umbraco.Core/Constants-Conventions.cs
#	src/Umbraco.Core/Constants-System.cs
#	src/Umbraco.Core/IO/MediaFileSystem.cs
#	src/Umbraco.Core/Media/Exif/ImageFile.cs
#	src/Umbraco.Core/Models/Property.cs
#	src/Umbraco.Core/Models/PropertyTagBehavior.cs
#	src/Umbraco.Core/Models/PropertyTags.cs
#	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenTwelveZero/SetDefaultTagsStorageType.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Security/AuthenticationExtensions.cs
#	src/Umbraco.Core/Security/BackOfficeCookieAuthenticationProvider.cs
#	src/Umbraco.Core/Services/Implement/PackagingService.cs
#	src/Umbraco.Core/Services/ServerRegistrationService.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Tests/ApplicationUrlHelperTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/AuditRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/user.service.js
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/less/components/card.less
#	src/Umbraco.Web.UI.Client/src/less/navs.less
#	src/Umbraco.Web.UI.Client/src/less/panel.less
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-color-swatches.html
#	src/Umbraco.Web.UI.Client/src/views/components/umb-table.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/imagecropper/imagecropper.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/textarea/textarea.html
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web.UI/web.Template.config
#	src/Umbraco.Web/Editors/AuthenticationController.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/CanvasDesignerController.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DashboardController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
#	src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
#	src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
#	src/Umbraco.Web/Models/Mapping/DataTypeModelMapper.cs
#	src/Umbraco.Web/Models/Mapping/PreValueDisplayResolver.cs
#	src/Umbraco.Web/Mvc/MasterControllerFactory.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/ImageCropperPropertyValueEditor.cs
#	src/Umbraco.Web/PropertyEditors/TextAreaPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
#	src/Umbraco.Web/PublishedCache/MemberPublishedContent.cs
#	src/Umbraco.Web/Routing/RedirectTrackingEventHandler.cs
#	src/Umbraco.Web/Scheduling/HealthCheckNotifier.cs
#	src/Umbraco.Web/Scheduling/KeepAlive.cs
#	src/Umbraco.Web/Scheduling/LogScrubber.cs
#	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
#	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
#	src/Umbraco.Web/Scheduling/Scheduler.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
#	src/Umbraco.Web/UmbracoModule.cs
#	src/Umbraco.Web/_Legacy/Packager/Installer.cs
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/keepAliveService.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/FeedProxy.aspx.cs
#	src/umbraco.businesslogic/IO/IOHelper.cs
#	src/umbraco.cms/packages.config
#	src/umbraco.cms/umbraco.cms.csproj
#	src/umbraco.controls/packages.config
#	src/umbraco.controls/umbraco.controls.csproj
#	src/umbraco.editorControls/packages.config
#	src/umbraco.editorControls/umbraco.editorControls.csproj
 2018-10-01 14:32:46 +02:00
Shannon
b4f4d2cfe8 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-10-01 11:26:40 +02:00
Shannon
5c8fd56317 comment 2018-10-01 11:26:18 +02:00
Anders Bjerner
fabab44342 Removed "debugger" statement from linkpicker overlay 2018-09-30 19:31:40 +02:00
Stephan
d56d39ee1a Fix nested content validation when null 2018-09-30 19:09:06 +02:00
Stephan
053e0e17a3 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-09-30 18:49:50 +02:00
Matthew-Wise
a33ccd15c6 Convertion of assigndomain2.aspx to angular (#2897) 2018-09-30 16:02:09 +02:00
agrath
63a2a155d1 User invite flow review (#3000) 2018-09-30 15:03:52 +02:00
KimHolzmann
8fad718347 #2916 Media picker searches entire media archive (#3061) 2018-09-30 14:08:01 +02:00
Sebastiaan Janssen
3879b81ed3 Merge pull request #3062 from markadrake/temp-3058 
If TinyMCE has not loaded yet, return the initialized value.
 2018-09-30 13:44:11 +02:00
Mark Drake
c5de33dcae Added an active css class for Umbraco Tree items (#3056) 2018-09-30 13:38:19 +02:00
Sebastiaan Janssen
f36139619a Merge pull request #3060 from markadrake/temp-3051 
Minimal changes to class `nav-tabs` styling
 2018-09-30 13:29:01 +02:00
Sebastiaan Janssen
093182c56d Allow svg uploads 2018-09-30 13:12:11 +02:00
imranhaidercogworks
5f1fb144e0 Uploading SVG's Causes Error (Depending on imageFileTypes Setting) (#3072) 2018-09-30 13:09:44 +02:00
Sebastiaan Janssen
6b398a2d16 Merge pull request #3074 from arknu/tags-internal 
Make TagSupport and related types public
 2018-09-30 11:02:52 +02:00
Sebastiaan Janssen
3c73f6a764 Rename name property so title gets set for the doctype icon picker - relates to PR #2864 2018-09-30 10:59:20 +02:00
Bjarne Fyrstenborg
865cdc09c6 U4-11588 - Adjustments of color picker (#2864) 2018-09-30 10:50:05 +02:00
Asbjørn
7f107a8559 Make TagSupport and related types public #2988 2018-09-29 17:42:45 +02:00
Stephan
b572407084 Fix nested content when empty or null 2018-09-28 16:59:00 +02:00
Stephan
621ef28680 Fix PublishedElementModel, must be abstract 2018-09-28 16:59:00 +02:00
Stephan
3382a4efdb Fix nested content breaking issue 2018-09-28 16:59:00 +02:00
Mark Drake
12a9466cd7 if tinymce has not loaded yet, return the initialized value only 2018-09-27 17:03:24 -04:00
Mark Drake
fce0dd98f9 minimal changes to class nav-tabs styling 2018-09-27 13:34:20 -04:00
Robert
442e0c93a5 Merge branch 'temp8' into temp8-p181 2018-09-27 15:17:56 +02:00
Sebastiaan Janssen
25aa74b4cd Merge pull request #2937 from umbraco/temp-view-compilation 
Changes compilation batch mode to true uses Roslyn compiler for views
 2018-09-27 12:01:00 +02:00
Sebastiaan Janssen
976d329292 Merge pull request #3005 from dalyUSN/temp-U4-9967 
Preview update: smartphone sizes
 2018-09-27 11:55:05 +02:00
Shannon Deminick
2db32ef347 Merge pull request #3052 from umbraco/temp8-IDocumentEntity-updates 
IDocumentEntity updates
 2018-09-27 19:41:53 +10:00
Shannon
83501ba1eb Gets tree node states showing correctly for variants. 2018-09-27 19:30:31 +10:00
Sebastiaan Janssen
b079593efd Merge pull request #2083 from Eyescream/#U4-5139 
U4-5139 Error uploading a file when filename contains comma
 2018-09-27 11:17:27 +02:00
Stephan
8ea4c10ce7 Fix GetCurrentRequestIpAddress when there is no request 2018-09-27 10:52:02 +02:00
Stephan
e6d5af5c3a Fix DisposableTimer messages 2018-09-27 10:51:29 +02:00
Sebastiaan Janssen
883da4eaf1 Merge pull request #2408 from abjerner/patch-35 
"Select editor" items shouldn't have a max height
 2018-09-26 23:28:12 +02:00
Marc Goodson
c021cc50ce U4-10669 7.8. Show 301 url redirects on info tab too (#2452) 2018-09-26 23:16:54 +02:00
Sebastiaan Janssen
85291b562e Merge pull request #2533 from ronaldbarendse/U4-10586 
Added property editor alias to PreValueDisplayResolver warning
 2018-09-26 23:03:57 +02:00
Sebastiaan Janssen
ca8c6248c1 Merge pull request #2561 from umbraco/temp-U4-10816 
fixes U4-10816 Umbraco V7.7.1 - Media - File upload taking full path
 2018-09-26 22:53:41 +02:00
Sebastiaan Janssen
258baad127 Removed uneccessary properties 2018-09-26 22:01:09 +02:00
Chris Houston
0e6376f4e5 Updated the URL for the issue tracker. 
Also updated the version number to reflect the current version.
 2018-09-26 21:58:05 +02:00
Dave Woestenborghs
b0374695b1 Fixed udi's rendered in rte content (#2531) 2018-09-26 21:51:20 +02:00
Dave Woestenborghs
471bc7f116 U4-11458 - Fix multiple issues for angular logResource (#2719) 2018-09-26 20:48:54 +02:00
Sebastiaan Janssen
3940176f23 Just a bit of code cleanup 2018-09-26 18:01:50 +02:00
Dennis Adolfi
5832387484 Added the DefaultLabelDataTypeIdas a non-deletable datatype. 2018-09-26 17:55:28 +02:00
Stephan
ad8c309f3d Variant-contextual breadcrumb 2018-09-26 16:27:34 +02:00
Mads Rasmussen
400d4552de remove the action button on editors in the settings/developer tree 2018-09-26 15:12:53 +02:00
Sebastiaan Janssen
a1224da5e1 Fixes #3036 
Removes WebClient completely except for in an old legacy class that is not used for anything
any more (umbraco.cms.businesslogic.packager.Installer.Fetch).
 2018-09-26 13:27:16 +02:00