Shannon
|
a83ea47c25
|
Merge remote-tracking branch 'origin/dev-v7' into temp8
# Conflicts:
# build/NuSpecs/tools/Web.config.install.xdt
# src/Umbraco.Core/Constants-Conventions.cs
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/Models/Rdbms/LanguageDto.cs
# src/Umbraco.Core/Models/Rdbms/RelationTypeDto.cs
# src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
# src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
# src/Umbraco.Core/PropertyEditors/PreValueField.cs
# src/Umbraco.Core/PropertyEditors/SupportTagsAttribute.cs
# src/Umbraco.Core/Services/FileService.cs
# src/Umbraco.Core/Services/IFileService.cs
# src/Umbraco.Core/Strategies/RelateOnTrashHandler.cs
# src/Umbraco.Tests/App.config
# src/Umbraco.Tests/Persistence/Repositories/RelationTypeRepositoryTest.cs
# src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbcontentnodeinfo.directive.js
# src/Umbraco.Web.UI.Client/src/common/directives/components/umbgridselector.directive.js
# src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
# src/Umbraco.Web.UI.Client/src/less/belle.less
# src/Umbraco.Web.UI.Client/src/less/components/application/umb-drawer.less
# src/Umbraco.Web.UI.Client/src/less/components/umb-grid.less
# src/Umbraco.Web.UI.Client/src/less/hacks.less
# src/Umbraco.Web.UI.Client/src/less/property-editors.less
# src/Umbraco.Web.UI.Client/src/less/variables.less
# src/Umbraco.Web.UI.Client/src/views/common/dialogs/insertmacro.controller.js
# src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html
# src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
# src/Umbraco.Web.UI.Client/src/views/components/umb-grid-selector.html
# src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
# src/Umbraco.Web.UI.Client/src/views/documenttypes/views/templates/templates.html
# src/Umbraco.Web.UI.Client/src/views/media/move.html
# src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/colorpicker/colorpicker.prevalues.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/fileupload/fileupload.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.controller.js
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/multipletextbox/multipletextbox.html
# 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/Views/Web.config
# src/Umbraco.Web.UI/umbraco/Install/Views/Web.config
# 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/nl.xml
# src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
# src/Umbraco.Web.UI/web.Template.Debug.config
# src/Umbraco.Web.UI/web.Template.config
# src/Umbraco.Web/Editors/TemplateController.cs
# src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
# src/Umbraco.Web/Models/ContentEditing/PreValueFieldDisplay.cs
# src/Umbraco.Web/PropertyEditors/ColorListPreValueEditor.cs
# src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
# src/Umbraco.Web/PropertyEditors/ValueListPreValueEditor.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ApplicationTreeExtensions.cs
# src/Umbraco.Web/Trees/MediaTreeController.cs
# src/umbraco.MacroEngines/Resources/Web.config
# src/umbraco.cms/Actions/ActionRestore.cs
# src/umbraco.editorControls/yesno/YesNoDataType.cs
|
2018-07-30 21:31:35 +10:00 |
|
Stephan
|
c7c1c7e8fa
|
Cleanup ISqlSyntaxProvider
|
2018-07-17 17:20:40 +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 |
|
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
|
9c3e8b8e3c
|
Fix language inconsistencies management
|
2018-07-03 13:04:27 +02:00 |
|
Stephan
|
c2cfdfd746
|
Merge branch 'convert-model-factories-to-static-classes' of https://github.com/ismailmayat/Umbraco-CMS into ismailmayat-convert-model-factories-to-static-classes
|
2018-06-29 16:54:09 +02:00 |
|
Ismail Mayat
|
f40af21e55
|
make static again needs another pair of eyes to ensure nothing has been broken
|
2018-06-29 15:31:14 +01:00 |
|
Ismail Mayat
|
3c27f95397
|
make static
|
2018-06-29 15:31:14 +01:00 |
|
Ismail Mayat
|
79ce8a29ae
|
made static, however this has been refactored will need extra sanity checking to ensure nothing has been broken
|
2018-06-29 15:31:13 +01:00 |
|
Lotte Pitcher
|
2a532e6993
|
Making DictionaryTranslationFactory static and callers
|
2018-06-29 15:31:13 +01:00 |
|
Ismail Mayat
|
9e16d92c99
|
tasktype now static
|
2018-06-29 15:31:13 +01:00 |
|
Ismail Mayat
|
aca08a8021
|
taskfactory now static updated callers
|
2018-06-29 15:31:12 +01:00 |
|
Ismail Mayat
|
4f4dc922e0
|
server registration now static
|
2018-06-29 15:31:12 +01:00 |
|
Ismail Mayat
|
69a103ce3d
|
make static update callers
|
2018-06-29 15:31:12 +01:00 |
|
Ismail Mayat
|
53adf532d1
|
make membertype static
|
2018-06-29 15:31:11 +01:00 |
|
Ismail Mayat
|
3c8a870dfa
|
membergroup made static
|
2018-06-29 15:31:11 +01:00 |
|
Ismail Mayat
|
de2322e384
|
another class and its callers made static
|
2018-06-29 15:31:11 +01:00 |
|
Ismail Mayat
|
2c9b128daf
|
make static
|
2018-06-29 15:31:11 +01:00 |
|
Ismail Mayat
|
cfca39274f
|
make static and update calling methods
|
2018-06-29 15:31:10 +01:00 |
|
Ismail Mayat
|
59f67ffd19
|
fix this call
|
2018-06-29 15:31:10 +01:00 |
|
Ismail Mayat
|
427d4e4655
|
update calls to the old factory which is now static
|
2018-06-29 15:31:10 +01:00 |
|
lkoruba
|
7e4f2957a3
|
Change calls to logger.Warn method to use Func<string> parameter
|
2018-06-29 14:53:41 +02:00 |
|
Shannon
|
545360bdaa
|
fixes order by on list view
|
2018-06-18 22:48:28 +10:00 |
|
Stephan
|
e4fafd55c8
|
Fix tests - but we have to fix variant names
|
2018-06-08 10:49:51 +02:00 |
|
Stephan
|
bc06d7b20c
|
Adjust SqlTemplate usage in DomainRepository
|
2018-06-05 16:02:37 +02:00 |
|
Shannon
|
504b6cb079
|
Changes Content.Names to Content.CultureNames and Content.PublishNames to Content.PublishCultureNames
|
2018-06-01 16:15:46 +10:00 |
|
Shannon
|
90e6769169
|
adds check for EnsureUniqueNaming
|
2018-06-01 16:04:20 +10:00 |
|
Shannon
|
fd3e6f4d9c
|
turns out there's no need for the full table name, the sql generator figures this out
|
2018-06-01 15:52:55 +10:00 |
|
Shannon
|
3cfd9c5b00
|
ensures the unique name check is not performed against itself
|
2018-06-01 15:51:45 +10: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 Deminick
|
6c0c59f731
|
Merge pull request #2660 from umbraco/temp8-user-unknown
Ensures referential integrity for all FKs to umbracoUser but supports NULL entries
|
2018-06-01 11:53:14 +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
|
b5f0bc7234
|
creates a user 0 for unknown to keep ref integrity
|
2018-05-31 21:21:08 +10:00 |
|
Stephan
|
00c62804a8
|
U4-11202 - Fix deadlock in UserRepository
|
2018-05-30 10:44:33 +02:00 |
|
Shannon
|
9c1451ecd3
|
Fixes LanguageRepository for deleting a lang, updates UrlProvider to have consistent method parameter order, updates UmbracoHelper to have culture params for getting URLs
|
2018-05-09 12:50:34 +10:00 |
|
Shannon
|
ee9f150483
|
Removes the AdditionalData properties for EntitySlim and moves them to real properties of IDocumentEntitySlim, renames PublishedCultureInfos to not be plural
|
2018-05-08 12:43:07 +10:00 |
|
Shannon
|
85c739aed4
|
Merge branch 'temp8-U4-11227' into temp8-U4-11282
# Conflicts:
# src/Umbraco.Core/Models/ContentBase.cs
# src/Umbraco.Core/Persistence/Repositories/Implement/EntityRepository.cs
# src/Umbraco.Tests/Services/EntityServiceTests.cs
# src/Umbraco.Web/PublishedCache/NuCache/ContentCache.cs
# src/Umbraco.Web/PublishedContentExtensions.cs
# src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
|
2018-05-08 12:31:03 +10:00 |
|
Stephan
|
3f73452bc7
|
Various fixes, and U4-11287
|
2018-05-07 18:51:18 +02:00 |
|
Shannon
|
b1eeb5b193
|
Merge remote-tracking branch 'origin/temp8' into temp8-U4-11282
|
2018-05-08 00:39:12 +10:00 |
|
Shannon
|
5a991c9424
|
Fixes Publishing/Unpublishing variants and it's nuances
|
2018-05-07 23:22:52 +10:00 |
|
Stephan
|
b35d28c568
|
Merge branch temp8 into temp8-U4-11227
|
2018-05-03 15:12:42 +02:00 |
|
Stephan
|
bcf46eceb6
|
Cleanup, get rid of warnings
|
2018-05-03 15:11:52 +02:00 |
|
Stephan
|
aaa1ac0700
|
Merge branch temp8 into temp8-U4-11227
|
2018-05-02 17:50:58 +02:00 |
|
Stephan
|
93adda2e4a
|
Cleanup
|
2018-05-02 17:44:14 +02:00 |
|
Stephan
|
a5f1ad6da1
|
Merge branch temp8 into temp8-U4-11227
|
2018-05-02 13:43:12 +02:00 |
|
Shannon
|
6fe9c4d4df
|
Fixes the null PublishName problem, ensures the quey strings are not replaced when selecting a doc type
|
2018-05-02 15:35:26 +10:00 |
|
Shannon
|
9843f3a5fd
|
Ensures that domains assigned to non-published nodes are filtered when routing, ensures caches are cleared when content is deleted or langauges are changed, updates logic for dealing with null invariant content names, adds more validation for saving cultre variants.
|
2018-05-02 14:52:00 +10:00 |
|
Shannon
|
be4ea93d12
|
U4-11289 Tracking the currently selected language in the main tree
|
2018-05-01 18:17:07 +10:00 |
|