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
8d3e3aeb0a
Stop Umbraco from asking to discard changes
...
By calling ngModelCtrl.$setViewValue() only when there's actually a
change in the value, we keep Umbraco from prompting to discard changes
immediately after all changes have been saved (see issue #121 for more
details).
2014-05-12 21:30:08 +02:00
a58c0154c9
Merge remote-tracking branch 'upstream/master'
2014-05-12 19:11:08 +02:00
9829ab796a
Remove setDirty()
...
- Not sure how it made it in
2014-05-12 19:09:29 +02:00
75080b0e2d
Rename Model Files
2014-05-12 19:09:28 +02:00
932f098837
Expose current form to nested Archetypes
2014-05-12 19:09:28 +02:00
6e50301da5
Issue #116 : Add RegEx validation support
...
Add RegEx validation for the individual properties in a fieldset as
proposed in issue #116
2014-05-12 19:09:27 +02:00
448bbe26f0
Update fix for issue #121 + fix issue #123
...
Use the built-in dirty state to handle row changes instead of the custom
state variable introduced in the previous commit.
Additionally this solves issue #123 by setting the dirty state when rows
are removed or sorted.
2014-05-12 19:09:26 +02:00
7c3c0e041d
Fix issue #121
...
Stop prompting the editor to save unsaved changes after saving.
2014-05-12 19:09:26 +02:00
3b2559c37d
Update folder name in sln
2014-05-12 19:09:25 +02:00
2cc4fd711a
Update folder name
2014-05-12 19:09:24 +02:00
d5038a52d1
Add in DatabaseSizer
...
- Temp DLL to not be included in dist
2014-05-12 19:09:24 +02:00
d4cf60d5f3
Update packages to v7.1.2
...
- Also last commit
2014-05-12 19:09:23 +02:00
09a3172c80
Merge in
2014-05-12 19:09:22 +02:00
2bf2e5f91a
Update naming scheme
2014-05-12 19:09:22 +02:00
d09831b547
Merge pull request #125 from imulus/develop
...
Develop
2014-05-12 12:54:47 -04:00
db82bd8013
Remove setDirty()
...
- Not sure how it made it in
2014-05-12 12:52:24 -04:00
4014583ade
Merge branch 'pr/124' into develop
2014-05-12 12:45:45 -04:00
9a0e40b489
Rename Model Files
2014-05-12 12:44:18 -04:00
5c60c109d5
Expose current form to nested Archetypes
2014-05-12 12:43:38 -04:00
7615657a18
Rename Models
...
- Remove .Umbraco
2014-05-12 11:40:51 -04:00
bdb3655418
Merge branch 'develop' into pr/124
2014-05-12 10:50:41 -04:00
0d766c1ad9
Merge branch 'develop' into pr/122
2014-05-12 09:55:54 -04:00
e2c7e9b0ef
Issue #116 : Add RegEx validation support
...
Add RegEx validation for the individual properties in a fieldset as
proposed in issue #116
2014-05-11 10:39:12 +02:00
62964dcfae
Update fix for issue #121 + fix issue #123
...
Use the built-in dirty state to handle row changes instead of the custom
state variable introduced in the previous commit.
Additionally this solves issue #123 by setting the dirty state when rows
are removed or sorted.
2014-05-10 22:29:56 +02:00
a48033874a
Fix issue #121
...
Stop prompting the editor to save unsaved changes after saving.
2014-05-10 17:25:16 +02:00
ecb933d13a
Update folder name in sln
2014-05-09 12:06:18 -04:00
45ccf6e06d
Update folder name
2014-05-09 12:05:43 -04:00
b0118f4bdb
Add in DatabaseSizer
...
- Temp DLL to not be included in dist
2014-05-09 12:04:23 -04:00
Kevin Giszewski