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

29675 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
f6ac64f705 makes TreeChangeExtensions public 2019-06-20 15:53:25 +10:00
Shannon
fcfb107653 Fixes up UmbracoContextFactory to ensure it's not returning a disposed Umbraco context 2019-06-20 15:40:57 +10:00
Niels Lyngsø
23702ee4dc Fixes notifications issue for new variant saving, allows "soft redirect" for creating (#5646) 
Fixes notifications issue for new variant saving, allows "soft redirect" for creating
 2019-06-19 12:34:33 +02:00
Shannon
c7a725ad94 Merge remote-tracking branch 'origin/v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
 2019-06-19 13:38:35 +10:00
Shannon
5c6a9480a6 remove unneeded method 2019-06-19 13:32:26 +10:00
Shannon
c1be8e3f00 Merge branch 'v7/dev' of https://github.com/umbraco/Umbraco-CMS into v7/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
 2019-06-19 13:31:43 +10:00
Shannon
d8dbda8e94 Merge branch 'kjac-v7-fix-treepicker-allowed-nodes' into v7/dev 2019-06-19 13:30:33 +10:00
Shannon
a0ab7ace07 Makes the treeNodeExpanded event raised during tree syncing 2019-06-19 13:29:54 +10:00
Shannon
7c27189e2e Merge branch 'v7-fix-treepicker-allowed-nodes' of https://github.com/kjac/Umbraco-CMS into kjac-v7-fix-treepicker-allowed-nodes 2019-06-19 13:01:50 +10:00
Shannon
76cbfdb787 ignores a failing test, will need a separate task for that. 2019-06-19 12:31:36 +10:00
Sebastiaan Janssen
56545ad7f1 Revert "Merge branch 'v7/dev' into v8/dev" 
This reverts commit 7db0440b5c.

# Conflicts:
#	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/propertyeditors/rte/rte.prevalues.html
#	src/Umbraco.Web/WebApi/Filters/EnsureUserPermissionForContentAttribute.cs
 2019-06-18 19:18:48 +02:00
Warren Buckley
62dc68e7b2 Merge pull request #5401 from umbraco/v8/feature/logviewer-change-time-period 
Added support for changing the dates of the log files
 2019-06-18 15:09:16 +01:00
Bjarke Berg
348c79d841 Init preflight check 2019-06-18 15:19:27 +02:00
Sebastiaan Janssen
994c6eed50 Revert "U4 10147 - Bypass User Security option in pickers (#2441)" 
This reverts commit cc9a7ff942.

# Conflicts:
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
 2019-06-18 13:07:40 +02:00
Warren Buckley
b6d762c279 Merge pull request #5683 from umbraco/v8/bugfix/5600-rte-full-screen 
Fixes #5600 Adds fullscreen plugin/command to the RTE and allows it to sit in front of the tree when used
 2019-06-18 10:12:03 +01:00
Bjarke Berg
ab93c4ff2d clean up 2019-06-18 11:02:43 +02:00
Bjarke Berg
473c39f7c4 Still being able to change date period if the period has too much data 2019-06-18 10:53:00 +02:00
Bjarke Berg
811aea7898 Added missing files 2019-06-18 10:27:56 +02:00
Bjarke Berg
07358eb46d Merge remote-tracking branch 'origin/v8/dev' into v8/feature/logviewer-change-time-period 
# Conflicts:
#	src/Umbraco.Core/Logging/Viewer/JsonLogViewer.cs
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-06-18 10:20:48 +02:00
Shannon
b69c981100 Fixes #5600 Adds fullscreen plugin/command to the RTE and allows it to sit in front of the tree when used 2019-06-18 16:02:36 +10:00
Shannon
1709879b14 Merge remote-tracking branch 'origin/v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
 2019-06-18 14:15:50 +10:00
Shannon
cff5046a9e Merge branch 'kjac-v7-fix-linkpicker-anchor-link-without-url' into v7/dev 2019-06-18 14:09:11 +10:00
Shannon
9f6da2ca4b Merge branch 'v7-fix-linkpicker-anchor-link-without-url' of https://github.com/kjac/Umbraco-CMS into kjac-v7-fix-linkpicker-anchor-link-without-url 2019-06-18 14:08:45 +10:00
Shannon Deminick
0c8b0edcda Merge pull request #5472 from umbraco/v8/feature/5123-rte-data-udi-images 
RTE data-udi and image paths
 2019-06-18 13:40:20 +10:00
Shannon
68f9e89a32 Merge branch 'v8/dev' into v8/feature/5123-rte-data-udi-images 2019-06-18 13:05:37 +10:00
Warren Buckley
d3b675a213 Merge pull request #5640 from umbraco/v8/feature/0000-dont-mark-default-language 
Remove bold from default variant.
 2019-06-17 13:39:28 +01:00
Warren Buckley
316ab6becb Merge pull request #5536 from umbraco/v8/bugfix/5345-dragging-rte-in-grid 
5345 dragging rte in grid
 2019-06-17 13:15:39 +01:00
Bjarke Berg
9a45bda430 Merge pull request #5658 from umbraco/v8/bugfix/3498-EntityService-updates 
V8/bugfix/3498 entity service updates
 2019-06-17 13:37:58 +02:00
Bjarke Berg
99cabe564d Merge pull request #5673 from umbraco/v7/bugfix/5665-non-admin-edit-user-group 
V7: Resolved issue where adding non-admin user group editor to group already exists
 2019-06-17 09:13:42 +02:00
Shannon
b0488d2d94 fixes showing the correct create date on content creation 2019-06-17 16:50:56 +10:00
Bjarke Berg
600c8ebbbf Merge pull request #5670 from AndyButland/defect/5665-non-admin-edit-user-group 
V8: Resolved issue where adding non-admin user group editor to group already exists
 2019-06-17 08:48:38 +02:00
Shannon
3bf43d7ce3 adds a unit test showing that the SimilarNodeName is broken. 2019-06-17 16:48:35 +10:00
Andy Butland
15b1d35c17 https://github.com/umbraco/Umbraco-CMS/issues/5665: Resolved issue where adding non-admin user group editor to group already exists 2019-06-17 08:43:24 +02:00
Shannon
872db5877f fixes the color of the variant state after publishing and switching to the info tab 2019-06-17 16:33:20 +10:00
Shannon
977c1d9585 fixes JS error when navigating to the content info tab 2019-06-17 16:23:38 +10:00
Andy Butland
17b479275e Resolved issue where adding non-admin user group editor to group already exists 2019-06-16 12:20:52 +02:00
Shannon
9927ff3c86 removes commented out code 2019-06-13 23:47:48 +10:00
Shannon
81077c2681 Gets the entity service returning a media's url property and allows this to be used in the media picker. 2019-06-13 23:39:36 +10:00
Niels Lyngsø
f4593778cb updated package lock 2019-06-13 12:31:29 +02:00
Shannon
16f6bbcbd4 init commit of removing code for entity service that loads in any property data 2019-06-13 18:45:33 +10:00
Warren Buckley
c597da8f97 Merge pull request #5423 from umbraco/v7/bugfix/4144-member-password-manual-change-fix 
Fixes #4144 - AllowManuallyChangingPassword Regression Fix
 2019-06-13 08:53:17 +01:00
Shannon
5775a8b614 fixes if explicitly resetting password 2019-06-13 16:50:15 +10:00
Sebastiaan Janssen
7f5f304d2d Merge pull request #5642 from umbraco/v8/feature/0000-Gulp-root-folder-as-real-root 
Gulp root variable change
 2019-06-12 10:25:13 +02:00
Niels Lyngsø
0827ced915 removed App_Plugins 2019-06-12 09:43:59 +02:00
Shannon
c5347a97ce Fixes setting the reset flag when allowManuallyChangingPassword is disabled 2019-06-12 12:51:26 +10:00
Shannon
8a19cd4bbc Fixes content blueprint creation 2019-06-12 12:22:14 +10:00
Shannon
2797011fb0 Ensures there's no duplicate notifications and ensures that soft redirects occur for content blueprints too 2019-06-12 11:34:36 +10:00
Shannon
1307ee7ced some cleanup 2019-06-12 10:36:52 +10:00
Shannon
e0059f1fad adds notes 2019-06-12 10:35:21 +10:00
Shannon
fd5b5b67bf Fixes notifications for invariant content publishing 2019-06-12 10:11:27 +10:00