b6d2b7e1dd
Merge branch 'dev/AR-4_delinter_fixes' into dev/AR-1_serialization
2014-05-21 14:23:26 +01:00
1179147041
Issue #AR-4-delinter_fixes: simplify replace
2014-05-21 14:22:11 +01:00
0cfcaa3364
Issue #AR-4-delinter_fixes: change heuristic for space removal
2014-05-21 14:15:54 +01:00
14777a98dc
Issue #AR-4-delinter_fixes: removed buggy escaped json tests
2014-05-20 16:22:47 +01:00
a306424162
Issue #AR-4-delinter_fixes: fix issue where escaped new lines were being removed inside value quotes
2014-05-20 15:05:44 +01:00
d124622089
Issue #AR-4-delinter_fixes: refactor delinter
2014-05-20 13:07:18 +01:00
d9a25d1bb3
Issue #AR-4-delinter_fixes: fix all regexes except white space
2014-05-20 12:18:48 +01:00
cda17ac754
Issue #AR-4-delinter_fixes: update remove new line
2014-05-20 10:39:09 +01:00
d5329935aa
Issue #AR-4-delinter_fixes: fixed all test failures due to jToken navigation errors.
...
To Do: fix erros due to incorrect space removal
2014-05-20 09:32:01 +01:00
1913f8bf14
Issue #AR-4-delinter_fixes: create single entry point for deserialization - 15 tests failing now
2014-05-19 16:25:20 +01:00
6f2eaa9859
Issue #AR-4-delinter_fixes: trying to fix delinter regex
2014-05-19 16:08:00 +01:00
31074ec9db
Issue #AR-4-delinter_fixes: trying to sort out issue with \r\n being replaced inside values
2014-05-16 17:19:05 +01:00
512ecbdb05
Issue #AR-1_serialization: fixes after merge of upstream master
2014-05-15 17:02:06 +01:00
9a97e9102e
Merge branch 'master' into dev/AR-1_serialization
...
Conflicts:
app/Umbraco/Archetype.Tests/Archetype.Tests.csproj
app/Umbraco/Umbraco.Archetype.sln
app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-05-15 16:48:08 +01:00
e9b2f4aeee
Merge remote-tracking branch 'upstream/master'
2014-05-15 16:43:25 +01:00
bdb7f247c3
Issue #AR-1_serialization: add delinter to SerializeForPersistence()
2014-05-15 16:23:48 +01:00
08c09a8820
Issue #AR-1_serialization: moved Delinter so serialization namespace,
...
- fix small issue with space detection in fieldset delinter
2014-05-15 16:13:29 +01:00
ac84c35f67
Issue #AR-1_serialization: fix issue where property alias was incorrectly set from type alias
2014-05-15 15:06:41 +01:00
bff8bcc562
Issue #AR-1_serialization: fix overflow issue affecting deserialization in recursively nested models
2014-05-15 14:55:12 +01:00
8fc209abc1
Issue #AR-1_serialization: move delinter tests into serialization tests
2014-05-15 12:42:15 +01:00
a6a961d52a
Issue #AR-1_serialization: added additional unescape model tests
2014-05-15 12:38:11 +01:00
b289892727
Issue #AR-1_serialization: initial commit of delinter
2014-05-15 12:25:44 +01: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
4051734313
Issue #AR-1_serialization: got json escape test to work, added json unescape extension and tests,
...
To Do: migrate test code from ArcheTypePropertyEditor if possible.
2014-05-14 12:28:37 +01: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
ae242feed6
Issue #AR-1_serialization: add test to try to create escaped json - this still produces unescaped json.
...
However,
internal virtual PropertyEditor GetPropertyEditor(IDataTypeDefinition dtd)
{
return dtd.Id == 0
? new ArchetypePropertyEditor()
: PropertyEditorResolver.Current.GetByAlias(dtd.PropertyEditorAlias);
}
would produce nested json. But this spec looks incorrect.
2014-05-13 15:44:33 +01:00
f1df0f2ad9
Issue #AR-1_serialization: add tests comparing models generated object serializer and archetype.SerializeForPersistence() pathwways.
...
Note: SerializeForPersistence() does not generate escaped json when used on its own.
All tests passing.
2014-05-13 10:20:12 +01: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
cankoluman