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
7fd1b69e81
Update packages to v7.1.2
...
- Also last commit
2014-05-09 12:03:31 -04:00
b67e150fe1
Merge in
2014-05-09 12:02:45 -04:00
5b43053406
Merge remote-tracking branch 'upstream/master'
2014-05-09 07:29:11 +02:00
1cbc192a9d
Update naming scheme
2014-05-08 17:47:24 -04:00
4fff98640e
Remove filter as .remove is no longer an attribute
2014-05-08 13:32:55 -04:00
085ff2cecf
Add dropdown to add button
2014-05-08 13:32:04 -04:00
d72a000d68
Remove Toolbar
...
- Fix insert index issue
2014-05-08 12:58:48 -04:00
2fc8845851
Merge branch 'master' into pr/115
2014-05-08 11:04:06 -04:00
d5c6b4a324
Amended the build script to only copy the Archetype assembly.
2014-05-07 15:10:25 +01:00
bd617162f1
Disabled "Copy Local" for 3rd-party assembly references.
2014-05-07 15:09:55 +01:00
06fdfc8226
Merge remote-tracking branch 'upstream/master'
2014-05-07 08:22:21 +02:00
d4d50cae52
Merge branch 'master' of github.com:imulus/Archetype
2014-05-06 13:00:40 -04:00
688ad534f2
Check for config for label template
2014-05-06 13:00:05 -04:00
ff39bce262
Add package task that creates both packages to simplify CI
...
Duplicated task steps to prevent needing to build multiple times but maintaining 'full build' in the individual package tasks
2014-05-05 17:36:26 +02:00
481259f0b7
Add try/catch with logging to prop converters
2014-05-05 17:36:26 +02:00
059d951a21
Don't use dropdown menu when only 1 fieldset type
2014-05-04 16:39:56 -06:00
6dc5841f31
Stylize dropdown menu
2014-05-04 16:21:19 -06:00
91fc5bbd7f
Fix rows not being added in correct position
2014-05-04 15:59:01 -06:00
3742147cf7
Merge branch 'master' into feature/add-dropdown
...
Conflicts:
app/views/archetype.html
2014-05-04 15:58:00 -06:00
Kevin Giszewski