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

1546 Commits

Author SHA1 Message Date
Shannon
ec1d013004 Manually merges the IgnorePublishedContentCollisions change, removes more service locator pattern, removes ContextMapper with UmbracoContext and instead uses IUmbracoContextAccessor and adjusts some DI. 2018-07-18 14:34:32 +10:00
Shannon
66f9eb01c7 merge fixing and cleanup 2018-07-18 13:19:48 +10:00
Shannon
390514cd9d Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Configuration/UmbracoSettings/ContentElement.cs
#	src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs
#	src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/Persistence/PetaPocoSqlExtensions.cs
#	src/Umbraco.Core/Security/BackOfficeUserManager.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/FileService.cs
#	src/Umbraco.Core/Services/IFileService.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/ContentElementTests.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.config
#	src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
#	src/Umbraco.Tests/Persistence/Querying/PetaPocoSqlTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/routes.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/linkpicker/linkpicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/content/copy.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/email/email.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.html
#	src/Umbraco.Web.UI.Client/src/views/users/user.controller.js
#	src/Umbraco.Web.UI/config/splashes/noNodes.aspx
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
#	src/Umbraco.Web.UI/config/umbracoSettings.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/config/lang/fr.xml
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/MemberTypeController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Routing/PublishedContentRequest.cs
#	src/Umbraco.Web/Routing/UrlProviderExtensions.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
 2018-07-18 13:19:14 +10:00
Sebastiaan Janssen
1908725a9a Merge pull request #2742 from nathanwoulfe/temp-U4-6946 
U4 6946 - Existing template file is overwritten when creating a new template in the backoffice
 2018-07-13 11:12:16 +02:00
Stephan
2051caaa01 Post-merge fixes 2018-07-12 18:05:48 +02:00
Sebastiaan Janssen
9e35748040 Merge pull request #2357 from Dexmoor/U4-10779 
U4-10779 Allow Members tree to work independently of Member Types tree
 2018-07-12 13:13:04 +02:00
Sebastiaan Janssen
c56dc63150 Merge pull request #2702 from nathanwoulfe/temp-U4-4732 
U4-4732 Anchor missing in TinyMCE of Umbraco 7.x
 2018-07-12 12:39:23 +02:00
Shannon
7aa413d558 Merge remote-tracking branch 'origin/dev-v7' into temp8 (after fixing) 
# Conflicts:
#	build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Constants-Applications.cs
#	src/Umbraco.Core/Models/Rdbms/ConsentDto.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
#	src/Umbraco.Core/Services/ConsentService.cs
#	src/Umbraco.Core/Services/IRelationService.cs
#	src/Umbraco.Core/Services/RelationService.cs
#	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Services/ConsentServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
#	src/Umbraco.Web.UI.Client/src/less/application/grid.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/main.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/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/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
#	src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
#	src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/MacroController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Models/RegisterModel.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/Trees/TreeControllerBase.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.designer.cs
 2018-07-11 15:58:48 +10:00
Shannon Deminick
7132ccdd99 Merge pull request #2760 from umbraco/temp8-variants 
Variants Refactoring [v8]
 2018-07-10 13:05:13 +10:00
Stephan
00bcef3ba6 Misc cleanup of PR 2018-07-09 12:40:57 +02:00
Stephan
fdfdd541e3 Content Url and Audit (in progress) 2018-07-06 12:20:10 +02:00
Nathan Woulfe
416cea796e clean up usings 2018-07-06 09:38:00 +10:00
Nathan Woulfe
e34926acd6 check for existing file content when creating/saving new template 2018-07-06 09:38:00 +10:00
Stephan
0af18b2376 Fix publishing 2018-07-05 17:07:40 +02:00
Stephan
b3696c29cc Refactor Variants at service level 2018-07-04 08:59:50 +02:00
Stephan
ecf9a928d7 Refactor variations 2018-07-03 13:05:21 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Stephan
6a05c556b5 Merge pull request #2751 from lkoruba/hackathon-use-logger-warn-with-func 
(V8 Hackathon) use logger warn with func<string>
 2018-06-29 16:43:22 +02:00
lkoruba
b515f24c16 Change calls to logger.Warn method to use Func<string> second part 2018-06-29 15:35:56 +02:00
Sebastiaan Janssen
db230aa45d Merge pull request #2745 from aburok/hackathon-use-logger-info-with-func 
Hackathon use logger info with func
 2018-06-29 15:13:53 +02:00
lkoruba
8359ea5862 Revoke files where string is not concatenated 2018-06-29 15:08:35 +02:00
lkoruba
7e4f2957a3 Change calls to logger.Warn method to use Func<string> parameter 2018-06-29 14:53:41 +02:00
Sebastiaan Janssen
f91bc1604a Merge pull request #2744 from ed-parry/hackathon-remove-obsolete-methods 
V8 Hackathon: remove obsolete methods
 2018-06-29 14:51:18 +02:00
Sebastiaan Janssen
4b120827cf Merge pull request #2739 from aburok/hackathon-use-logger-debug-with-func 
Change calls to logger.Debug method to use Func<string> parameter
 2018-06-29 14:46:01 +02:00
Dawid Koruba
7660e10098 Change calls to logger.Info method to use Func<string> parameter 2018-06-29 14:25:17 +02:00
Ed Parry
7f7cceb90f Removed obsolete methods in editors and the grid template. 2018-06-29 13:12:08 +01:00
Dawid Koruba
51ab9e32de Change calls to logger.Debug method to use Func<string> parameter 2018-06-29 12:35:31 +02:00
Matt Darby
35ca13c83a U4-8424 - When no document types are allowed at root, don't allow all of them 2018-06-29 11:31:43 +01:00
Sebastiaan Janssen
00959a16cc Merge pull request #2585 from bjarnef/dev-v7-U4-11214 
U4-11214 - Display member type name in heading
 2018-06-28 20:32:26 +02:00
Sebastiaan Janssen
0a29ad3d21 Merge pull request #2570 from AndyButland/u4-10502 
U4-10502 - resend of user invitations
 2018-06-28 20:28:24 +02:00
Robert
385f1d6689 Merge pull request #2604 from umbraco/temp-U4-11276 
Implements doc type collections | connects #73
 2018-06-26 23:58:35 -07:00
Nathan Woulfe
bb28d3f4a9 extend contentcontroller to allow udi or guid params for getbyid, which also requires extending the attribute for the different param types 2018-06-17 20:06:39 +10:00
Shannon Deminick
7372fa1705 Merge pull request #2627 from efabioli/patch-1 
U4-11329 - GetExternalAuthenticationOptions gets called when AuthType is Null in Umbraco.Web/editors/BackOfficeController.cs
 2018-06-14 14:31:27 +10:00
Enkel Media
8d41d106d0 Fixes #U4-11406 by setting the thread culture before rendering macro (#2666) 2018-06-13 21:06:58 +02:00
Sebastiaan Janssen
d66e951b68 Updating code style, removes obsolete files, now we can move the tree to the Translation section 2018-06-13 20:20:21 +02:00
Dave Woestenborghs
9c33f1b1c9 U4-5683 Migrate Dictionary tree & editor to angular (#2159) 2018-06-13 20:19:18 +02:00
Sebastiaan Janssen
a3e0f908de Fixes merge error 2018-06-07 09:00:47 +02:00
Sebastiaan Janssen
6e8214e697 Merge remote-tracking branch 'origin/dev-v7' into temp8 2018-06-06 22:36:22 +02:00
Marc Goodson
0eceb3c7fc U4-11369 - Add list of content types where a composition content type is used to compositions dialog (#2668) 2018-06-06 22:35:10 +02:00
Shannon
b75cf3bc76 Changes EnumExtensions to ContentVariationExtensions and adds more helper methods to replace a lot of the duplicate checking in our code. Adds code to enforce unique naming for culture names, adds supporting tests. 2018-06-01 15:20:16 +10:00
Shannon
437855979d Fixes passing in the user id for copy operations 2018-05-31 23:33:52 +10:00
Shannon
abbb119fc9 Ensures ref integrity for all FKs to umbracoUser table but support NULL values 2018-05-31 23:05:35 +10:00
Shannon
0d68a3fb4f avoids a ysod if the wrong user id sneaks in to the log 2018-05-31 15:54:23 +10:00
Shannon
07a263b794 Fixes validation check for variant nodes that don't have names assigned 2018-05-17 10:28:38 +02:00
Shannon
95c6de5534 Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-05-16 10:15:57 +02:00
Shannon
c655873b7d Cleanup canvas designer files, no more dotless dependency, cleans up preview, removes bloat 2018-05-16 10:13:55 +02:00
Shannon
ea6c466323 Fixes up some warnings 2018-05-16 10:06:51 +02:00
efabioli
9040b1a3cb NullReferenceException 
Retrieving ExternalSignInAutoLinkOptions only if authType is not null.  
Issue found in version 7.9 too; not checked other versions.
 2018-05-11 16:27:43 +02:00
Shannon
68f0a64136 Fixes auth with AllowsCultureVariation and LanguageController post methods, fixes merge issues with navigation.controller 2018-05-10 19:16:46 +10:00
Shannon
573b8a0701 Merge remote-tracking branch 'origin/temp8' into temp8-U4-11282 
# Conflicts:
#	src/Umbraco.Tests/Routing/DomainsAndCulturesTests.cs
#	src/Umbraco.Web.UI.Client/src/controllers/navigation.controller.js
 2018-05-10 18:55:39 +10:00