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

29815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bjarke Berg
832dc7f4a5 Changed superadmin back to admin again 2019-06-18 18:44:22 +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
Bjarke Berg
9614740410 Added timeout for 2 seconds. Dont make sense to wait longer for this 2019-06-18 11:44:56 +02:00
Stephan
62e6168e03 Revert ContentStore changes - have to find the bug now 2019-06-18 11:36:53 +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
Stephan
067af64dff Cleanup ChildrenForAllCultures 2019-06-18 09:46:29 +02:00
Bjarke Berg
cb428bb288 https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1447: Catch the SoapException which happends when a timeout occurs on the server. Also change such that this check is only executed for super admins. 2019-06-18 08:11:18 +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
Shannon
fecadeec51 Fixes issue with nucache and rebuilding and fixes ChildrenForAllCultures to deal with unpublished children 2019-06-18 11:57:36 +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
Stephan
7c11943836 Merge remote-tracking branch 'origin/v8/feature/5170-IPublishedContent' into v8/feature/5170-IPublishedContent 2019-06-17 13:24:28 +02:00
Stephan
94d2a5cbad Bugfix published cache and children 2019-06-17 13:03:01 +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
Bjarke Berg
46f4984add https://umbraco.visualstudio.com/D-Team%20Tracker/_workitems/edit/1357: Fixed issue where too fast change between sections, leads to a wrong tree (The first requested) shown in the menu. 2019-06-17 07:20:11 +02:00
Bjarke Berg
e39e132feb Cleaned up, such that we are not in doubt about whether the page variable should have been increased. 2019-06-17 07:19:38 +02: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
Bjarke Berg
cc4a7653e5 Bugfix: Still load trees even when a tree is about to be loaded. But only use the result, if we are still on the correct section. This eliminates the issue where a wrong tree is shown in a section. 2019-06-12 14:31:01 +02:00
Bjarke Berg
5b546cc425 Bugfix: Don't increase the page number in the loop, because the items are moved to another subtree, and therefore is not any longer part of the descendants call. Now we avoid the leak of items when moving to recycle bin. 2019-06-12 10:39:34 +02: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
Stephan
9c252131f7 Better exception message in NuCache 2019-06-12 08:55:03 +02:00