yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,996 Commits 4 Branches 7 Tags
20293fb50dafe3d7544f9281215ac7239a06cb54
Commit Graph

7677 Commits

Author SHA1 Message Date
Shannon
7e77cd334d fix merge 2018-07-12 22:57:29 +10:00
Shannon
a8ad55ef3c Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 
# Conflicts:
#	src/Umbraco.Tests/FrontEnd/UmbracoHelperTests.cs
#	src/Umbraco.Web/UmbracoHelper.cs
 2018-07-12 22:41:33 +10:00
Sebastiaan Janssen
39b2e6543c Merge pull request #2757 from Mundairson/temp8-U4-11492 
U4-11492 Clean Umbraco.Web.UmbracoHelper [v8]
 2018-07-11 15:14:27 +02:00
Shannon
92f85fad4a Merging dictionary changes 2018-07-11 16:59:05 +10:00
Shannon
ebe224fb6e Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-07-11 16:43:21 +10:00
Shannon
8521a405f7 manually merging other files 2018-07-11 16:43:09 +10:00
Shannon
13d6dfd234 renames DictionaryTreeController to have the correct file name 2018-07-11 16:42:25 +10: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
Mundairson
85c9e66cee Implemented changes from first PR code review. 2018-07-11 00:12:18 +01:00
Stephan
9ca298543f Merge branch 'hackathon-automapper-update' of https://github.com/mzajkowski/Umbraco-CMS into temp8-2747 2018-07-10 09:37:54 +02:00
Stephan
ad633c7606 Merge branch 'temp8-2758' into temp8 2018-07-10 09:36:28 +02:00
Stephan
47cfe9c6c0 Merge branch 'temp8' into temp8-2758 2018-07-10 09:34:25 +02:00
Shannon Deminick
7132ccdd99 Merge pull request #2760 from umbraco/temp8-variants 
Variants Refactoring [v8]
 2018-07-10 13:05:13 +10:00
Shannon
7250b3d491 Fixes null checks on all parts of VariationContextAccessor.VariationContext.Culture and fixes translations with tokens for url collisions 2018-07-10 12:43:07 +10:00
Stephan
02de09eaf7 Explain last merge 2018-07-09 18:26:15 +02:00
Stephan
7c43fbd0c6 Merge pull request #2761 from mzajkowski/hackathon-publishing 
Removed bulk publishing action from the content tree (temp) [v8hackaton]
 2018-07-09 18:24:43 +02:00
Stephan
6f139cd72a Misc cleanup of PR 2018-07-09 18:08:03 +02:00
Stephan
97d4d48c4d Merge branch 'v8hack-delete-obselete' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp8-2758 2018-07-09 17:35:41 +02:00
Stephan
e644b63ba6 Misc cleanup of PR 2018-07-09 17:29:50 +02:00
Stephan
52be2d7864 Merge branch 'v8hackathon-library-media-remove' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp-2748 2018-07-09 16:34:44 +02:00
Stephan
1f37fb2c67 Merge branch 'v8hackathon-library-delete' of https://github.com/AnthonyCogworks/Umbraco-CMS into temp8-2746 2018-07-09 13:02:25 +02:00
Stephan
00bcef3ba6 Misc cleanup of PR 2018-07-09 12:40:57 +02:00
Stephan
f4983a2b21 Merge branch 'hackathon-remove-imediaserviceoperation' of https://github.com/AndyFelton/Umbraco-CMS into temp8-mediaserviceops 2018-07-09 11:49:56 +02:00
Stephan
fdfdd541e3 Content Url and Audit (in progress) 2018-07-06 12:20:10 +02:00
Stephan
75d685ef43 NuCache - fix parent published 2018-07-05 17:08:40 +02:00
Stephan
0af18b2376 Fix publishing 2018-07-05 17:07:40 +02:00
Stephan
0d3ea107c5 Deal with some FIXME 2018-07-04 10:41:08 +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
a697608529 Fix un/publishing with variants + urls 2018-07-03 13:05:20 +02:00
Stephan
9c3e8b8e3c Fix language inconsistencies management 2018-07-03 13:04:27 +02:00
Marcin Zajkowski
0a168986cb Merge branch 'temp8' into hackathon-automapper-update 2018-07-03 02:04:30 +02:00
Marcin Zajkowski
618897aa3f Merge remote-tracking branch 'origin/temp8' into hackathon-publishing 2018-07-03 01:58:02 +02:00
Anthony
40f04f7510 Fixed unintended whitespace 2018-07-02 10:47:43 +01:00
Anthony
372d0f7c3c Removed files from Umbraco.Web which are not used 2018-07-01 18:06:25 +01:00
Anthony
7affbbd186 Removed obsolete methods from Umbraco.Web which are not used. 2018-07-01 18:06:00 +01:00
Mundairson
7caf7e6a78 Removed unneeded usings. 2018-07-01 11:28:14 +01:00
Mundairson
9f04a9de9c Refactored simple conversion methods. 
Added unit tests to cover the methods.
 2018-07-01 11:27:49 +01:00
Marcin Zajkowski
0e9b7bfccc Republish action removed from the default content tree 2018-06-29 19:55:50 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Stephan
ee87d00ffe Merge branch 'hackathon-obsolete-action-constructors' of https://github.com/ed-parry/Umbraco-CMS into ed-parry-hackathon-obsolete-action-constructors 2018-06-29 16:49:12 +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
Anthony
d38c856923 Removed unused method. 2018-06-29 15:26:05 +01:00
Ed Parry
52b7be0f15 Removed obsolete constructors from actions 2018-06-29 15:01:24 +01:00
lkoruba
b515f24c16 Change calls to logger.Warn method to use Func<string> second part 2018-06-29 15:35:56 +02:00
Andy Felton
c56b983cd6 Merged methods from IMediaService to IMediaServiceOperations 
Moved methods from IMediaServer to IMediaServiceOperations, fixed tests and other code which depends on these.
 2018-06-29 14:18:11 +01: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
Anthony
b3a8161b25 Removed library.cs and it cache settings 2018-06-29 13:56:00 +01:00
Marcin Zajkowski
449b6af70e Updated AutoMapper to the latest (7.0.1) 2018-06-29 14:54:11 +02:00