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

30268 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniël Knippers
aa4677e1dd Added and updated unit tests for the ValidateVariation method 2019-09-19 14:52:05 +02:00
Daniël Knippers
82c3af51fe Fixes writing / reading segment data combined with segment null 2019-08-27 15:43:07 +02:00
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
Warren Buckley
d86db3fc11 Merge pull request #6182 from umbraco/v8/bugfix/2180-secure-svg-preview 
Secure svg media files preview - v8
 2019-08-23 11:06:20 +00:00
elitsa
ac4128d89e Add special checks and preview for svg files media files for v8 2019-08-23 10:42:00 +02:00
Steve Megson
11f2855442 Move CreateRoutes from WebFinalComponent to WebInitialComponent 2019-08-23 09:11:41 +02:00
Kenn Jacobsen
d09be604d9 Allow plugin "Lang" folders to reside in nested directories 2019-08-23 08:56:42 +02:00
Sebastiaan Janssen
d8355c368f Too many weird versions 2019-08-22 23:40:24 +02:00
stevemegson
703092c12c V8: Fix caching of macro results in RTE (#6010) 
(cherry picked from commit 9b212121e3)
 2019-08-22 23:37:06 +02:00
stevemegson
9b212121e3 V8: Fix caching of macro results in RTE (#6010) 2019-08-22 23:34:33 +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
320cc48132 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
 2019-08-22 22:44:05 +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
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
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
Sebastiaan Janssen
ffd5d61f9f Merge branch 'v7/7.15' into v7/dev 2019-08-21 15:25:54 +02:00
Lars-Erik Aabech
5b1f2ef95d V7: Fixes #6132, dates being blanked out on save/publish when user locale (momen… (#6138) 2019-08-21 15:21:31 +02:00
Sebastiaan Janssen
08c3b6bff5 Fix unit tests 
(cherry picked from commit 82e11d7e0a)
 2019-08-21 13:02:57 +01:00
Sebastiaan Janssen
ccc2a0e811 Fix #5335 - Multiple Media Picker not available as macro parameter 
(cherry picked from commit 1f2c4e38ac)
 2019-08-21 13:02:36 +01:00
Warren Buckley
445e6d41b7 Merge pull request #6149 from umbraco/v8/feature/5335-multi-media-picker-parameter-editor 
Fix #5335 - Multiple Media Picker not available as macro parameter
 2019-08-21 11:15:41 +00:00
Sebastiaan Janssen
82e11d7e0a Fix unit tests 2019-08-21 12:45:06 +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
3325627fd2 Merge pull request #6137 from umbraco/v7/bugfix/2180-secure-svg-preview 
Secure svg media files preview
 2019-08-21 10:07:08 +00:00
Warren Buckley
bec54a0467 Remove unecessary change 2019-08-20 11:28:29 +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
a95360036d Pre-loading this lang JS file does not seem to help Tiny as it does not check its already loaded & it reloads itself anyway (But the plugins work all fine & are checked by Tiny to see if they have been loaded) 2019-08-20 11:12:20 +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
0daa80efa4 Undo some of the changes as we will load it via assetService in the angular main controller & fixes the double load issue 2019-08-20 11:01:45 +01:00
Sebastiaan Janssen
1f2c4e38ac Fix #5335 - Multiple Media Picker not available as macro parameter 2019-08-19 16:01:03 +02: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
Shannon Deminick
7ef7b23e93 Merge pull request #6121 from umbraco/v8/bugfix/5804-migration-fix 
Fixes: v8.1 migration from v7 results in an error due to a unique index on cmsContent #5804
 2019-08-16 16:20:24 +10:00
Shannon
6e1314ae30 Removing legacy service 2019-08-16 15:58:13 +10:00
Shannon Deminick
75ff3b26c1 Merge pull request #6125 from umbraco/v7/bugfix/2179-remove-legacy-web-service 
Removing legacy service
 2019-08-16 15:49:50 +10:00
Shannon
505b541040 Removing the MiniProfiler routes if solution is not in debug mode. 2019-08-16 15:39:46 +10:00