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

9091 Commits

Author SHA1 Message Date
Kenn Jacobsen
f7aaad86c5 Set focus on "Mandatory" after picking a property type when creating a new property 2019-06-21 15:56:36 +02: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
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
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
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
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
Shannon
b0488d2d94 fixes showing the correct create date on content creation 2019-06-17 16:50:56 +10: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
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
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
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
Shannon
7ba4c2f353 revert overlay.service 2019-06-12 01:04:52 +10:00
Shannon
0381c55ce7 reverts some parts of the content editor 2019-06-12 01:01:09 +10:00
Shannon
88d9e3321c Don't do a redirect on create for content, instead we do a 'soft redirect' which means the URL is updated but the route isn't changed which simplifies re-wiring everything up (will eventually do for all editors) 2019-06-12 00:39:12 +10:00
Niels Lyngsø
05f479a58f changed root folder to only contain the URI for root, not including /Umbraco/ 2019-06-11 14:14:44 +02:00
Shannon
e6a8ba84aa starts re-binding the variant dialogs on create for the content editor (WIP - will probably revert and try a different approach) 2019-06-11 21:47:45 +10:00
Niels Lyngsø
5ddf21f09f remove bold from lists of language variants 2019-06-11 10:03:04 +02:00
Niels Lyngsø
7b3ab72105 remove bold from default variant. 2019-06-11 09:48:45 +02:00
Shannon
120f4c3096 removes scope.busy callls (legacy old stuff), add ability to preserve editor state between routes, for content we now preserve editor state when redirecting to new content and then rebind some values from that editor state when the editor loads, updates editorstate.service and filemanager.service to manage themselves on route change (decoupling), fixes variant mapper to ensure that the variants are always returned in a deterministic order. 2019-06-11 16:31:32 +10:00
Kenn Jacobsen
580de6befe Linkpicker should support anchor links without base URL 2019-06-07 09:03:35 +02:00
Shannon
9f346e6ee2 fixes valServer directive so that JS errors dont' occur on the content tyep editor 2019-06-07 13:01:58 +10:00
Shannon
3ea9504620 Revert "Don't show multiple open menus" 
This reverts commit 661246b5f5.
 2019-06-07 13:01:13 +10:00
Shannon
6d12eea789 Adds unit tests for serverValidationManager and fixes it up to ensure that the correct culture callbacks are called. 2019-06-07 12:16:00 +10:00
Shannon
68174bc7df Merge branch 'v8/dev' into v8/bugfix/5190-invariant-property-validation 2019-06-07 11:21:36 +10:00
Sébastien Sougnez
4be6a48fb2 Update tinymce version to 4.9.4 in v7 (#4703) 2019-06-06 17:42:12 +02:00
Shannon Deminick
04967143d8 Merge pull request #5598 from kjac/v8-fix-content-type-culture-variance 
V8: Fix broken culture variance toggle on content type properties
 2019-06-06 17:33:17 +10:00
Kenn Jacobsen
70fb48d94a Fix broken culture variance toggle on content type properties 2019-06-06 08:39:21 +02:00
Kenn Jacobsen
1565ff1661 Fix JS error when the RTE has unconfigured dimensions 2019-06-06 08:04:06 +02:00
Shannon Deminick
73e907291b Merge pull request #5568 from umbraco/v8/bugfix/5565-rte-sizing 
5565 fix for configuration of TineMCE size
 2019-06-05 16:07:55 +10:00
Shannon
49c76c744e Fixes width/height for when in distraction free mode 2019-06-05 16:06:55 +10:00
Shannon
8967061758 fixes semi colons 2019-06-05 15:21:00 +10:00