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

24136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lars-Erik Aabech
ce490a4c5b Adding null check to avoid nullref exception on 292 in WebSecurity during install. Still getting nullref on line 115 during install. 2018-07-28 01:12:14 +02:00
Lars-Erik Aabech
c885f850e9 Container should be registered with itself 2018-07-28 01:05:07 +02:00
Lars-Erik Aabech
caa2802c16 Moved creation of container into ContainerFactory 2018-07-27 21:21:21 +02:00
Stephan
f7a599b607 Merge branch temp8 into temp8-di2690 2018-07-26 09:59:52 +02:00
Stephan
3c8a5c3a0d Remove obsolete code 2018-07-26 09:56:23 +02:00
Stephan
6f4ad059ef Cleanup 2018-07-26 09:41:43 +02:00
Sebastiaan Janssen
3ec31bb64d Merge pull request #2756 from kows/hackathon-export-doc-type-to-angular 
Rewrite exportdocumenttype.aspx to Angular [v8hackaton]
 2018-07-25 12:13:52 +02:00
Sebastiaan Janssen
3b771bf0f7 Download using the umbraco built-in download method and adds notification for success/error 2018-07-25 12:09:46 +02:00
Sebastiaan Janssen
b5c3b85298 Merge branch 'hackathon-export-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-export-doc-type-to-angular 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI/Umbraco/dialogs/exportDocumenttype.aspx
#	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs
 2018-07-25 11:40:29 +02:00
Stephan
0eb1ba56a4 Comments 2018-07-23 12:19:26 +02:00
Stephan
6d40269ade More cleanup 2018-07-23 11:08:33 +02:00
Stephan
d2376bf4e3 Cleanup registrations 2018-07-23 08:56:08 +02:00
Stephan
a00f2f0bb9 Refactor, fix collection builders, fix tests 2018-07-21 10:47:29 +02:00
Stephan
981152b693 Move IContainer extension methods 2018-07-20 16:39:39 +02:00
Stephan
97da0829a2 Refactor collection builders for IContainer 2018-07-20 16:36:46 +02:00
Stephan
5836cd05cb Abstract container (in progress) 2018-07-20 15:45:01 +02:00
Stephan
5a1bba8a8d Merge branch 'temp8' into temp8-di2690 2018-07-20 11:31:35 +02:00
Stephan
c7fabf84ba Merge branch origin/temp8 into temp8 2018-07-20 11:01:10 +02:00
Stephan
d7e97ac771 Remove unused CodeAnnotations attributes, obsolete stuff 2018-07-20 10:59:25 +02:00
Stephan
ef7be48cc5 Fix SqlTemplates concurrency 2018-07-20 10:41:22 +02:00
Stephan
9e9a0d301f Cleanup and Refactor 2018-07-20 09:49:05 +02:00
Stephan
e5f09a1420 Fix SqlTemplates concurrency 2018-07-19 15:05:55 +02:00
Shannon
5fdaa451b8 fixes null check on linkpicker changes with anchors, fixes ng-true-value constant value 2018-07-19 22:35:05 +10:00
Stephan
d36ec60039 Fix IPropertyValueConverter determining HasValue 2018-07-19 11:02:51 +02:00
Sebastiaan Janssen
09dd5cf879 Merge pull request #2781 from Mundairson/temp8-U4-11428 
U4-11428 CodeAnnotations classes have inconsistent constructor parameter order
 2018-07-19 09:18:17 +02:00
Mundairson
d7d36c34be Removed empty block comments. 2018-07-18 14:29:10 +01:00
Stephan
fded7db542 Merge branch temp8 into temp8-di 2018-07-18 10:46:42 +02:00
Stephan
6c526b24a0 Post-merge fixes 2018-07-18 10:32:50 +02:00
Shannon
1f1bb37a57 merges lang files 2018-07-18 16:08:38 +10:00
Shannon
959caf4d04 Fixes tests and merging issues, simplifies TabsAndPropertiesResolver since it doesn't need umbracocontext, only the MemberTabsAndPropertiesResolver one does 2018-07-18 15:42:12 +10:00
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
Shannon Deminick
cf6a8956cd Merge pull request #2779 from umbraco/temp8-w112 
Variations with Compositions
 2018-07-18 11:32:59 +10:00
Shannon Deminick
438261beb8 Merge pull request #2780 from umbraco/temp8-w49 
Allow IPropertyValueConverter to determine if a property has value
 2018-07-18 11:28:12 +10:00
Stephan
c7c1c7e8fa Cleanup ISqlSyntaxProvider 2018-07-17 17:20:40 +02:00
Stephan
132b729dd9 Fix nuspec for AutoMapper 2018-07-17 15:51:39 +02:00
Mundairson
9e21a72515 Changed the constructors so the two overloads have the same parameter in the same position. 2018-07-16 22:12:03 +01:00
Mundairson
e17d2fbfc0 Changed the constructors so the two overloads have the same parameter in the same position. 2018-07-16 22:09:03 +01:00
Mundairson
9b5455c186 Changed the constructors so the two overloads have the same parameter in the same position. 2018-07-16 22:06:45 +01:00
Stephan
05317bb5e6 Allow IPropertyValueConverter to determine if a property has value 2018-07-16 19:14:00 +02:00
Stephan
874ec142bf Variations with Compositions 2018-07-16 17:21:26 +02:00
Sebastiaan Janssen
596157f90b Default to section route if not specified 2018-07-16 16:00:05 +02:00
Sebastiaan Janssen
2a080da666 Merge pull request #2603 from mvanhelmont/patch-2 
U4-11275 routPath in custom tree always needs a id
 2018-07-16 15:56:38 +02:00
Stephan
77083f259d WIP 2018-07-16 14:03:41 +02:00
Sebastiaan Janssen
014e50a13a Merge pull request #2148 from LennardF1989/U4-10345 
Added possibilty to ignore collisions from an IContentFinder (U4-10345)
 2018-07-16 13:38:23 +02:00
Sebastiaan Janssen
9fc3dfdbee Merge pull request #2771 from hartviglarsen/temp-U4-11516 
U4-11516 Updates the links in the noNodes splash screen
 2018-07-16 12:03:07 +02:00
Sebastiaan Janssen
a87987e5e9 Merge pull request #2772 from BatJan/features/temp-U4-11495 
U4-11495 - Add border to custom regex in property settings
 2018-07-16 11:06:22 +02:00
Sebastiaan Janssen
dad318834f Merge pull request #2776 from agrath/U4-9309 
U4-9309 When node is copied, copy is logged as writer
 2018-07-16 11:03:17 +02:00
Sebastiaan Janssen
4e099f7509 Merge pull request #2774 from BatJan/features/temp-U4-11519 
U4-11519 - Use the umb-toggle directive in the "Copy" dialog
 2018-07-16 11:00:14 +02:00