cankoluman d8378ed6bb Merge remote-tracking branch 'origin/dev/AR-1_serialization' into dev/AR-8_line_endings ...

Conflicts:
	app/Umbraco/Archetype.Tests/Serialization/UseCases/ArchetypeJsonConverterTest.cs
	app/Umbraco/Archetype.Tests/Serialization/UseCases/Complex/ArchetypeJsonConverterTest.cs
	app/Umbraco/Archetype.Tests/Serialization/UseCases/JsonTestModels.cs
	app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj
	app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
	app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
	app/Umbraco/Umbraco.Archetype/Serialization/ArchetypeJsonConverter.cs
	app/Umbraco/Umbraco.Archetype/Serialization/AsArchetypeAttribute.cs
	app/Umbraco/Umbraco.Archetype/Serialization/AsFieldsetAttribute.cs
	app/Umbraco/Umbraco.Archetype/Serialization/SerializationExtensions.cs

2014-06-27 12:42:40 +01:00

..

controllers

Refactor property aliases for uniqueness

2014-06-23 20:58:42 -04:00

directives

Merge branch 'master' into fix/unique-aliases

2014-06-25 21:49:24 -04:00

langs

Issue #116: Add RegEx validation support

2014-05-12 19:09:27 +02:00

less

Fix 'hide property label'

2014-06-25 08:34:54 -04:00

resources

Merge branch 'develop' into feature/discover-datatypes

2014-04-03 13:46:56 -04:00

services

WIP on switching to a directive based localization

2014-02-07 16:00:47 -05:00

Umbraco

Merge remote-tracking branch 'origin/dev/AR-1_serialization' into dev/AR-8_line_endings

2014-06-27 12:42:40 +01:00

views

Update field labels to match new property alias scheme

2014-06-25 22:03:22 -04:00