Commit Graph

234 Commits

Author SHA1 Message Date
Tom Fulton d37ee132bc Update adding rows to adhere to new Enable Collapsing option 2014-03-06 12:15:51 -07:00
Tom Fulton 561ef8ccd0 Revert accidental(?) background-color change from eaf766c 2014-03-06 12:13:18 -07:00
Tom Fulton 45d7db0239 Add missing dependency 2014-03-06 12:12:40 -07:00
Tom Fulton e444b728b6 Merge branch 'develop' 2014-03-06 12:05:48 -07:00
Tom Fulton 5865b47482 Merge branch 'feature/allow-collapsing' into develop
Conflicts:
	app/controllers/controller.js
2014-03-06 12:05:34 -07:00
Tom Fulton 6248837b60 Merge pull request #58 from leekelleher/feature-patch-courier-dataresolver
Added a `DataTypeGuid` property to the `Property` object.
2014-03-06 12:03:04 -07:00
Tom Fulton 37f2de0a8f Merge pull request #70 from imulus/fix/view-loading
Add hack for #53 - attempt to resolve promises manually
2014-03-06 12:00:37 -07:00
Tom Fulton be15dba68a Merge pull request #72 from imulus/feature/auto-fill-alias
Auto-fill fieldset and property aliases in Config
2014-03-06 11:59:41 -07:00
Tom Fulton e2620892f5 Merge pull request #73 from imulus/fix-firefox-sort
Add hack to workaround U4-4181 (Firefox can't click any fields)
2014-03-06 11:59:15 -07:00
leekelleher 7879ae695e Exposed the internal members to the "Archetype.Courier" (and Test) assemblies. 2014-03-04 17:38:14 +00:00
leekelleher 50ced7459a Changed the Property properties to internal setters.
Made the `DataTypeGuid` property completely `internal`.
2014-03-04 17:37:09 +00:00
leekelleher 89af319265 Merge branch 'master' into feature-patch-courier-dataresolver 2014-03-04 17:25:19 +00:00
Tom Fulton 7505de1cf1 Add hack to workaround U4-4181 (Firefox can't click any fields)
...in lieu of "proper" fix in Umbraco.
2014-03-02 19:47:21 -07:00
Tom Fulton a09c69edc1 Auto-fill fieldset and property aliases in Config
* Add new aliasIsDirty property, init for existing data
* Bind label control's keyup to populate the `alias` property (when it's not dirty) using Umbraco's helpers
* Mark alias dirty on keyup
2014-03-02 18:43:12 -07:00
Tom Fulton 03101a128e Hide carets when collapsing is disabled 2014-03-02 00:48:49 -07:00
Tom Fulton 67c118066b Merge branch 'develop' into feature/allow-collapsing
Conflicts:
	app/views/archetype.html
2014-03-02 00:41:20 -07:00
Tom Fulton f49159d2d0 Add option to make "collapsing" feature optional
* View: Prevent collapse/expand depending on config option, add class when enabled
* Config: Add option to view, set default to enabled for new datatypes
* CSS: Revert to normal cursor when collapsing disabled

* Note, this is a breaking change - you'll need set `Enable Collapsing?` to `true` on any existing Archetypes to retain the behavior.
2014-03-02 00:38:34 -07:00
Tom Fulton 840feec967 Add hack for #53 - attempt to resolve promises manually
$compile no longer unwraps promises, meaning some property editors may not fully load (their various .then() methods never get executed).  This attempts to resolve them after a delay.  Could be intermittent, but seems to work in most cases.
2014-03-01 22:45:26 -07:00
Tom Smith ffc4eaa964 Merge pull request #67 from rtsmith/master
Make entire module label clickable and change remove icon
2014-02-27 17:23:26 -07:00
Thomas Smith eaf766c2a7 Make entire module label clickable and change remove icon 2014-02-27 17:15:02 -07:00
Tom Fulton 419180c443 Merge branch 'develop' v0.5.1-alpha 2014-02-27 14:44:55 -07:00
Tom Fulton e97c976c7f Merge branch 'master' of github.com:imulus/Archetype
Conflicts:
	app/Umbraco/Umbraco.Archetype/Properties/AssemblyInfo.cs
2014-02-27 14:29:51 -07:00
Tom Fulton 2d05e64e5a Merge branch 'develop' of github.com:imulus/Archetype into develop 2014-02-27 14:25:48 -07:00
Tom Fulton 6f4d7f9e9b Bump version 2014-02-27 14:20:49 -07:00
Tom Fulton 5a24e9b016 Merge pull request #62 from imulus/versioning
Add version # to DLL on build
2014-02-27 13:41:28 -07:00
Tom Fulton 4d4e9d7de0 Quick-fix issues with NuGet package paths 2014-02-27 13:38:07 -07:00
Kevin Giszewski 1dde1ed5f0 Add version to assembly v0.5-alpha 2014-02-26 10:01:39 -05:00
Kevin Giszewski 88051ef61d Bump Version Number 2014-02-26 09:41:06 -05:00
Kevin Giszewski 10d3dd76ed Fix a situation where null were getting into the model on save. 2014-02-26 09:39:02 -05:00
Kevin Giszewski b52f153141 Merge pull request #57 from imulus/feature/api
Expose the Datatype Service GetById
2014-02-26 08:09:27 -05:00
Tom Fulton 062f28f9ca Tighten up watch/deploy tasks
* Don't trigger watch on changes to the .NET solution (except *.dll)
* Include .pdb file for dev deployments
* Fix DLL copying to wrong paths
2014-02-24 01:00:08 -07:00
Tom Fulton cd2bd8c562 Add version # to DLL on build
* Split VersionInfo from AssemblyInfo so we can ignore changes and let the build handle
* Ignore VersionInfo
* Install/configure assemblyinfo grunt task
* Ignore compiler warning about bad version number format (.NET vs SemVer)
2014-02-22 00:32:37 -07:00
Tom Fulton ed6068230e Merge pull request #59 from leekelleher/patch-vs-housekeeping
Some Visual Studio housekeeping
2014-02-21 22:53:16 -07:00
Tom Fulton 24bfef64dd Misc housekeeping 2014-02-21 22:36:27 -07:00
Tom Fulton 1d5e4eda7e Trim down data returned from API 2014-02-21 22:34:30 -07:00
leekelleher 346b8c73d4 Tidied up the AssemblyInfo with your company details, etc. 2014-02-21 18:17:59 +00:00
leekelleher 43ea29cdf2 Set the assembly references not to all "Copy Local",
so that everything isn't copied over to the /bin folders.
2014-02-21 18:14:13 +00:00
leekelleher de03a12e9c Added a DataTypeGuid property to the Property object.
This is required for Courier's DataResolver to "hot-swap" the DataTypeId (int) with it's unique Id (Guid).
2014-02-21 18:05:53 +00:00
Kevin Giszewski f05a67d9d2 Expose the Datatype Service GetById 2014-02-20 11:07:20 -05:00
Kevin Giszewski 3ac7ef34ec Merge pull request #54 from imulus/develop
Develop
2014-02-19 09:17:17 -05:00
Kevin Giszewski 518f95ce01 Merge pull request #52 from imulus/fix-ids
Fix some datatypes not working with multiple Archetypes
2014-02-19 09:16:41 -05:00
Tom Fulton 7831e476e3 Ensure property containers use unique IDs with multiple fieldsets
...by adding the current Archetype's Umbraco Property Alias to the ID string

Old: archetype-property-0-0
New: archetype-property-sliderItems-0-0

Need to DRY this up later ;)
2014-02-17 15:17:57 -07:00
Kevin Giszewski bfb883c098 Merge pull request #49 from leekelleher/feature-patch-courier-dataresolver
Tweaks to support a Courier DataResolver
2014-02-14 09:29:57 -05:00
leekelleher bbe3506747 Housekeeping: Fixed up the whitespace :bowtie:
There was a mix of tabs & spaces...
... normalized to use spaces (which was painful for me as I'm a "tabs kinda guy" 🤘
2014-02-13 17:50:07 +00:00
leekelleher 42743b1394 Fleshed out the ArchetypePreValue models.
(When Courier packages up the DataTypeDefinition - we need to serialize/deserialize the config options/JSON)
2014-02-13 17:43:52 +00:00
leekelleher 9a712acd6a Added constant for the prevalue alias.
(As we reference to this in the Courier DataResolver)
2014-02-13 17:30:28 +00:00
leekelleher 4c8bbd5d8f Added a nested try/catch.
For if the `PublishedPropertyType` value is null, we can still get an `Archetype` model returned)
2014-02-13 16:53:38 +00:00
leekelleher 9296388abe Added a constant for the PropertyEditor alias.
(So that we can reference it from the Courier DataResolver, without fear of typos)
2014-02-13 16:51:31 +00:00
leekelleher 3c5e2013a0 Added JsonProperty attributes to the properties.
(So that we can serialize/deserialize from the Courier DataResolver)
2014-02-13 16:32:03 +00:00
leekelleher aacbc06992 Changed the Property.DataTypeId property to be public, with an internal setter.
(We need to reference it within Courier's DataResolver)
2014-02-13 16:27:29 +00:00