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

23056 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
a5bbf3d832 add will-change css property to prepare browser for the animations 2018-05-03 20:04:34 +02:00
Mads Rasmussen
101d92ca2d speed up animation 2018-05-03 20:03:05 +02:00
Mads Rasmussen
677bf71a94 make icon picker as infinite editor 2018-05-03 16:11:32 +02:00
Mads Rasmussen
e2478e5cd4 move new editors to infinite editor folder 2018-05-03 14:43:22 +02:00
Mads Rasmussen
c4027898cb fix validation in property settings dialog 2018-05-03 14:21:43 +02:00
Mads Rasmussen
2704111497 move indent value to a variable 2018-05-03 13:44:07 +02:00
Mads Rasmussen
1fc0b32fc2 submit property settings editor on enter 2018-05-03 10:55:27 +02:00
Mads Rasmussen
11a4040da7 remove unused umb-overlay component 2018-05-03 10:54:51 +02:00
Mads Rasmussen
329f90922c remove old content type overlays 2018-05-03 10:30:06 +02:00
Mads Rasmussen
4eca4ac291 use infinite editing in content type editors instead of overlays 2018-05-03 10:19:14 +02:00
Mads Rasmussen
c308b081a1 start on docs for editorService 2018-05-01 20:21:48 +02:00
Mads Rasmussen
6c77313a82 remove background color on modal footer 2018-05-01 17:12:40 +02:00
Mads Rasmussen
7c42d29eb0 remove margin on actions 2018-05-01 17:11:54 +02:00
Mads Rasmussen
e3754fb62f remove indentation code from the editorService 2018-05-01 15:33:14 +02:00
Mads Rasmussen
db2d75c3f5 temp remove animations 2018-05-01 15:31:03 +02:00
Mads Rasmussen
c71d00cd7e wip closing editors 2018-04-25 17:55:27 +02:00
Mads Rasmussen
ef3b3326fc always take up all available space when editor is not the last opened one 2018-04-25 14:44:20 +02:00
Mads Rasmussen
79f303ddcf wip animation experiments 2018-04-25 10:29:18 +02:00
Mads Rasmussen
7e383ea961 fix issue with infinite mode and create route param in media editor 2018-04-23 11:13:01 +02:00
Mads Rasmussen
312b2ff435 Merge branch 'dev-v8' into temp-U4-11218 2018-04-23 09:43:22 +02:00
Shannon
6b12fe7c57 Merge branch 'dev-v8' of https://github.com/umbraco/Umbraco-CMS into dev-v8 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
 2018-04-20 00:10:44 +10:00
Shannon
04da7cfd20 doh, fixes csproj merge 2018-04-20 00:09:12 +10:00
Shannon
d5ebe12983 removes ununsed aliases 2018-04-20 00:05:45 +10:00
Stephan
5d1abaa713 Import missing parameter editor from v7 merge 2018-04-19 16:03:54 +02:00
Shannon
e9e0274ad8 fixes MultipleContentPickerParameterEditor 2018-04-20 00:03:19 +10:00
Shannon
c46d4e9e43 Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
#	src/Umbraco.Core/Persistence/PetaPoco.cs
#	src/Umbraco.Core/Scoping/NoScope.cs
#	src/Umbraco.Core/Scoping/ScopeProvider.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/IContentService.cs
#	src/Umbraco.Tests/Persistence/Migrations/MigrationStartupHandlerTests.cs
#	src/Umbraco.Tests/UI/LegacyDialogTests.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
#	src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ClickJackingCheck.cs
#	src/Umbraco.Web/HealthCheck/Checks/Security/ExcessiveHeadersCheck.cs
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDisplayConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyDtoConverter.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyModelMapper.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ParameterEditors/MultipleContentPickerParameterEditor.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
 2018-04-19 23:41:35 +10:00
Mads Rasmussen
ee853f0189 Merge branch 'dev-v8' into temp-U4-11218 2018-04-19 15:15:10 +02:00
Shannon
1d0d6e78de fixes tree again 2018-04-19 22:32:48 +10:00
Shannon
642ce36f59 updates when the tree does it's initialization , fixes migration 2018-04-19 21:58:59 +10:00
Shannon Deminick
db5ffd6b29 Merge pull request #2594 from umbraco/temp8-U4-11128 
Manage content variations [U4-11128]
 2018-04-19 21:49:13 +10:00
Robert
9384cd0f27 Merge pull request #2574 from umbraco/temp-U4-11195 
fixes U4-11195 Mapping complex properties slow down some queries
 2018-04-19 12:22:12 +02:00
Robert
0262b4aa76 Changed ContentPropertyDto modifier back to override which rendered content with tags unable to be saved 2018-04-19 12:10:39 +02:00
Shannon
158eb18de0 Merge remote-tracking branch 'origin/dev-v8' into temp8-U4-11128 2018-04-19 18:16:49 +10:00
Mads Rasmussen
03ac073c02 Merge branch 'dev-v8' into temp-U4-11218 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
 2018-04-19 09:59:31 +02:00
Sebastiaan Janssen
96761efe4d Merge branch 'patch-v7' into dev-v7 2018-04-19 09:55:16 +02:00
Robert
8e02aad2bb Merge pull request #2590 from umbraco/temp-U4-11177 
U4-11177 Update tree nodes with the new node names based on variant/language
 2018-04-19 08:35:01 +02:00
Shannon
75fb070825 U4-11246 When user belongs to groups and none of them have browse access and one or more have a custom start node applied a YSOD occurs 2018-04-19 16:20:18 +10:00
Shannon Deminick
8a0f32e980 Merge pull request #2595 from umbraco/temp-U4-11208 
U4-11208 Error : "An item with the same key has already been added." into "Umbraco.Core.Services.IdkMap.Populate" method
 2018-04-19 15:27:00 +10:00
Stephan
a68e37c67b Fix availability and names 2018-04-18 18:43:17 +02:00
Stephan
dea47dfafe Fix availability and names 2018-04-18 18:28:47 +02:00
Sebastiaan Janssen
f5163ed0c2 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-04-18 16:05:43 +02:00
Sebastiaan Janssen
694f3d71e2 Merge branch 'patch-v7' into dev-v7 2018-04-18 16:05:15 +02:00
Stephan
5b1bdd84ee Fix availability and content name (WIP) 2018-04-18 16:04:33 +02:00
Robert
15eb40aedb Removed code that populates content tree with duplicate start nodes. 2018-04-18 16:01:01 +02:00
Sebastiaan Janssen
49251271e9 Merge pull request #2591 from umbraco/temp-U4-10995 
Removed code that populates content tree with duplicate start nodes.
 2018-04-18 15:59:45 +02:00
Sebastiaan Janssen
cc3e75dc63 U4-11208 Error : "An item with the same key has already been added." into "Umbraco.Core.Services.IdkMap.Populate" method 2018-04-18 15:14:16 +02:00
Stephan
4f17ecbdee Fix tests 2018-04-18 14:43:13 +02:00
Stephan
ec7b038569 Variant names, availability, etc 2018-04-18 14:43:07 +02:00
Stephan
d4244d3807 Fix faster languages 2018-04-18 14:42:20 +02:00
Sebastiaan Janssen
eeaf17c857 Weird revert of a PR that was merged in before 
(cherry picked from commit 94ed741dd5)
 2018-04-18 12:18:44 +02:00