swcs/Archetype
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
546 Commits 14 Branches 42 Tags
d7477eaf6d20417833efd2580dcb91d05c19f1ad
Commit Graph

546 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
leekelleher d7477eaf6d Moved the ArchetypePropertyModel.CreateDummyPropertyType to an extension method. 
With a view to re-use in the Courier DataResolver (as it does the same function).
 2014-07-01 21:46:25 +02:00
leekelleher c33649201f Separated out the extension methods into their own grouped classes. 
Implements #172
 2014-07-01 21:46:25 +02:00
leekelleher 3940955360 Code tidy-up; correct method naming; removed unused references 2014-07-01 21:46:24 +02:00
leekelleher 03f66a35f7 Refactored the DataResolver, as the underlying JSON value for the property had been modified (fields removed). 2014-07-01 21:46:24 +02:00
leekelleher b4b60dd89c Add the 'Archetype.Courier' project. 
Includes the Courier DataResolver for Archetype.
 2014-07-01 21:46:23 +02:00
leekelleher 4105912394 Code tidy-up: removed the "Models" namespace from the type name. 2014-07-01 21:46:22 +02:00
Kevin Giszewski fa970750d1 Bump version number to v.1.3.1-beta v1.3.1-beta 2014-06-30 11:22:34 -04:00
Kevin Giszewski aeeb3c7b40 Remove Serialization 2014-06-30 11:22:21 -04:00
Kevin Giszewski bdd3c2088c Bump version number to v1.3.0 v1.3.0-beta 2014-06-30 10:48:07 -04:00
Kevin Giszewski 80b41e4a5f Fix #168 2014-06-30 10:45:48 -04:00
Kevin Giszewski d60e7ba2f4 Merge branch 'master' into pr/166 2014-06-30 10:39:59 -04:00
Kevin Giszewski 4524320db2 Merge branch 'master' into pr/166 2014-06-30 09:47:10 -04:00
kjac 90ca77c9a9 Add localization to new config item 2014-06-28 12:51:36 +02:00
kjac 8332a841eb Implement #165 - enable/disable fieldsets 2014-06-28 12:42:36 +02:00
kjac d6a13b2335 Merge remote-tracking branch 'upstream/master' 2014-06-28 11:25:59 +02:00
cankoluman 987e5cf470 Issue #AR-8_line_endings: fix build 2014-06-27 14:27:48 +01:00
cankoluman f2e5b83795 Issue #AR-8_line_endings: fix line endings so we match the upstream 2014-06-27 14:16:54 +01:00
cankoluman 066e807847 Merge remote-tracking branch 'origin/dev/AR-6_legacy_nesting' into dev/AR-8_line_endings 
Conflicts:
	app/Umbraco/Archetype.Tests/Serialization/UseCases/ArchetypeJsonConverterTest.cs
	app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/ArchetypeJsonConverterTest.cs
	app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestModels.cs
	app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
	app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
	app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
	app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
	app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
	app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
	config/meta.json
 2014-06-27 12:47:52 +01:00
cankoluman d8378ed6bb Merge remote-tracking branch 'origin/dev/AR-1_serialization' into dev/AR-8_line_endings 
Conflicts:
	app/Umbraco/Archetype.Tests/Serialization/UseCases/ArchetypeJsonConverterTest.cs
	app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/ArchetypeJsonConverterTest.cs
	app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestModels.cs
	app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
	app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
	app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
	app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
	app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
	app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
	app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
 2014-06-27 12:42:40 +01:00
kjac 19ee2b890c Merge remote-tracking branch 'upstream/master' 2014-06-27 06:33:15 +02:00
Kevin Giszewski c953f12412 Merge branch 'pr/157' into pr/164 2014-06-26 15:58:31 -04:00
kjac 601f2c0d81 Fix issue #162 + improve nested validation highlighting 
The fieldset.isValid property isn't necessarily initialized when the
view looks for it to determine fieldset validity. I've introduced a
validation method that counters this problem.
The validation method also ensures that any validation errors in nested
Archetypes are highlighted on the parent/root Archetype
 2014-06-26 14:58:55 +02:00
kjac 283dd8af76 Merge remote-tracking branch 'upstream/master' 2014-06-26 14:23:40 +02:00
Tom Fulton c83942dc5c Update field labels to match new property alias scheme 
Only for the first level, since focusing an Archetype isn't really a thing
 2014-06-25 22:03:22 -04:00
Tom Fulton a0ff42a84f Merge branch 'master' into fix/unique-aliases 
Conflicts:
	app/views/archetype.default.html
 2014-06-25 21:49:24 -04:00
Tom Fulton ed97d586b4 Make property aliases even more unique 
archetype-property-<umbracoPropertyAlias>-<fieldsetIndex>-<archetypePropertyAlias>-<archetypePropertyIndex>-<and so on...>
 2014-06-25 21:46:46 -04:00
Kevin Giszewski 1bd09799b4 Fix for #160 2014-06-25 18:42:41 +02:00
Kevin Giszewski 0b77ddeef1 Fix 'hide property label' 2014-06-25 18:42:40 +02:00
kjac 2b2d0b4b0d Fix code formatting 2014-06-25 18:42:39 +02:00
kjac dc992293e1 Add default value overload to GetValue() 
Fix issue #142
 2014-06-25 18:42:39 +02:00
kjac 0bc1451a5c Fixing the unit tests 
The call to DisposableTimer.DebugDuration() in
ArchetypeValueConverter.ConvertDataToSource() expects the propertyType
parameter to be not null, but the implementation of
ArchetypeValueConverter.ConvertDataToSource() allows the propertyType
parameter to be null. This breaks some of the unit tests.
I've added a null check in the call to DisposableTimer.DebugDuration()
to counter this issue.
 2014-06-25 18:42:38 +02:00
Kevin Giszewski f052ed70a9 Merge pull request #161 from imulus/feature/fix-customviews 
Fix for #160
 2014-06-25 10:29:22 -04:00
Kevin Giszewski 0dedd7fb2d Fix for #160 2014-06-25 10:28:30 -04:00
Kevin Giszewski cb6455c34a Merge branch 'master' into develop 2014-06-25 08:35:07 -04:00
Kevin Giszewski f99ef697db Fix 'hide property label' 2014-06-25 08:34:54 -04:00
Tom Fulton aac015dc0b Refactor property aliases for uniqueness 
Old: archetype-property-<umbracoPropertyAlias>-<fieldsetIndex>-<propertyIndex>
New: archetype-property-<umbracoPropertyAlias>-<archetypePropertyAlias>-<fieldsetIndex>

Basically, this adds the archetypePropertyAlias into the mix, to fix a case where you might have the same Archetype nested on a host Archetype twice  (ie box 1 links, box 2 links within the same Archetype - there was no uniqueness)

It also adds in the Property Alias in place of the Property "Index" (unintended side effect, but seems cool :))
 2014-06-23 20:58:42 -04:00
Kevin Giszewski f7ef096ba6 Merge branch 'master' into develop 2014-06-20 08:41:49 -04:00
Kevin Giszewski a17e5b5372 Merge branch 'master' into develop 2014-06-20 08:27:04 -04:00
kjac 16a73e0c82 Fix code formatting 2014-06-20 11:06:33 +02:00
cankoluman a56864b731 Issue #AR-6_legacy_nesting: update version counter to match VersionInfo.cs 2014-06-20 09:59:15 +01:00
kjac 2f195dd588 Add default value overload to GetValue() 
Fix issue #142
 2014-06-20 10:58:21 +02:00
kjac 35309b863c Fixing the unit tests 
The call to DisposableTimer.DebugDuration() in
ArchetypeValueConverter.ConvertDataToSource() expects the propertyType
parameter to be not null, but the implementation of
ArchetypeValueConverter.ConvertDataToSource() allows the propertyType
parameter to be null. This breaks some of the unit tests.
I've added a null check in the call to DisposableTimer.DebugDuration()
to counter this issue.
 2014-06-20 10:56:29 +02:00
cankoluman da9085c244 Merge remote-tracking branch 'upstream/develop' into dev/AR-6_legacy_nesting 
Conflicts:
	app/Umbraco/Archetype.Tests/Serialization/UseCases/ArchetypeJsonConverterTest.cs
	app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/ArchetypeJsonConverterTest.cs
	app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestModels.cs
	app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
	app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
	app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
	app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
	app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
	app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
	app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs
 2014-06-20 09:35:13 +01:00
cankoluman 1d8703e211 Issue #AR-6_legacy_nesting: fix issue where legacy nested model deserialization failed after the empty fieldset fix, 
- add legacy deserialization test
 2014-06-18 11:04:25 +01:00
kjac 0ebf07d0f4 Merge remote-tracking branch 'upstream/master' 2014-06-18 06:25:55 +02:00
Kevin Giszewski fdcd6cc3bf Bump Version to 1.2.1 v1.2.1-beta 2014-06-17 16:23:48 -04:00
Kevin Giszewski 59179d0c81 Fix two-way binding 2014-06-17 16:23:38 -04:00
leekelleher 16f8d9fb2a Tidied up namespace references + various whitespace. 
(I couldn't help myself; OCD! ⚡)
 2014-06-17 18:45:18 +01:00
leekelleher cfffa89138 Applied singleton pattern for ArchetypeHelper. 2014-06-17 18:43:58 +01:00
kjac 2b4cc2c429 Merge remote-tracking branch 'upstream/master' 2014-06-17 18:39:34 +02:00