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

38 Commits

Author SHA1 Message Date
Stephan
d324466fe1 Fix LockDto, had wrong primary key + missing rows 2018-10-17 15:11:00 +02:00
elitsa
85309e8ce5 Merge branch 'temp8-I3089' of https://github.com/umbraco/Umbraco-CMS into temp8-I3089 2018-10-08 10:23:53 +02:00
elitsa
9ad65e5fa8 Deleting 'Task' related references and implementations 2018-10-08 10:08:04 +02:00
Shannon
b48202197f Merge remote-tracking branch 'origin/temp8' into temp8-I3089 
# Conflicts:
#	src/Umbraco.Web/Trees/DataTypeTreeController.cs
 2018-10-08 09:54:12 +02:00
elitsa
0cc5a01069 packages section is there with translations sections and correct trees 2018-10-05 11:09:33 +02:00
Stephan
8a29745b98 Merge branch temp8 into temp8-11502 2018-10-01 14:45:33 +02:00
Stephan
4ac188f564 Forgot to create languages lock object on install 2018-09-17 12:36:45 +02:00
Stephan
25c87d76b8 Fix merge 2018-09-13 14:59:45 +02:00
Stephan
4cbd0d9178 Remove mandatory constraint on default language 2018-09-12 11:47:04 +02:00
Shannon Deminick
a151829b26 Merge pull request #2845 from umbraco/temp8-serilog 
Bye bye Log4Net, Hello Serilog
 2018-08-28 20:31:12 +10:00
Warren
2a298aaaf5 FIRST PASS - Updates Umbraco.Core project to not use the func overload & to use new message template instead 2018-08-14 15:08:32 +01:00
Shannon
66a00546d1 more work with saving, publishing and validation for variants, fixes up a few old things too 2018-08-14 23:19:32 +10:00
Shannon
122c18e6d7 Merge branch 'temp8' into temp-editing-all-variants 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2018-07-31 15:56:04 +10:00
Shannon
fbc4820ab4 Fixes migrations and updates the api usages for v8, more manual merging of files 2018-07-30 23:23:01 +10:00
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
Shannon
e9752cd5e1 Gets all list views working correctly with content apps, fixes various issues, cleans up a bunch of code and reduces amount of service locator. 2018-07-17 14:23:07 +10:00
Shannon
072c1a6764 WIP - editing all variants at once, this is getting things wired up to display a content item, lots of TODOs added, models and mappings refactored, content apps put in c# model, etc... 2018-07-13 12:45:04 +10:00
Stephan
ecf9a928d7 Refactor variations 2018-07-03 13:05:21 +02:00
Dawid Koruba
7660e10098 Change calls to logger.Info method to use Func<string> parameter 2018-06-29 14:25:17 +02:00
Shannon
4417892337 Removes valToggleMsg directive and replaces all occurances of this with ngMessages, fixes a few smaller things along the way too 2018-06-18 21:40:06 +10:00
Stephan
632e401d33 Implement typed labels 2018-06-04 11:37:19 +02: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
Shannon
1cd4862803 Fixes user Id is 0 everywhere 2018-05-31 16:52:38 +10:00
Shannon
a673babfb7 Fixes Content List View installation, removes unecessary properties from the RecycleBinEventArgs, updates both the upload and image cropper property editors to properly remove all files including any associated with variants, updates several other places to deal with variants and Property.GetValue(langId), adds notes, ensures we are returning the corect IDictionary instead of Dictionary for some interfaces 2018-04-04 13:11:12 +10:00
Stephan
8bfb8e2b72 Port v7@2aa0dfb2c5 - WIP 2018-03-22 11:25:33 +01:00
Stephan
33a24e0e2f Fix the install process 2018-03-21 11:32:07 +01:00
Stephan
39cc7add80 Rename Umbraco.Whatever2 editors 2018-03-19 18:39:34 +01:00
Stephan
dda696bde5 Troubleshoot, fix 2018-03-16 09:11:59 +01:00
Stephan
030c97ef26 Super user is not a Zero 2018-03-02 16:00:15 +01:00
Stephan
97a058b817 DataType refactoring 2018-01-20 12:31:42 +01:00
Stephan
e30d8f79ef DataType refactoring 2018-01-20 12:09:40 +01:00
Stephan
d23933a5b1 DataType refactoring preparation - Entity refactoring 2018-01-15 13:28:35 +01:00
Stephan
af43ea0beb Reorg code, move dtos 2017-12-28 09:06:33 +01:00
Stephan
26f02ea6f2 Migrations refactoring - kill migrations table 2017-12-26 19:58:06 +01:00
Stephan
8c8fac5d52 Migrations refactoring - WIP - plan 2017-12-26 11:37:57 +01:00
Stephan
16c919c1a5 Migrations refactoring - WIP - plan 2017-12-22 16:14:09 +01:00
Stephan
2182b0f18f Migrations refactoring - WIP - move code 2017-12-19 11:00:46 +01:00