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

9578 Commits

Author SHA1 Message Date
Warren Buckley
727c32843c Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-08-27 11:53:52 +01:00
Warren Buckley
78a63b20c7 Merge pull request #6120 from umbraco/v8/bugfix/6099-member-password-reset 
Fixes: Member password reset checkbox doesn't hide "new" and "confirm" password fields. #6099
 2019-08-27 10:48:27 +00:00
Claus
c3e99205de fixed typo. 2019-08-26 13:29:54 +02:00
Claus
66ba6f51da Merge pull request #6147 from umbraco/v8/feature/2196-improve-tiny-load 
Improve JS Asset load of TinyMCE Editor
 2019-08-26 13:25:34 +02:00
elitsa
8625c8da43 Add special checks and preview for svg files media files for v8 
(cherry picked from commit ac4128d89e)
 2019-08-23 12:08:03 +01:00
elitsa
ac4128d89e Add special checks and preview for svg files media files for v8 2019-08-23 10:42:00 +02:00
Sebastiaan Janssen
88145d70fc Update nestedcontent.editor.html 
forgot the "property-" prefix.

(cherry picked from commit 0aaf284f7f)
(cherry picked from commit d2649e9354)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
(cherry picked from commit ac6e399847)
 2019-08-22 22:46:11 +02:00
Sebastiaan Janssen
ac6e399847 Update nestedcontent.editor.html 
forgot the "property-" prefix.

(cherry picked from commit 0aaf284f7f)
(cherry picked from commit d2649e9354)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
 2019-08-22 22:43:17 +02:00
Sebastiaan Janssen
d2649e9354 Update nestedcontent.editor.html 
forgot the "property-" prefix.

(cherry picked from commit 0aaf284f7f)
 2019-08-22 22:31:36 +02:00
B. Gunnarsson
0aaf284f7f Update nestedcontent.editor.html 
forgot the "property-" prefix.
 2019-08-22 22:21:43 +02:00
Brynjólfur Gunnarsson
a21c9420b1 added data element to nestedcontent.editor.html, tested it and it works" 2019-08-22 22:21:43 +02:00
Sebastiaan Janssen
b396cc340c Cherry pick - Added trck by $index to handle duplicate names in blueprints 2019-08-22 22:06:57 +02:00
Sebastiaan Janssen
4b9ce6bb10 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DateTimeExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/content/create.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web/Profiling/WebProfilerProvider.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2019-08-22 22:05:14 +02:00
Nik
55d0ca2557 Added trck by $index to handle duplicate names in blueprints 
(cherry picked from commit d57ebf021c)
 2019-08-22 21:51:58 +02:00
Nik
d57ebf021c Added trck by $index to handle duplicate names in blueprints 2019-08-22 21:46:38 +02:00
Kenn Jacobsen
a2899b21b6 Don't crash the linkpicker if only an anchor has been entered 
(cherry picked from commit 1089b4b9bb)
 2019-08-22 21:35:17 +02:00
Kenn Jacobsen
1089b4b9bb Don't crash the linkpicker if only an anchor has been entered 2019-08-22 21:04:12 +02:00
Tobias Klika
2428af3c40 Ability to distinguish document types with same name in Nested Content config (#6092) 2019-08-22 10:46:28 +02:00
Elitsa Marinovska
2cc5256c00 Fixed typo in "ng-container" 
(cherry picked from commit 7a7adfb61f)
 2019-08-21 11:09:41 +01:00
elitsa
6f83d3c865 Add special checks and preview for svg files media files. 
(cherry picked from commit defcb727f9)
 2019-08-21 11:09:19 +01:00
Warren Buckley
4fc265275b Fix up unit test for RTE, it was failing as I added the Angular app.value for tinyMceAssets - this ensures we add an empty array of tinymce assets 2019-08-20 11:28:02 +01:00
Warren Buckley
6873c12f04 Update to main controller to load in the TinyMCE assets - assetsService deals with de-duping already loaded assets 2019-08-20 11:11:29 +01:00
Warren Buckley
b9b4721295 * Adds TinyMCE JS assets into init page load via script in default.cshtml view for Umbraco backoffice ng-app 
* Add TinyMCE JS assets array via NG app.value & uses assetsService to load (if not loaded in time by main init script above)
 2019-08-19 14:36:56 +01:00
Elitsa Marinovska
7a7adfb61f Fixed typo in "ng-container" 2019-08-17 23:54:49 +02:00
elitsa
defcb727f9 Add special checks and preview for svg files media files. 2019-08-16 13:34:25 +02:00
Bjarne Fyrstenborg
e4f19f7192 v8: Add umbLoader directive (#4987) 2019-08-16 11:52:34 +02:00
Kenn Jacobsen
0e565ddbf8 Make sure treepicker URLs are displayed for the current editor culture 
(cherry picked from commit 438133ae1f)
 2019-08-16 08:44:54 +02:00
Kenn Jacobsen
438133ae1f Make sure treepicker URLs are displayed for the current editor culture 2019-08-16 08:43:31 +02:00
Kenn Jacobsen
65b2d08997 Set media picker dirty when the value changes 
(cherry picked from commit 2b7154622e)
 2019-08-15 21:12:57 +02:00
Kenn Jacobsen
2b7154622e Set media picker dirty when the value changes 2019-08-15 21:12:12 +02:00
Bjarne Fyrstenborg
0baf5eab0a v8: Rename datetime picker component (#6110) 2019-08-15 21:09:58 +02:00
Kenn Jacobsen
f8409be506 Use an Umbraco confirm dialog when deleting groups 
(cherry picked from commit f1f9e1742e)
 2019-08-15 21:05:04 +02:00
Kenn Jacobsen
f1f9e1742e Use an Umbraco confirm dialog when deleting groups 2019-08-15 21:04:33 +02:00
Kenn Jacobsen
455395154a Don't reuse previously used content templates 
(cherry picked from commit 3087eff147)
 2019-08-15 21:01:45 +02:00
Kenn Jacobsen
3087eff147 Don't reuse previously used content templates 2019-08-15 21:00:22 +02:00
Kenn Jacobsen
7e8364eae4 V8: Support mixed element variance in Nested Content (#5952) 
(cherry picked from commit e7a9ee8142)
 2019-08-15 13:27:50 +02:00
Kenn Jacobsen
e7a9ee8142 V8: Support mixed element variance in Nested Content (#5952) 2019-08-15 13:10:17 +02:00
Jan Skovgaard
617fd9ab17 Accessibility: Open Package - Identifies back button as "Left h… (#5930) 2019-08-14 17:47:13 +02:00
Jan Skovgaard
fe6df58e66 Accessibility: Media uploader widget can't be accessed via keyb… (#5944) 2019-08-14 17:40:52 +02:00
Jan Skovgaard
6bd647f8c6 Accessibility: Unable to navigate to close 'X' icon with keyboa… (#5964) 2019-08-14 17:29:26 +02:00
Jan Skovgaard
8d0df6cec3 Accessibility: Open User Details - Back icon arrow is identifie… (#5970) 2019-08-14 17:21:56 +02:00
Jan Skovgaard
5997e0ce8c Accessibility: Ensure "cancel" is clickable from move/restore d… (#5942) 2019-08-14 17:11:02 +02:00
Kenn Jacobsen
8bdd694a12 V8: Make sure to mark the current form as dirty when altering content types (#6108) 2019-08-14 16:55:32 +02:00
Shannon
4e17463eb8 Merge branch 'v8/8.1' into v8/dev 2019-08-14 12:52:07 +10:00
Shannon
df391c86f3 Fixes re-syncing member and media data after saving 2019-08-14 12:45:39 +10:00
Shannon
67f0a65811 Merge branch 'v8/8.1' into v8/bugfix/6099-member-password-reset 2019-08-14 12:30:02 +10:00
Shannon
9d77114d50 fixes gulp build for dev purposes - no fastdev since there's no need for it, removes inlining templates when not in prod 2019-08-14 12:28:28 +10:00
Shannon
d2be30a228 converting to component 2019-08-14 12:26:49 +10:00
Shannon
9ed1101f27 whitespace changes 2019-08-14 11:16:24 +10:00
Shannon
db6714d3b8 Merge remote-tracking branch 'origin/v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Search/ExamineComponent.cs
 2019-08-14 10:39:15 +10:00