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

30952 Commits

Author SHA1 Message Date
Bjarke Berg
b2bcdb898e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco/Views/Preview/Index.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Services/IconService.cs
 2020-11-12 09:13:53 +01:00
Sebastiaan Janssen
e42b8b20f4 Merge branch 'v8/8.9' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-11-04 11:30:27 +01:00
Sebastiaan Janssen
466f59c8d4 Bump version to 8.9.1 2020-11-04 11:22:47 +01:00
Sebastiaan Janssen
d7f10ff154 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 11:21:03 +01:00
Sebastiaan Janssen
54ad4c2481 Bump version to 8.8.2 2020-11-04 11:19:32 +01:00
Sebastiaan Janssen
aac35698a1 Merge branch 'v8/8.8' into v8/8.9 2020-11-04 10:07:04 +01:00
Sebastiaan Janssen
bff6ded89d Merge branch 'v8/8.7' into v8/8.8 2020-11-04 09:27:02 +01:00
Sebastiaan Janssen
d4fa37d6fb Merge branch 'v8/8.6' into v8/8.7 2020-11-04 09:25:33 +01:00
Warren Buckley
dbee98bf02 Merge pull request #9258 from umbraco/v8/feature/AB8699-Support-blocks-in-clipboard-service 
Support blocks in backoffice clipboard
 2020-11-03 13:48:07 +00:00
Niels Lyngsø
67367fe111 display an error message if settings does not align. 2020-11-03 13:38:54 +01:00
Bjarke Berg
9cda7d1b5a Fix for https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language and segment into account 
(cherry picked from commit 223b19cbd8)
 2020-11-03 10:22:15 +01:00
Bjarke Berg
223b19cbd8 Fix for https://github.com/umbraco/Umbraco-CMS/pull/9146 - We need to take language and segment into account 2020-11-03 10:20:46 +01:00
Warren Buckley
9c820c7939 Update src/Umbraco.Web.UI.Client/src/common/services/blockeditormodelobject.service.js 2020-11-02 13:37:27 +00:00
Warren Buckley
3a41861aa0 Update src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js 2020-11-02 13:34:34 +00:00
Warren Buckley
99441789d8 Update src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js 2020-11-02 13:30:02 +00:00
Warren Buckley
016f883ee3 Update src/Umbraco.Web.UI.Client/src/common/services/clipboard.service.js 2020-11-02 13:29:27 +00:00
Warren Buckley
d39ca35e8b Merge pull request #9243 from umbraco/v8/feature/umbBlockCard-use-umb-outline 
use umb-outline for umb-block-card
 2020-11-02 12:17:33 +00:00
Warren Buckley
5c6702bd17 Merge pull request #9241 from umbraco/v8/bugfix/umbBlockCard-should-work-without-blockConfiguration 
Make blockConfigModel optional
 2020-11-02 12:06:18 +00:00
Sebastiaan Janssen
b63944b9ef Revert "Adds icons from App_Plugins/**/Icons/*.svg (#8884)" 
This reverts commit d7bf980f12.
 2020-10-25 09:59:44 +01:00
Niels Lyngsø
cb902c4e08 Fail if settings elementType isnt supported + concept for inner-blocks + debounce for storage update 2020-10-23 15:08:27 +02:00
Niels Lyngsø
99e2990d07 Emit event if localStorage changes from another tab 2020-10-22 15:07:45 +02:00
Niels Lyngsø
310c8ec924 finish feature + clean up 2020-10-22 15:02:25 +02:00
Sebastiaan Janssen
b1b540e687 Merge branch 'v8/8.6' into v8/dev 2020-10-22 14:36:10 +02:00
Sebastiaan Janssen
ba6921ce6f Merge branch 'v8/8.7' into v8/8.8 2020-10-22 14:34:00 +02:00
Sebastiaan Janssen
f3e37428ad Merge branch 'v8/8.6' into v8/8.7 2020-10-22 14:29:53 +02:00
Sebastiaan Janssen
9202550537 Remove unused usings 2020-10-22 14:25:57 +02:00
Sebastiaan Janssen
297671b631 Merge branch 'v8/8.8' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Packaging/PackageDataInstallation.cs
 2020-10-22 14:21:25 +02:00
Sebastiaan Janssen
afa754067b Merge branch 'v8/8.7' into v8/dev 2020-10-22 14:18:53 +02:00
Sebastiaan Janssen
befa23190b Merge branch 'v8/8.6' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
 2020-10-22 14:18:21 +02:00
Sebastiaan Janssen
e368607a4d Bump version to 8.8.1 2020-10-22 14:15:57 +02:00
Sebastiaan Janssen
b69e65ab3b Merge branch 'v8/8.7' into v8/8.8 
# Conflicts:
#	src/SolutionInfo.cs
 2020-10-22 14:15:10 +02:00
Sebastiaan Janssen
3bb01e9418 Bump version to 8.7.1 2020-10-22 14:10:19 +02:00
Sebastiaan Janssen
2aefe899e4 Merge branch 'v8/8.6' into v8/8.7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/DocumentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
 2020-10-22 14:08:05 +02:00
Sebastiaan Janssen
843ea1d854 Bump version to 8.6.6 2020-10-22 13:56:15 +02:00
Shannon
22a7f94921 Merge branch 'temp_8879' of https://github.com/dawoe/Umbraco-CMS into v8/contrib 
(cherry picked from commit 069529e9e2)
 2020-10-22 13:52:45 +02:00
Shannon
a6101ce499 Merge branch 'dawoe-temp_8879' into v8/contrib 
(cherry picked from commit 35bf59dee4)
 2020-10-22 13:52:10 +02:00
Sebastiaan Janssen
81cbe365f6 Revert "Revert "Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues (#8198)""" 
This reverts commit c903a01f15.
 2020-10-22 12:33:45 +02:00
Sebastiaan Janssen
f3af025c79 Revert "Takes the last commit from #9216 to make umb-confirm-action backwards compatible" 
This reverts commit 174909d735.
 2020-10-22 12:33:19 +02:00
Niels Lyngsø
3025fbd8b6 further progress, need to switch branch. 2020-10-22 11:16:37 +02:00
Sebastiaan Janssen
094897704c Need null checks for Keys in case packages had been created without keys before 2020-10-22 10:56:49 +02:00
Sebastiaan Janssen
174909d735 Takes the last commit from #9216 to make umb-confirm-action backwards compatible 2020-10-22 10:43:37 +02:00
Sebastiaan Janssen
c903a01f15 Revert "Revert "umb-confirmation directive: move trashcan into directive and address accessibility issues (#8198)"" 
This reverts commit 22a1423324.
 2020-10-22 09:53:02 +02:00
Niels Lyngsø
f3aad86413 updates CSS selector to match latest 
(cherry picked from commit dc6c72c136)
 2020-10-22 09:47:33 +02:00
Niels Lyngsø
dc6c72c136 updates CSS selector to match latest 2020-10-22 09:45:49 +02:00
Niels Lyngsø
24f07af0e1 ability to create from Block Data 2020-10-22 08:35:12 +02:00
Shannon Deminick
88f9be8aa4 Merge pull request #9137 from umbraco/v8/bugfix/non-published-content-is-indexed 
Non-published content indexed in ExternalIndex
 2020-10-22 17:18:23 +11:00
Warren Buckley
f1724a68b2 When exporting package.xml it will now use the UDI/Key so we can reimport with the same key 
(cherry picked from commit 28954afcad)
 2020-10-21 21:04:16 +02:00
Warren Buckley
28954afcad When exporting package.xml it will now use the UDI/Key so we can reimport with the same key 2020-10-21 21:03:31 +02:00
Shannon Deminick
657f1fcdc7 Fixes regression issue with property values being updated in content repositories (#9146) 2020-10-21 20:30:35 +02:00
Niels Lyngsø
6f3333fb4c Merge remote-tracking branch 'origin/v8/bugfix/umbBlockCard-should-work-without-blockConfiguration' into v8/feature/AB8699-Support-blocks-in-clipboard-service 2020-10-21 17:35:10 +02:00