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

9278 Commits

Author SHA1 Message Date
Steve Megson
88349c6b66 Sorting of images in multiple media picker 
(cherry picked from commit ed5effd190)
 2019-08-08 16:02:35 +02:00
Steve Megson
ed5effd190 Sorting of images in multiple media picker 2019-08-08 16:00:21 +02:00
Warren Buckley
c6671f7f8e Apply same loading bar UI to Grid RTE & use editor INIT to hide/remove it 2019-08-08 12:35:39 +01:00
Warren Buckley
44c966bd44 Moves our Umbraco angular loader component to only hide itself once the tinymce editor has initialized 2019-08-08 11:37:18 +01:00
Kenn Jacobsen
beacc5bba8 Fix broken button to open content type from create dialog 
(cherry picked from commit 57e58c6cf7)
 2019-08-08 10:05:33 +02:00
Kenn Jacobsen
57e58c6cf7 Fix broken button to open content type from create dialog 2019-08-08 10:03:47 +02:00
leekelleher
7ffe0398f9 DocType Editor sorting - vertical direction 
In the DocType Editor, when sorting the groups and properties,
the draggable direction is freeform (horizontal, vertical or even
diagonal).

We can restrict the direction, by setting the `axis` property in
the sort options.
 2019-08-07 20:55:35 +02:00
Kenn Jacobsen
ce5b3531e0 Make content types with description look ok in the create dialog (#5752) 
(cherry picked from commit b3497011e8)
 2019-08-07 20:50:08 +02:00
Kenn Jacobsen
b3497011e8 Make content types with description look ok in the create dialog (#5752) 2019-08-07 20:49:14 +02:00
Søren Gregersen
a398881fa1 fix: spelling error in comment :) 
infinie error(s) fixed
 2019-08-07 20:38:37 +02:00
Sebastiaan Janssen
a9a5d00916 Merge pull request #5999 from kjac/v8-fix-allow-remove-user-start-nodes 
V8: Allow removing user start nodes
(cherry picked from commit 2cf3a7831c)
 2019-08-07 20:25:44 +02:00
Sebastiaan Janssen
2cf3a7831c Merge pull request #5999 from kjac/v8-fix-allow-remove-user-start-nodes 
V8: Allow removing user start nodes
 2019-08-07 20:19:48 +02:00
Gopakumar R
62a71f8052 Fix for issue #5816 (#5836) 
(cherry picked from commit 0138091a6c)
 2019-08-07 20:16:50 +02:00
Gopakumar R
0138091a6c Fix for issue #5816 (#5836) 2019-08-07 20:16:18 +02:00
Kenn Jacobsen
36eccb472c Fix the create context menu overflows introduced with 405e9a79 (#5754) 
(cherry picked from commit 6c0fb2f849)
 2019-08-07 19:58:13 +02:00
Kenn Jacobsen
6c0fb2f849 Fix the create context menu overflows introduced with 405e9a79 (#5754) 2019-08-07 19:56:30 +02:00
Shannon
6d3faf91d8 fixes spacing with ext login providers 2019-08-05 13:50:50 +10:00
Kenn Jacobsen
0ab84fc443 Allow removing user start nodes 2019-07-25 10:28:16 +02:00
Shannon
efd6bd82bd Revert "V8: Don't show multiple open menus (take two) (#5609)" 
This reverts commit 9ce996cbba.

(cherry picked from commit 1d49c8626e)
 2019-07-24 12:02:41 +02:00
Shannon
4fa523db43 Merge branch 'v7/7.15' into v7/dev 2019-07-24 19:23:58 +10:00
Kenn Jacobsen
342b2087e9 Make sure save options are up to date with the content state 
(cherry picked from commit 8a43e3a87e)
 2019-07-24 10:59:01 +02:00
Kenn Jacobsen
8a43e3a87e Make sure save options are up to date with the content state 2019-07-24 10:46:00 +02:00
Shannon
27223738c6 Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
 2019-07-23 19:05:06 +10:00
Shannon
21218b0332 Merge remote-tracking branch 'origin/v7/7.15' into v8/8.1 
# Conflicts:
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/media.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/editors/rte.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/relatedlinks/relatedlinks.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
 2019-07-22 13:59:14 +10:00
Shannon
6148ce4e52 oops no es6 support in 7.x 2019-07-22 13:41:26 +10:00
Shannon
0320a56cb5 Fixes up dataTypeId var declarations 2019-07-22 13:27:51 +10:00
Warren Buckley
47dcd37d1d Merge pull request #5784 from nathanwoulfe/5768-log-viewer-chart-naming 
V8: Make log naming and colors consistent between Log Search and Log Overview
 2019-07-15 11:47:20 +01:00
Shannon
da525513a3 Merge remote-tracking branch 'origin/v7/dev' into v8/dev 
# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/UmbracoHelper.cs
 2019-07-15 16:18:04 +10:00
Bjarne Fyrstenborg
7c03fe3c1f Adjust parameter 2019-07-13 14:49:35 +02:00
Bjarne Fyrstenborg
1073e6257c Adjust comments 2019-07-13 14:48:35 +02:00
Nathan Woulfe
bc3e4847fe Merge branch '5768-log-viewer-chart-naming' of https://github.com/nathanwoulfe/umbraco-cms into 5768-log-viewer-chart-naming 2019-07-13 13:50:21 +10:00
Nathan Woulfe
1a7251909c fix empty array - was checking index against empty array, so condition was never met 2019-07-13 13:45:13 +10:00
Warren Buckley
bdd413f9ee Merge branch 'v8/dev' into 5768-log-viewer-chart-naming 2019-07-12 12:30:32 +01:00
Warren Buckley
fdd9aee773 Fixes LogViewer Error Count search result clickthrough to include errors & fatal without exception as well 2019-07-12 11:07:15 +01:00
Bjarke Berg
59bf24c461 Added null checks when *.dataTypeId is used 2019-07-12 11:22:31 +02:00
Nathan Woulfe
3c2a92d3b6 map log values into logtypedata array - removes need to add these in the correct order. 2019-07-12 14:21:28 +10:00
Shannon
1d49c8626e Revert "V8: Don't show multiple open menus (take two) (#5609)" 
This reverts commit 9ce996cbba.
 2019-07-12 11:23:36 +10:00
Nathan Woulfe
3144b51c91 fix behaviour on page load - don't add active class if sticky-bar is in viewport 2019-07-09 10:49:34 +10:00
Nathan Woulfe
e92f68d040 improve variable naming 2019-07-09 10:46:29 +10:00
Nathan Woulfe
469054e9b3 No longer need scrollable-container attribute 2019-07-09 10:46:29 +10:00
Nathan Woulfe
d17022d87d make it look pretty 2019-07-09 10:46:29 +10:00
Nathan Woulfe
6865629090 use position:sticky and IntersectionObserver instead of element cloning and position:fixed - much simpler. 2019-07-09 10:46:29 +10:00
Claus
78735ff349 Merge pull request #5798 from kjac/v8-fix-save-member 
V8: Can't save members without resetting their password
 2019-07-08 09:29:37 +02:00
Kenn Jacobsen
80d7f1b2c9 Make it possible to save a member without resetting the password 2019-07-07 11:36:26 +02:00
Kenn Jacobsen
1af43498d9 Make it possible to save a member without resetting the password 2019-07-07 11:16:02 +02:00
Nathan Woulfe
6329dfa629 Merge Andy's changes 2019-07-06 07:28:32 +10:00
Andy Butland
2cd0173534 Fixed incorrect label for "Fatal" errors on the log viewer pie chart. 
Made the log viewer title variable so it either says "Log Overview For Today" or "Log Overview For Selected Time Period" (previously it said the former even if you'd adjusted the dates you were looking at.
Fixed up the selected date period display so the conjunction "to" is used between the dates when the selected time period is changed and querystring is updated.
Minor code tidy-up.
 2019-07-04 14:35:06 +02:00
Nathan Woulfe
a0bcfeddcc fix date range formatting on flatpickr - 'to' wasnt displayed after choosing a range 2019-07-04 11:48:02 +10:00
Nathan Woulfe
c4b5483d8c make log naming and colors consistent between views 2019-07-04 11:19:10 +10:00
Bjarke Berg
c5f1cc15fd Refactored dataTypeId when a guid into dataTypeKey 2019-07-03 08:33:30 +02:00