Tom Fulton a0ff42a84f Merge branch 'master' into fix/unique-aliases ...

Conflicts:
	app/views/archetype.default.html

2014-06-25 21:49:24 -04: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

Fix code formatting

2014-06-20 11:06:33 +02:00

views

Merge branch 'master' into fix/unique-aliases

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