b5bfbb5c25
Fix 3 for #187
2014-07-30 16:33:01 +02:00
fbf686f559
Bump Version Number to v1.4.0
2014-07-11 10:38:08 -04:00
42b4076700
Merge branch 'pr/174'
2014-07-11 10:19:00 -04:00
5feb415093
Update some dropdown css
2014-07-11 10:17:49 -04:00
79c85cf86b
Merge branch 'master' into pr/174
2014-07-09 16:42:18 -04:00
a0f65370c9
Few CSS tweaks
2014-07-09 16:40:29 -04:00
029d17c428
Merge branch 'master' of github.com:imulus/Archetype
2014-07-09 15:46:17 -04:00
e262d7b0c9
Re-fix the 'hide label' issue
...
- appears to have been undone
2014-07-09 15:46:05 -04:00
44ea6c56f5
Use propertyAlias in fieldset validation
...
As described in #162 the umbracoPropertyAlias has been removed in favor
of a more unique propertyAlias. This propertyAlias should be used for
property identification in the validation.
2014-07-01 22:28:20 +02:00
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
c33649201f
Separated out the extension methods into their own grouped classes.
...
Implements #172
2014-07-01 21:46:25 +02:00
3940955360
Code tidy-up; correct method naming; removed unused references
2014-07-01 21:46:24 +02:00
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
b4b60dd89c
Add the 'Archetype.Courier' project.
...
Includes the Courier DataResolver for Archetype.
2014-07-01 21:46:23 +02:00
4105912394
Code tidy-up: removed the "Models" namespace from the type name.
2014-07-01 21:46:22 +02:00
7b3d31f897
Merge pull request #173 from leekelleher/feature/issues/172
...
Separated out the extension methods into their own grouped classes
2014-07-01 11:52:43 -04:00
50861badf1
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 16:49:20 +01:00
fa682c3717
Separated out the extension methods into their own grouped classes.
...
Implements #172
2014-07-01 16:48:13 +01:00
d18d1ff0b1
Merge pull request #171 from leekelleher/feature/courier-resolver
...
Includes Courier DataResolver project
2014-07-01 11:27:21 -04:00
247491187a
Code tidy-up; correct method naming; removed unused references
2014-07-01 16:09:34 +01:00
80194786a1
Refactored the DataResolver, as the underlying JSON value for the property had been modified (fields removed).
2014-07-01 15:42:41 +01:00
72ee7b3d09
Merge pull request #170 from leekelleher/master
...
Code tidy-up: removed the "Models" namespace from the type name.
2014-07-01 10:20:18 -04:00
284b1d93dc
Add the 'Archetype.Courier' project.
...
Includes the Courier DataResolver for Archetype.
2014-07-01 14:28:02 +01:00
7c5a3c34e2
Code tidy-up: removed the "Models" namespace from the type name.
2014-07-01 13:54:18 +01:00
fa970750d1
Bump version number to v.1.3.1-beta
2014-06-30 11:22:34 -04:00
aeeb3c7b40
Remove Serialization
2014-06-30 11:22:21 -04:00
bdd3c2088c
Bump version number to v1.3.0
2014-06-30 10:48:07 -04:00
80b41e4a5f
Fix #168
2014-06-30 10:45:48 -04:00
d60e7ba2f4
Merge branch 'master' into pr/166
2014-06-30 10:39:59 -04:00
4524320db2
Merge branch 'master' into pr/166
2014-06-30 09:47:10 -04:00
90ca77c9a9
Add localization to new config item
2014-06-28 12:51:36 +02:00
8332a841eb
Implement #165 - enable/disable fieldsets
2014-06-28 12:42:36 +02:00
d6a13b2335
Merge remote-tracking branch 'upstream/master'
2014-06-28 11:25:59 +02:00
987e5cf470
Issue #AR-8_line_endings: fix build
2014-06-27 14:27:48 +01:00
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
19ee2b890c
Merge remote-tracking branch 'upstream/master'
2014-06-27 06:33:15 +02:00
c953f12412
Merge branch 'pr/157' into pr/164
2014-06-26 15:58:31 -04:00
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
283dd8af76
Merge remote-tracking branch 'upstream/master'
2014-06-26 14:23:40 +02: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
1bd09799b4
Fix for #160
2014-06-25 18:42:41 +02:00
0b77ddeef1
Fix 'hide property label'
2014-06-25 18:42:40 +02:00
2b2d0b4b0d
Fix code formatting
2014-06-25 18:42:39 +02:00
dc992293e1
Add default value overload to GetValue()
...
Fix issue #142
2014-06-25 18:42:39 +02:00
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
f052ed70a9
Merge pull request #161 from imulus/feature/fix-customviews
...
Fix for #160
2014-06-25 10:29:22 -04:00
Jeroen Breuer