Commit Graph

327 Commits

Author SHA1 Message Date
Tom Fulton 91fc5bbd7f Fix rows not being added in correct position 2014-05-04 15:59:01 -06:00
Tom Fulton 3742147cf7 Merge branch 'master' into feature/add-dropdown
Conflicts:
	app/views/archetype.html
2014-05-04 15:58:00 -06:00
Tom Fulton 432a33eef8 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-03 00:32:18 -06:00
Kevin Giszewski b7a8f5f581 Add try/catch with logging to prop converters 2014-05-02 09:20:59 -04:00
Kevin Giszewski 6ea44c271d Use a count on the add button rather than checking flag 2014-04-30 10:00:15 -04:00
Tom Fulton 848d25a156 Show "remove" button when MaxFieldsets = 1 and Multiple Fieldset Types
... so the user can switch types (remove/add) when only a single row.

We check for Multiple Fieldset Types as well, because we don't want to show a "remove" button when there's only one type allowed (presumably).
2014-04-29 19:52:23 -06:00
Tom Fulton b4fc3e1cd3 Persist without formatting/whitespace 2014-04-29 18:34:25 -06:00
Tom Fulton 0547c4c07e Ensure we only save the "cleaned" model to the DB
* Extract the model cleaning logic to a method for re-use
* Call cleaning method from ConvertEditorToDb  (we were only calling on ConvertDbToString (cache))
* Update ConvertDbToEditor to route through new deserialization helper, so that it gets the "virtual" properties it needs that were lost in the cleaning
2014-04-29 18:18:14 -06:00
Kevin Giszewski 86f2f180bf Fix defaultPreValue import
- Remove MNTP hack
2014-04-29 16:23:55 -04:00
Kevin Giszewski 62a9ff05b9 Hide the Add button when multiple fieldsets enabled 2014-04-29 14:35:48 -04:00
Kevin Giszewski ce05dbb845 Remove logging 2014-04-29 14:25:34 -04:00
Kevin Giszewski 8ce8454620 Add a hack to make the MNTP multipicker work 2014-04-29 14:23:58 -04:00
Kevin Giszewski d13a5b1b86 Remove RenderModel
- Use server side converters for model cleanup
2014-04-29 12:31:02 -04:00
Tom Fulton 3b5cff8d9a Completely remove package.manifest in favor of C# declaration 2014-04-28 23:53:07 -06:00
Tom Fulton f214785cfa Merge branch 'wip/106-amend-3' into 106-update
Conflicts:
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-04-28 23:47:39 -06:00
Tom Fulton 61d0b67118 Merge branch '106' into 106-update
Conflicts:
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-04-28 23:46:51 -06:00
Tom Fulton 7a71afda0e GetValue - *always* check the PropertyValueConverters
Even if we want a string and the value is already a string, we should still hit the PropertyValueConverters for situations like the RTE's PVC, which performs parsing on the content.
2014-04-28 23:39:32 -06:00
Tom Fulton 4ad88a04e5 Misc cleanup 2014-04-28 23:37:39 -06:00
Tom Fulton 6f281080e8 Route new Convert* methods through Helper, refactor
This fixes the issue where the model sent to ConvertEditorToDb doesn't have a DataTypeGuid, thus we were unable to look up the correct PropertyEditor to run the Convert methods on.
2014-04-28 23:30:32 -06:00
Tom Fulton e2341e8bb5 Merge branch 'feature/rte-macro-fix' of github.com:mattbrailsford/Archetype into wip/106-amend-3
Conflicts:
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-04-27 23:07:26 -06:00
Tom Fulton 55bb2e49e5 Merge pull request #108 from imulus/pvc-refactor
Extract methods from ValueConverter for reuse
2014-04-27 22:55:15 -06:00
Tom Fulton ff4b5da163 Merge branch 'pvc-refactor' of github.com:imulus/Archetype into pvc-refactor 2014-04-24 23:12:05 -06:00
Tom Fulton ea017fa6cd Make tests pass
Quick null check for PublishedPropertyType - we can't create a dummy one from a test due to some internal Umbraco dependencies, and we can't mock it as the relevant properties aren't virtual, so just adding a quick null check for now.
2014-04-24 23:11:47 -06:00
Tom Fulton 7a29683008 Mark helper methods internal for now 2014-04-24 22:44:37 -06:00
Tom Fulton f52bbc2d0a Extract methods to retrieve metadata not stored in the model 2014-04-24 22:39:22 -06:00
Tom Fulton fa174ba15a Move deserialization methods to a Helper class 2014-04-24 22:29:58 -06:00
Tom Fulton a3a275808e Small refactorings to ConvertDataSource via @leekelleher
Manually merged in from: https://github.com/leekelleher/Archetype/blob/79bace6b882ec6bd291cc395be57336f8df26b0b/app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-04-24 22:05:52 -06:00
mattbrailsford 1ca8878592 Removed temp "ParseMacros" extension method
Removed package.manifest
Added C# property editor definition
Added initial code for handling data value conversions when accessing from / writing to datavabase / xml cache
2014-04-21 20:23:07 +01:00
Kevin Giszewski 5aeef0383c Bump dll version 2014-04-18 17:34:35 -04:00
Kevin Giszewski 337cd6d863 Bump the version to 1.0-beta 2014-04-18 17:33:39 -04:00
Kevin Giszewski 3160f8ce8f Use an extension to parse the RTE macros into rendered macros 2014-04-18 17:27:19 -04:00
Tom Fulton 5eed6da175 Fix clean path in build script 2014-04-15 23:40:17 -06:00
Kevin Giszewski da4383181c Bump the version number 2014-04-14 15:02:06 -04:00
Kevin Giszewski 25e8db9443 Update core refs to v7.1.1 2014-04-14 15:00:59 -04:00
Tom Fulton c6a47c0036 Merge pull request #100 from leekelleher/feature/grunt-vs-tidyup
Changed grunt "copy:dll" to take from "Release" directory
2014-04-13 22:22:53 -06:00
Kevin Giszewski 9795e26f1a Merge branch 'develop' of github.com:imulus/Archetype into develop 2014-04-10 16:48:34 -04:00
Kevin Giszewski e144e475b7 Merge pull request #101 from BatJan/patch-1
Translation to danish
2014-04-10 16:45:50 -04:00
BatJan 9c7cb43bb9 Translation to danish
...Have fun figuring out if my danish translation is good! (Just kidding!) :)
2014-04-10 22:42:45 +02:00
leekelleher ac20b370fb Amended the build script to take the assembly from the 'Release' directory.
Disabled "Copy Local" for 3rd-party assembly references.
2014-04-09 11:54:13 +01:00
Tom Fulton 6cc91e4359 Move cache keys to Constants 2014-04-04 17:09:42 -06:00
Tom Fulton c883afc81f Merge branch 'develop' into feature/clear-cache 2014-04-04 16:06:36 -06:00
Tom Fulton 3a89c73b6d Merge branch 'develop' 2014-04-04 15:57:04 -06:00
Tom Fulton 1eb0aa68d2 Wrap method in GetCacheItem - missed from merge conflict in 3ffd03e34c 2014-04-04 00:06:33 -06:00
Tom Fulton 533f7d9f8f DRY up DataTypeId lookups/caching 2014-04-04 00:04:03 -06:00
Tom Fulton 3ffd03e34c Merge branch '91' into feature/cache
Conflicts:
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs

Fix conflicts and update caching to match #91
2014-04-03 22:48:29 -06:00
Tom Fulton 91dcdae780 Merge branch 'develop' 2014-04-03 22:17:59 -06:00
Tom Fulton 15a242ab9b Clear the PreValue cache when DataTypes are saved 2014-04-03 22:14:41 -06:00
Kevin Giszewski 05b98beee6 Update README.md 2014-04-03 17:47:13 -04:00
Kevin Giszewski f138ee178b Remove reference to old config file 2014-04-03 13:50:01 -04:00
Kevin Giszewski 6e52df4f88 Update core references to 7.1.0 2014-04-03 13:47:52 -04:00