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

11252 Commits

Author SHA1 Message Date
Bjarke Berg
7d8c9ee4c9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-09-15 09:35:57 +02:00
Bjarke Berg
c9243d9d61 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-09-15 09:35:05 +02:00
Bjarne Fyrstenborg
600ae926d4 Remove local function to create guid and use String.CreateGuid() extension function instead (#8886) 2020-09-13 22:21:30 +02:00
Bjarke Berg
fc054e6546 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Tests/TestHelpers/TestObjects.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs
#	src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
#	src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs
#	src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/installer/steps/database.html
#	src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less
#	src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html
#	src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html
#	src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html
#	src/Umbraco.Web.UI.Client/src/views/dictionary/list.html
#	src/Umbraco.Web.UI.Client/src/views/logViewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
#	src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
#	src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/DictionaryController.cs
#	src/Umbraco.Web/Editors/LogController.cs
#	src/Umbraco.Web/Editors/MediaTypeController.cs
#	src/Umbraco.Web/Editors/MemberGroupController.cs
 2020-09-09 19:13:37 +02:00
Bjarke Berg
d14e2a99bc Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Core/ContentExtensions.cs
#	src/Umbraco.Infrastructure/Intall/InstallHelper.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockEditorModel.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockItemData.cs
#	src/Umbraco.Infrastructure/Models/Blocks/BlockListLayoutReference.cs
#	src/Umbraco.Infrastructure/Models/Mapping/CommonMapper.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockEditorPropertyEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/BlockListConfigurationEditor.cs
#	src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Tests/PropertyEditors/BlockListPropertyValueConverterTests.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web/Compose/NestedContentPropertyComponent.cs
 2020-09-09 14:16:46 +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
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
Bjarke Berg
13ad1e0a88 remove hardcoded version number 
Signed-off-by: berg <mail@bergmania.dk>
 2020-09-04 20:12:49 +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
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
Mole
e412653a10 Merge pull request #8736 from umbraco/v8/bugfix/block-list-recreate-udis-on-paste 
V8.7RC: Recreate UDIs for pasted Block Editor entries
 2020-09-03 11:33:44 +02:00
Niels Lyngsø
1a35017d8f AC7976 dont place runtime vars in model (#8807) 2020-09-03 11:09:17 +02:00
Sebastiaan Janssen
4313463a94 Switch from the Chrome runner to JSDom (#8800) 2020-09-03 10:36:58 +02:00
Niels Lyngsø
055d1179a1 To prevent issues of combining Nested Content with Block Editors, plus nudging Devs to use Block List instead, we now prevent the usage of NC in BL. 2020-09-03 10:16:21 +02:00
Sebastiaan Janssen
94c2d5c7ef Merge branch 'v8/dev' into v8/contrib 2020-09-03 09:42:16 +02:00
Sebastiaan Janssen
eebe061cb6 Merge branch 'v8/8.6' into v8/dev 2020-09-03 09:41:31 +02:00
Nathan Woulfe
823a81aacc Merge pull request #8713 from umbraco/nul800sebastiaan-patch-1 
Adding `display: none;` prevents `ng-show` from working

(cherry picked from commit 7b1f7ced3a)
 2020-09-03 09:40:47 +02:00
BatJan
1e2c1e821a Convert a to button 2020-09-03 00:01:29 +02:00
BatJan
2a10c5294a Fix semantics + fix focus on umb-checkmark directive 2020-09-02 19:32:33 +02:00
BatJan
4e32ddc5b3 Convert a to button and fix some margin from the search box to the pickable items 2020-09-02 19:26:11 +02:00
BatJan
337ed84e47 Convert a to button and remove wrapping span element 2020-09-02 19:13:56 +02:00
Bjarne Fyrstenborg
e1d6357806 Spectrum colorpicker v2 (#8784) 2020-09-02 19:10:22 +02:00
Bjarne Fyrstenborg
0aa1f9ea7b Create more unique id for radiobutton list when using splitview and where two properties on each culture has same alias 
(cherry picked from commit 124415e413)
 2020-09-02 19:06:14 +02:00
Bjarne Fyrstenborg
124415e413 Create more unique id for radiobutton list when using splitview and where two properties on each culture has same alias 2020-09-02 19:05:06 +02:00
Kenn Jacobsen
31e69ad1e2 Guard compareArrays filter against invalid arguments 
(cherry picked from commit a542bd4bd2)
 2020-09-02 15:43:07 +02:00
Kenn Jacobsen
a542bd4bd2 Guard compareArrays filter against invalid arguments 2020-09-02 15:41:50 +02:00
Sebastiaan Janssen
10281cb0e6 Merge branch 'v8/dev' into v8/contrib 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
 2020-09-02 14:23:40 +02:00
Sebastiaan Janssen
79ac19bff8 Merge branch 'v8/8.7' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html
#	src/Umbraco.Web.UI.Client/src/views/datatypes/delete.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/logviewer/search.html
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/packages/edit.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/dropdownFlexible/dropdownFlexible.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.prevalues.html
 2020-09-02 10:14:10 +02:00
Niels Lyngsø
392918c136 no need to hideDialog as thats already begin done by the other methods 2020-09-01 11:33:57 +02:00
Bjarne Fyrstenborg
9d4536a607 Update to nouislider v14.6.1 
(cherry picked from commit ed59b22b6c)
 2020-08-31 22:34:24 +02:00
Bjarne Fyrstenborg
ed59b22b6c Update to nouislider v14.6.1 2020-08-31 22:33:09 +02:00