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

33566 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nikolaj
f82a4c19cb Wait for content to be refreshed and switch order of rollback 2020-09-10 09:30:07 +02:00
Nikolaj
a4abfd4962 Add Content with contentpicker test and bump helpers version 2020-09-10 08:52:18 +02:00
Bjarke Berg
96f8dd2103 Merge pull request #8622 from umbraco/v8/feature/AB7482-acceptance-tests-for-content 
Acceptance tests for Content
 2020-09-09 13:28:48 +02:00
Bjarke Berg
f58e1e8edb Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7482-acceptance-tests-for-content 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 13:14:20 +02:00
Sebastiaan Janssen
1f44b94ef6 Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/test/config/karma.conf.js
 2020-09-09 12:52:42 +02:00
Sebastiaan Janssen
0662284f29 Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 12:48:28 +02:00
Bjarke Berg
6e25885804 Simplified the drag and drop 2020-09-09 10:29:41 +02:00
Bjarke Berg
b4b7bb438d updated version of testhelpers 2020-09-09 07:51:05 +02:00
Bjarke Berg
7641b8da54 Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/AB7482-acceptance-tests-for-content 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-09-09 07:46:35 +02:00
Bjarke Berg
34c09ce12d Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7482-acceptance-tests-for-content 2020-09-08 21:05:58 +02:00
Sebastiaan Janssen
ecff24089c Bump version to 8.7.0 2020-09-08 14:46:22 +02:00
Bjarke Berg
bef8cb9589 Added old ctor to avoid a breaking change 2020-09-08 14:32:09 +02:00
Warren Buckley
c3d69df27b Merge pull request #8842 from umbraco/v8/bugfix/block-list-copying 
Ensure new UDIs for blocks when copying
 2020-09-08 11:19:18 +01:00
Ronald Barendse
ddc922a583 8.7RC Add generic BlockListItem classes (#8841) 
(cherry picked from commit 5faa9ae22f)
 2020-09-08 12:11:14 +02:00
Ronald Barendse
5faa9ae22f 8.7RC Add generic BlockListItem classes (#8841) 2020-09-08 12:08:27 +02:00
Claus
f20920167a Merge pull request #8844 from umbraco/v8/bugfix/remove-blocklistextensions 
V8.7RC: Removing extensions for GetBlockListHtml on IPublishedContent
 2020-09-08 10:46:06 +02:00
Claus
bb30b17fe2 removing duplicated extension methods that could encourage bad practice when used in the wrong way. 
(cherry picked from commit 11e42c0a56)
 2020-09-08 10:37:35 +02:00
Claus
11e42c0a56 removing duplicated extension methods that could encourage bad practice when used in the wrong way. 2020-09-08 10:36:35 +02:00
Claus
3d385cc1db Merge pull request #8767 from umbraco/v8/bugfix/return-IHtmlString-from-GetBlockListHtml 
V8/bugfix/return IHtmlString from GetBlockListHtml

(cherry picked from commit 46b4b22dcd)
 2020-09-08 10:05:39 +02:00
Shannon
6e2576fb0d Ensure the component runs and don't replace UDIs on saving since its not necessary 2020-09-08 11:47:31 +10:00
Shannon
98bda6759e Adds more tests, cleans up tests 2020-09-08 11:25:37 +10:00
Shannon
56dd39bb1a cleanup 2020-09-08 02:09:05 +10:00
Shannon
a2c24bcc76 Gets copying logic working for the block editor, needs more tests though 2020-09-08 02:07:02 +10:00
Warren Buckley
a7a560aa26 Merge pull request #8809 from umbraco/v8/bugfix/8801-resolvers-should-be-registred-for-specific-clipboard-entry-types 
V8.7RC: Clipboard resolvers should target specific entry types
 2020-09-07 14:43:36 +01:00
Niels Lyngsø
40d13bfb2f V8.7RC Show Blocks that does not have a BlockConfiguration as Unsupported Bl… (#8786) 2020-09-07 12:33:58 +02:00
Bjarne Fyrstenborg
86d105dcf3 Checkboxlist and radiobuttonlist validation (#8833) 
(cherry picked from commit 4782560f2f)
 2020-09-07 10:47:36 +02:00
Bjarne Fyrstenborg
4782560f2f Checkboxlist and radiobuttonlist validation (#8833) 2020-09-07 10:46:03 +02:00
Niels Lyngsø
3f99972ebb if user discards a new block it should be removed. 2020-09-07 09:20:15 +02:00
Elitsa Marinovska
d8732e55a6 Updates package to future latest with necessary changes 2020-09-06 17:08:36 +02:00
Elitsa Marinovska
cab6bbb44d Refactoring for using API for saving content 2020-09-06 17:00:50 +02:00
Elitsa Marinovska
ce0d73725b Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB7482-acceptance-tests-for-content 2020-09-06 16:38:50 +02:00
Claus
46b4b22dcd Merge pull request #8767 from umbraco/v8/bugfix/return-IHtmlString-from-GetBlockListHtml 
V8/bugfix/return IHtmlString from GetBlockListHtml
 2020-09-04 13:55:45 +02:00
Sebastiaan Janssen
fa4809a288 Merge pull request #8783 from umbraco/v8/bugfix/8723-do-not-always-hide-menu 
Should not call hideDialog
 2020-09-04 13:49:13 +02:00
Sebastiaan Janssen
f19c3728fa Merge pull request #8744 from umbraco/v8/bugfix/block-list-custom-view-validation-error-indication 
V8.7RC: Moved validation indication one element up.
 2020-09-04 13:46:10 +02:00
Sebastiaan Janssen
e7ac6a614a Switch from the Chrome runner to JSDom (#8800) 
(cherry picked from commit 4313463a94)
 2020-09-04 13:39:50 +02:00
Niels Lyngsø
b56b15437d Only request getCount if user has access to settings 2020-09-04 13:30:14 +02:00
Niels Lyngsø
330c113da2 append property editor api methods to the block object for better developer experience. 2020-09-04 13:24:36 +02:00
Niels Lyngsø
028b9ec59b change to use evalAsync() 2020-09-04 13:21:04 +02:00
Kenn Jacobsen
455344105d Hide the Nested Content "add content" header when there are items in the clipboard 2020-09-04 11:31:06 +02:00
Kenn Jacobsen
0720e3bb30 Fix broken Nested Content "add content" dialog 2020-09-04 11:24:17 +02:00
Sebastiaan Janssen
a0fbffa2c2 Ignoring package-lock.json from now on, seems not needed. 
Motivation: the only "benefit" I keep seeing is: you will know when dependencies has changed version.
But since we lock our dependencies down quite well in package.json already and we have never even had a problem with a package updating "on it's own" so I don't think it's really needed.
The only thing that updates on it's own is whatever dependencies our dependencies drag along with them, but the main js packages that we ship with are always pinned down to a version we know we want to ship with so that won't be a problem.
 2020-09-04 10:38:16 +02:00
Kenn Jacobsen
e7ad346d93 Fix JS error when creating macros and relation types 
(cherry picked from commit a5e4633377)
 2020-09-04 10:11:28 +02:00
Kenn Jacobsen
a5e4633377 Fix JS error when creating macros and relation types 2020-09-04 10:08:03 +02:00
M. Ali Iftikhar
db9d15e1b5 added escape character to server textbox placeholder on installer DB config page 2020-09-04 09:50:08 +02:00
Ronald Barendse
02fba85f73 Update config comments and fix transforms (#8808) 2020-09-04 09:36:28 +02:00
Ronald Barendse
d5933a154c Use correct woff and woff2 MIME types 2020-09-04 09:32:33 +02:00
Niels Lyngsø
208edfc3a2 rename pasteTypeResolvers to clipboardTypeResolvers. as its not specific to paste, but clipboard. 2020-09-03 21:36:30 +02:00
Niels Lyngsø
906f3eac2f putting the attributes right 2020-09-03 14:41:23 +02:00
Niels Lyngsø
46488836f4 Changed clipboardService property resolvers to be specific for clipboard-entry-types 2020-09-03 14:37:51 +02:00
Sebastiaan Janssen
2681c76d90 Fix the test result output to go to a file, not a weird directory (because the default user agent contained slashes causing windows to make directories for them) 2020-09-03 11:34:12 +02:00