a17e5b5372
Merge branch 'master' into develop
2014-06-20 08:27:04 -04: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
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
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
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
485c6cb6a1
When using ValueConverters, pass along the Content Type - fixes #133
...
* Add new property HostContentType to make Properties aware of their content type
* Adjust Dummy PropertyType to include the Content Type
* Pass in Content Type from ValueConverter to Deserialization helper through new optional parameter
* Populate the property's HostContentType via RetrieveAdditionalProperties
* Make sure HostContentType isn't persisted
Notes: In some cases, the Umbraco Core looks for pt.ContentType.Alias, which didn't exist previously in our Dummy PropertyType. This would also potentially cause an error if any PVC's do the same.
To fix we now keep track of the Content Type that the Archetype exists on (determined in the ArchetypeValueConverter), and pass this along to our Dummy PropertyType (and thus to PVCs)
Note we made the hostContentType an optional parameter as there's some cases where we won't know the content type (ie ConvertDbToEditor). This (shouldn't?) be an issue as these cases should never have a reason to call GetValue.
2014-05-27 14:31:23 -06:00
8e7eda9276
Merge branch 'master' into develop
2014-05-23 16:24:10 -04:00
96d70bc1a9
Merge branch 'develop' into pr/137
2014-05-23 10:07:34 -04:00
264208dcc7
Update namespaces
2014-05-22 15:01:55 -04:00
077ab44dc8
Merge branch 'develop' into pr/107
...
Conflicts:
app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
2014-05-22 14:19:03 -04:00
7499395807
Fix WS
2014-05-22 14:17:46 -04:00
d983b75be3
Merge branch 'pr/136' into develop
2014-05-22 14:12:28 -04:00
381875bc14
Merge branch 'master' into issue131_optimized
2014-05-22 19:40:52 +02:00
3944da57b1
Fix the validation display
...
Rewrite the changes from commit 4785c85
2014-05-22 19:16:26 +02:00
0cbbd1c93e
Adds null reference checks for GetValue<T>.
...
Fixes #134
2014-05-22 14:29:38 +01:00
1bfab0f8a3
Optimize validation routine
...
Only validate the property being edited, not the entire fieldset the
property belongs to.
2014-05-21 22:49:15 +02:00
537abea717
Merge remote-tracking branch 'upstream/master'
2014-05-20 07:13:54 +02:00
c8d9b04a57
Rewrite validation
...
Rewrite validation to handle
1. Validation on page load
2. Validation on nested Archetypes
3. Validation of numeric property editors (check for NaN)
2014-05-19 19:49:50 +02:00
32d0d199a3
Add/move dynamic classes for targeting of custom behavior
2014-05-16 13:44:25 +02:00
715776771a
Fix deserialization of RegEx enabled properties
...
Fix type mismatch for RegEx (introduced in 6e50301
2014-05-16 13:44:24 +02:00
4785c85b84
Add/move dynamic classes for targeting of custom behavior
2014-05-15 17:24:34 -04:00
712ca3cd76
Add/move dynamic classes for targeting of custom behavior
2014-05-15 17:24:14 -04:00
43a7202194
Merge pull request #128 from kjac/RegEx-model-fix
...
Fix deserialization of RegEx enabled properties
2014-05-14 10:01:37 -04:00
9a21ab0ef4
Fix deserialization of RegEx enabled properties
...
Fix type mismatch for RegEx (introduced in 6e50301
2014-05-13 22:11:53 +02:00
46613bbc01
Fix bug with Add button
2014-05-13 12:03:50 -04:00
4998acb59a
Missing curlies from the conflict
2014-05-13 11:15:33 -04:00
bc58078eec
Merge branch 'develop'
...
Conflicts:
app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs
app/Umbraco/Umbraco.Archetype/Models/ArchetypePropertyModel.cs
app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-05-13 11:15:13 -04:00
d1d95aebe7
Merge branch 'pr/126' into develop
2014-05-13 11:01:56 -04:00
1c9bce8b66
Explicitly set form as dirty on row changes
...
Fix issue #123 . Explicitly call $setDirty() on the PE form when
reordering or removing rows, thus ensuring the editor will be prompted
to discard changes if navigating away before saving.
2014-05-12 21:51:19 +02:00
Kevin Giszewski