yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,575 Commits 4 Branches 7 Tags
71fbf2769ae977f07782d322cb6fa42b3ff31d30
Commit Graph

854 Commits

Author SHA1 Message Date
mattchanner
bcea0f645a Added null check on raw JSON to prevent null reference error deserializing the grid 2020-04-09 16:46:57 +02:00
Benjamin Carleski
9f7c44c64e 7879: Handle for multiple picked media relations 2020-04-09 16:45:51 +02:00
Joe Delly
2ec0861051 Fix for exception throw when validating URLs (#7701) 2020-03-24 18:35:11 +01:00
Sebastiaan Janssen
b42883280b Merge branch 'v8/dev' into v8/contrib 2020-02-25 22:36:33 +01:00
Warren Buckley
4ed69d21a0 Merge branch 'v8/8.6' up into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
 2020-02-24 15:11:58 +00:00
Benjamin Carleski
c63af8e161 Merge pull request #7616 from umbraco/temp-7538-image-url-generator 
Introduce Image URL Generator abstraction
 2020-02-11 10:30:48 -08:00
Benjamin Carleski
4309489174 Make changes for PR suggestions 2020-02-09 11:12:29 -08:00
Benjamin Carleski
a7ff20de6e Introduce Image URL Generator abstraction 2020-02-07 15:01:03 -08:00
Shannon
3d0543922a un-breaks ctor 2020-02-03 22:48:00 +11:00
Steve Temple
a8672790d3 Obsolete Url on IPublishedContent 2020-02-01 13:38:14 +00:00
Poornima Nayar
df8f281141 Merge pull request #7045 from ronaldbarendse/v8/bugfix/nested-content-defaultpropertyvalueconverters 
Add DefaultPropertyValueConverterAttribute to core Nested Content PropertyValueConverters
 2020-01-23 11:26:13 +00:00
Warren Buckley
81a0a52874 Merge branch 'v8/feature/media-tracking' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-01-22 08:36:32 +00:00
Shannon
4cf204f8f5 Merge branch 'v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 13:40:16 +11:00
Kenn Jacobsen
2906eafa79 V8: Make it possible to hide anchor/querystring input in the li… (#7031) 
Wonderful work
 2020-01-10 19:14:11 +00:00
joepvtl
2908ecac64 7058 NullOrEmpty check to fix Grid in NestedContent (#7080) 2020-01-07 17:31:25 +01:00
Warren Buckley
ad53b76308 Merge branch 'v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-03 11:59:05 +00:00
Shannon
000a8d2c94 manually merges changes for the NC validation stuff since there was conflicts 2019-12-18 15:37:00 +11:00
Shannon
a1769dd937 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Models/RelationType.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-18 15:28:27 +11:00
Shannon
1d61bc829c Merge branch 'v8/dev' into v8/fix/6324-wrong-media-path-stored 2019-12-18 12:10:00 +11:00
Niels Lyngsø
de712cd89d Adds HideLabel for Rich Text Editor prevalue property 2019-12-03 09:47:27 +01:00
Warren Buckley
e1e5ac44cc Something gone funky/awol with my commits - remove dupe code :S 2019-12-02 15:35:13 +00:00
Warren Buckley
958eb82213 Move the GetReferences about (back to where it was) 2019-12-02 15:23:56 +00:00
Warren Buckley
1471bffeff Adds DataValueReferenceFor & its collection 2019-12-02 15:00:56 +00:00
Warren Buckley
645a30a8aa Adds new ValueReference classes and update to Interface for IsForEditor method to check if we should get references for a specific dataeditor based on its alias 2019-11-27 20:24:16 +00:00
Kenn Jacobsen
9ae05b5b15 V8: Update the descriptions of the Nested Content configuration… (#7224) 
* Update the descriptions of the Nested Content configuration options
* Reduced the amount of words for further readability
 2019-11-27 13:40:25 +01:00
Andy Butland
12fa862ee6 Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-11-19 11:53:33 +01:00
Ronald Barendse
17c7f5c05f Mark Nested Content PVCs as default 2019-11-01 22:56:47 +01:00
Shannon
d1ea46ff71 fixes null ref check and returning the correct deserialized val, adds comments 2019-11-01 14:45:05 +11:00
Shannon
717c185e45 Manually merges prev changes to nested content from 6768 and 6826 and changes how the prop values are iterated 2019-11-01 14:22:49 +11:00
Shannon
595b36c5df Merge remote-tracking branch 'origin/v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
 2019-11-01 13:27:13 +11:00
Shannon
3d66c201c2 Adds safety check of Udi.TryParse 2019-10-31 14:08:38 +11:00
Rasmus John Pedersen
26f1e77813 Resolve media paths from data editors 
# Conflicts:
#	src/Umbraco.Core/Persistence/Factories/ContentBaseFactory.cs
#	src/Umbraco.Core/Persistence/Repositories/Implement/MediaRepository.cs
 2019-10-30 21:58:54 +01:00
Rasmus John Pedersen
0e0f6e6678 Ensure media path stored is the same as stored in the property 2019-10-30 21:58:54 +01:00
Søren Kottal
eb81aae3e9 remove text saying open button on content picker is in preview 2019-10-30 15:16:10 +00:00
Bjarke Berg
f305dd45cb AB3328 - Fixed two bugs - One if links was absolute and not references, and one if the value was empty string. 2019-10-30 08:50:15 +01:00
Shannon
12cb370578 Reduces statics, reduces code duplication for iterating over properties in the NC prop editor 2019-10-30 17:14:04 +11:00
Andy Butland
66b709653a Added custom FormatValidator for the MultipleTextStringPropertyEditor to validate each text string individually against the configured regular expression. 2019-10-29 20:22:08 +01:00
Bjarke Berg
34a0210d9d AB3329 - Handle empty strings from nested content 2019-10-29 08:53:00 +01:00
Bjarke Berg
8d4de3de55 AB3326 - Handle empty strings from nested content 2019-10-29 08:52:47 +01:00
Bjarke Berg
5ddc961df3 AB3327 - Nested Content references 2019-10-29 08:52:02 +01:00
Bjarke Berg
0aaee0baba AB3328 - Multi Url Picker references 2019-10-28 14:11:59 +01:00
Bjarke Berg
c8b189d53d AB3326 - Made MediaPickerPropertyValueEditor nested and internal and handle null values 2019-10-28 13:58:23 +01:00
Bjarke Berg
f2e02ea05e AB3329 - Added Content picker references 2019-10-28 13:57:55 +01:00
Bjarke Berg
35ebc13774 AB3331 - Added MNTP references 2019-10-28 13:25:05 +01:00
Bjarke Berg
80643ac6ad AB3325 - Added Grid references 2019-10-28 13:11:33 +01:00
Bjarke Berg
c52adf76f7 AB3226 - Added MediaPicker references 2019-10-28 12:56:54 +01:00
Bjarke Berg
5699dc32b7 AB2462 - Find the relation type from the entity type on the udi 2019-10-28 12:53:37 +01:00
Shannon
70ccee302d Renames/moves some stuff and adds test to show auto relation tracking 2019-10-25 15:08:56 +11:00
Shannon
25c2eed888 Ensures the right type is tracked for links ensures relations are removed. 2019-10-25 14:33:40 +11:00
Kenn Jacobsen
ce6a217577 Performance boost for Nested Content: Don't load all content types all the time. 2019-10-24 21:56:47 +02:00