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

9587 Commits

Author SHA1 Message Date
Bjarke Berg
cb428bb288 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1447: Catch the SoapException which happends when a timeout occurs on the server. Also change such that this check is only executed for super admins. 2019-06-18 08:11:18 +02:00
Shannon
1709879b14 Merge remote-tracking branch 'origin/v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
 2019-06-18 14:15:50 +10:00
Shannon
68f9e89a32 Merge branch 'v8/dev' into v8/feature/5123-rte-data-udi-images 2019-06-18 13:05:37 +10:00
Bjarke Berg
9a45bda430 Merge pull request #5658 from umbraco/v8/bugfix/3498-EntityService-updates 
V8/bugfix/3498 entity service updates
 2019-06-17 13:37:58 +02:00
Andy Butland
15b1d35c17 https://github.com/umbraco/Umbraco-CMS/issues/5665: Resolved issue where adding non-admin user group editor to group already exists 2019-06-17 08:43:24 +02:00
Andy Butland
17b479275e Resolved issue where adding non-admin user group editor to group already exists 2019-06-16 12:20:52 +02:00
Shannon
9927ff3c86 removes commented out code 2019-06-13 23:47:48 +10:00
Shannon
81077c2681 Gets the entity service returning a media's url property and allows this to be used in the media picker. 2019-06-13 23:39:36 +10:00
Shannon
16f6bbcbd4 init commit of removing code for entity service that loads in any property data 2019-06-13 18:45:33 +10:00
Warren Buckley
c597da8f97 Merge pull request #5423 from umbraco/v7/bugfix/4144-member-password-manual-change-fix 
Fixes #4144 - AllowManuallyChangingPassword Regression Fix
 2019-06-13 08:53:17 +01:00
Sebastiaan Janssen
39d93a7ace Spelling mistake IContentFinder function (#5616) 
Spelling mistake IContentFinder function
 2019-06-11 13:00:27 +02:00
Patrick de Mooij
e59d75f4f9 Spelling mistake IContentFinder function 2019-06-07 16:42:53 +02:00
Sebastiaan Janssen
e3b2d427a4 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	build/Modules/Umbraco.Build/Get-UmbracoBuildEnv.ps1
#	build/Modules/Umbraco.Build/Umbraco.Build.psm1
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	build/NuSpecs/UmbracoCms.nuspec
#	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
#	src/SQLCE4Umbraco/app.config
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/app.config
#	src/Umbraco.Core/packages.config
#	src/Umbraco.Tests.Benchmarks/app.config
#	src/Umbraco.Tests.Benchmarks/packages.config
#	src/Umbraco.Tests/App.config
#	src/Umbraco.Tests/Migrations/SqlScripts/SqlResources.Designer.cs
#	src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs
#	src/Umbraco.Tests/TreesAndSections/ResourceFiles.Designer.cs
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI.Client/bower.json
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI/Properties/Settings.Designer.cs
#	src/Umbraco.Web.UI/config/imageprocessor/cache.config
#	src/Umbraco.Web.UI/config/imageprocessor/processing.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/ContentTypeControllerBase.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Mvc/Strings.Designer.cs
#	src/Umbraco.Web/Properties/Settings1.Designer.cs
#	src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
#	src/Umbraco.Web/UI/JavaScript/Resources.Designer.cs
#	src/Umbraco.Web/Web References/org.umbraco.our/Reference.cs
#	src/Umbraco.Web/Web References/org.umbraco.update/Reference.cs
#	src/Umbraco.Web/app.config
#	src/Umbraco.Web/packages.config
#	src/Umbraco.Web/umbraco.presentation/umbraco/templateControls/Resources.Designer.cs
#	src/UmbracoExamine/UmbracoExamine.csproj
#	src/UmbracoExamine/app.config
#	src/UmbracoExamine/packages.config
#	src/umbraco.MacroEngines/Resources/Strings.Designer.cs
#	src/umbraco.MacroEngines/app.config
#	src/umbraco.MacroEngines/packages.config
#	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
#	src/umbraco.businesslogic/app.config
#	src/umbraco.businesslogic/packages.config
#	src/umbraco.businesslogic/umbraco.businesslogic.csproj
#	src/umbraco.cms/app.config
#	src/umbraco.cms/businesslogic/Packager/FileResources/PackageFiles.Designer.cs
#	src/umbraco.cms/packages.config
#	src/umbraco.cms/umbraco.cms.csproj
#	src/umbraco.controls/TreePicker/BaseTreePickerScripts.Designer.cs
#	src/umbraco.controls/app.config
#	src/umbraco.controls/umbraco.controls.csproj
#	src/umbraco.datalayer/app.config
#	src/umbraco.datalayer/umbraco.datalayer.csproj
#	src/umbraco.editorControls/app.config
#	src/umbraco.editorControls/mediapicker/MediaChooserScripts.Designer.cs
#	src/umbraco.editorControls/umbraco.editorControls.csproj
#	src/umbraco.interfaces/umbraco.interfaces.csproj
#	src/umbraco.providers/app.config
#	src/umbraco.providers/umbraco.providers.csproj
 2019-06-07 16:05:44 +02:00
Sebastiaan Janssen
22f54394fb Fix method signatures to prevent breaking changes (just like what I'd already done in v8) 2019-06-07 16:02:03 +02:00
Bjarke Berg
0120dc6ea3 https://github.com/umbraco/Umbraco-CMS/issues/5574 - Fixes issue when… (#5575) 2019-06-07 09:01:15 +02:00
Sebastiaan Janssen
d0eddbb9a2 Update SignalR 2019-06-06 15:38:37 +02:00
Sebastiaan Janssen
5faa71187d More Owin updates 2019-06-06 15:21:05 +02:00
Sebastiaan Janssen
c069f262dc Update MVC, Razor, WebApi and Owin 2019-06-06 14:50:01 +02:00
Sebastiaan Janssen
9f42e6a607 Update ImageProcessor and Newtonsoft.Json dependencies to the latest version 2019-06-06 14:37:57 +02:00
Sebastiaan Janssen
1c87176d80 Merge branch 'v7/dev' into pr/3064 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/packages.config
#	src/umbraco.MacroEngines/packages.config
 2019-06-06 12:50:48 +02:00
Niels Lyngsø
eff8075102 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/5190-invariant-property-validation 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-06-04 14:49:23 +02:00
Sebastiaan Janssen
a182c9b1ee Updates to latest Examine (#4851) 
Updates to latest Examine
 2019-06-04 13:06:35 +02:00
Poornima Nayar
864d83f8f7 Introduce a maxlength on the name of the node (#5374) 2019-06-03 11:41:58 +02:00
Bjarke Berg
2f978e96d4 Merge pull request #5467 from umbraco/v8/bugfix/805-migrate-from-7 
Tested starterkit both using SqlCE and SqlServer and reviewed the code. Merging in..
 2019-06-03 10:59:57 +02:00
Frans de Jong
457474ecf9 Added a check for and delete descendants when deleting a dictionary item 2019-06-01 13:07:16 +02:00
Sebastiaan Janssen
c6467b355d Merge pull request #5491 from kjac/v8-feature-mntp-single-mode-improvements 
V8: MNTP improvements when configured to select only one item
 2019-05-31 20:47:41 +02:00
Kenn Jacobsen
30067d92ae V8: Always show content and media search results first (#5309) 2019-05-31 20:29:00 +02:00
Sebastiaan Janssen
5191dbf011 Case insensitive section comparison (#5540) 
Case insensitive section comparison
 2019-05-31 20:07:26 +02:00
Sebastiaan Janssen
c292f7ff03 Merge pull request #5424 from electricsheep/v8/bugfix/5292-remove-hsts-preload 
V8: Remove preload from HSTS healthcheck
 2019-05-31 19:31:19 +02:00
Sebastiaan Janssen
17860fb8c7 Merge pull request #5432 from leekelleher/v8/bugfix/entitycontroller-convert-membertype 
Corrected `EntityController.ConvertToObjectType` return type for MemberType
 2019-05-31 19:28:01 +02:00
Sebastiaan Janssen
bc99d074a9 Merge pull request #5435 from ArnoldV/temp-5420 
5420: v8 Invited user keeps showing as "has not logged in yet"
 2019-05-31 19:25:56 +02:00
Sebastiaan Janssen
9ec95c7aa2 Merge pull request #5520 from kjac/v8-fix-macro-tree-sorting 
V8: Sort macros alphabetically
 2019-05-31 16:21:29 +02:00
Sebastiaan Janssen
b090de3cde Merge pull request #5549 from kjac/v8-fix-remove-reload-for-container-nodes 
V8: Don't show "Reload" for list view nodes
 2019-05-31 16:16:42 +02:00
Sebastiaan Janssen
fef9248b51 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/UserRepository.cs
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/macropicker.html
#	src/Umbraco.Web/Models/Mapping/MemberModelMapper.cs
#	src/Umbraco.Web/Strategies/NotificationsHandler.cs
 2019-05-31 11:36:29 +02:00
Sebastiaan Janssen
6af1057ad7 Merge pull request #5508 from Geckex/v7/temp-5507 
MemberModelMapper to return member groups ordered alphabetically
 2019-05-30 17:38:53 +02:00
Mario Lopez
1ad4414026 case insensitive section comparison 2019-05-29 11:39:10 +10:00
Stephan
3a813d2d77 Cleanup unknown user for audit events 2019-05-28 10:26:30 +02:00
Kenn Jacobsen
460653d078 Don't show "Reload" for container nodes 2019-05-26 19:06:24 +02:00
Kenn Jacobsen
a4f1b433eb Sort macros alphabetically 2019-05-25 10:34:03 +02:00
Thomas Poulsen
50c2d574f1 Change MemberModelMapper GetMemberGroupValue to return member groups ordered alphabetically. 
- This is used in ContentPropertyDisplay class - for UI purposes only.
 2019-05-22 14:13:46 +01:00
Kenn Jacobsen
e2746604a1 If MNTP is configured to pick max 1 item, convert the value into IPublishedContent instead of IEnumerable<IPublishedContent> 2019-05-19 08:37:33 +02:00
Rasmus John Pedersen
2b84f96836 Don't render data-udi in RTE on frontend 2019-05-16 08:54:57 +02:00
Rasmus John Pedersen
19e2b1c24e Don't save media paths for images in RTE 2019-05-14 13:35:17 +02:00
Stephan
301b16a036 Fix user for v7 migration 2019-05-10 10:14:15 +02:00
Shannon
f952877d04 ensures that the reset flag is passed to the server when an admin is changing a members password 2019-05-10 01:48:11 +10:00
Arnold Visser
62a6a4ec92 5420: v8 Invited user keeps showing as "has not logged in yet" 2019-05-09 10:31:44 +02:00
leekelleher
e958ca6f89 Fixed EntityController.ConvertToObjectType (for MemberType) 
When the `entityType` was "MemberType", it would return the "MediaType" object-type.
 2019-05-09 07:21:18 +01:00
Ollie Philpott
0a752c8985 Updated hsts description from days to weeks 2019-05-08 11:57:03 +01:00
Ollie Philpott
b6ad19ccad Corrected hsts max age description 2019-05-08 11:12:09 +01:00
Ollie Philpott
bea1d35ebf Updated hsts urls 2019-05-08 11:11:47 +01:00