f2e5b83795
Issue #AR-8_line_endings: fix line endings so we match the upstream
2014-06-27 14:16:54 +01:00
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
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
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
a0ff42a84f
Merge branch 'master' into fix/unique-aliases
...
Conflicts:
app/views/archetype.default.html
2014-06-25 21:49:24 -04:00
ed97d586b4
Make property aliases even more unique
...
archetype-property-<umbracoPropertyAlias>-<fieldsetIndex>-<archetypePropertyAlias>-<archetypePropertyIndex>-<and so on...>
2014-06-25 21:46:46 -04:00
f052ed70a9
Merge pull request #161 from imulus/feature/fix-customviews
...
Fix for #160
2014-06-25 10:29:22 -04:00
0dedd7fb2d
Fix for #160
2014-06-25 10:28:30 -04:00
cb6455c34a
Merge branch 'master' into develop
2014-06-25 08:35:07 -04:00
f99ef697db
Fix 'hide property label'
2014-06-25 08:34:54 -04:00
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
f7ef096ba6
Merge branch 'master' into develop
2014-06-20 08:41:49 -04:00
a17e5b5372
Merge branch 'master' into develop
2014-06-20 08:27:04 -04:00
16a73e0c82
Fix code formatting
2014-06-20 11:06:33 +02:00
a56864b731
Issue #AR-6_legacy_nesting: update version counter to match VersionInfo.cs
2014-06-20 09:59:15 +01:00
2f195dd588
Add default value overload to GetValue()
...
Fix issue #142
2014-06-20 10:58:21 +02:00
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
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
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
0ebf07d0f4
Merge remote-tracking branch 'upstream/master'
2014-06-18 06:25:55 +02:00
fdcd6cc3bf
Bump Version to 1.2.1
2014-06-17 16:23:48 -04:00
59179d0c81
Fix two-way binding
2014-06-17 16:23:38 -04:00
16f8d9fb2a
Tidied up namespace references + various whitespace.
...
(I couldn't help myself; OCD! ⚡ )
2014-06-17 18:45:18 +01:00
cfffa89138
Applied singleton pattern for ArchetypeHelper.
2014-06-17 18:43:58 +01:00
2b4cc2c429
Merge remote-tracking branch 'upstream/master'
2014-06-17 18:39:34 +02:00
9c82018903
Merge pull request #147 from leekelleher/feature/customViewPath
...
Added custom view path to prevalue POCO model
2014-06-17 12:16:35 -04:00
386a1a58fc
Set the assembly references not to "copy local"
...
(This seems to revert when NuGet updates references)
2014-06-17 17:00:26 +01:00
9aaa490eb0
Added the customViewPath property to the POCO model
2014-06-17 16:59:38 +01:00
ec446b6800
Merge branch 'pr/137' into develop
2014-06-17 07:05:06 -04:00
67f21ee4d8
Merge branch 'dev/AR-1_serialization' into stable
2014-06-17 11:17:23 +01:00
0573d99218
Merge branch 'stable' into dev/AR-1_serialization
2014-06-17 11:16:28 +01:00
a520d86ec4
Issue #AR-5_empty_json: Handle the case where the archetype json is empty:
...
{""fieldsets"": []}
Currently this throws an exception. Handle by setting returned model to null.
2014-06-17 11:13:25 +01:00
3c9b7692f1
Bump the version number
2014-06-16 11:54:49 -04:00
51223d4ac7
Merge branch 'develop' of github.com:imulus/Archetype into develop
2014-06-16 11:35:57 -04:00
1d5f91964f
Finish Custom Views
2014-06-16 11:35:44 -04:00
0accac26ee
WIP for custom views
2014-06-16 11:06:59 -04:00
0048330863
Merge branch 'master' into issue131_optimized
2014-06-16 16:43:07 +02:00
d07c16160a
Merge remote-tracking branch 'upstream/master'
2014-06-16 16:42:25 +02:00
6527e66ff3
Add extensions to auto map an ArchetypeModel to a partials of named as alias
2014-06-16 10:00:17 -04:00
47e71067a1
Merge branch 'pr/137' into develop
2014-06-16 09:11:49 -04:00
969cc45e9b
Merge branch 'pr/107' into develop
2014-06-16 09:10:22 -04:00
9ff5bfc907
Merge pull request #145 from imulus/master
...
Sync up dev
2014-06-14 18:27:17 -04:00
7cdcb940bd
Merge pull request #144 from imulus/develop
...
Develop
2014-06-14 18:25:35 -04:00
75e0ac5d6d
Merge pull request #139 from imulus/fix/133
...
Send ContentType when using ValueConverters
2014-06-14 18:22:37 -04:00
310771303c
Merge branch 'dev/AR-1_serialization' into stable
2014-06-02 14:25:12 +01:00
ba6921fdb9
Update README.md
2014-05-29 17:50:43 -04:00
aafeebfc62
Merge remote-tracking branch 'upstream/master'
2014-05-29 11:16:01 +02:00
8624617ad4
Merge branch 'master' into fix/133
2014-05-27 15:03:02 -06:00
e46e5c279f
Merge pull request #136 from leekelleher/feature/issues/134
...
Adds null reference checks for `GetValue<T>`.
2014-05-27 15:01:57 -06:00
a9dc79e4ff
Ensure new HostContentType isn't persisted
2014-05-27 15:01:21 -06:00
cankoluman