From 6d8770907c399632248552e3b4d6aa4793423cc6 Mon Sep 17 00:00:00 2001
From: kjac <kja@vertica.dk>
Date: Sat, 23 Jan 2016 14:55:11 +0100
Subject: [PATCH 1/3] Fix path to courier project

The gruntfile had a wrong path to the Courier project, which messed up
the grunt setup.
---
 Gruntfile.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 2f8b117..cf1ca49 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -279,7 +279,7 @@ module.exports = function(grunt) {
 
     assemblyinfo: {
       options: {
-        files: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj', 'app/Umbraco/Umbraco.Archetype/Archetype.Courier.csproj'],
+        files: ['app/Umbraco/Umbraco.Archetype/Archetype.Umbraco.csproj', 'app/Umbraco/Archetype.Courier/Archetype.Courier.csproj'],
         filename: 'VersionInfo.cs',
         info: {
           version: '<%= (pkgMeta.version.indexOf("-") > 0 ? pkgMeta.version.substring(0, pkgMeta.version.indexOf("-")) : pkgMeta.version) %>', 

From 188c09d3c1ecab8ee852b7228a7213eb9a61920f Mon Sep 17 00:00:00 2001
From: kjac <kja@vertica.dk>
Date: Sat, 23 Jan 2016 14:56:28 +0100
Subject: [PATCH 2/3] Fix issue #323

Made the config dialogs do "live editing" instead of working on a copy
of the config model.
---
 app/controllers/config.controller.js               | 1 -
 app/controllers/config.dialog.controller.js        | 2 +-
 app/views/archetype.config.developer.dialog.html   | 8 ++------
 app/views/archetype.config.fieldset.dialog.html    | 8 ++------
 app/views/archetype.config.stylescript.dialog.html | 8 ++------
 5 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/app/controllers/config.controller.js b/app/controllers/config.controller.js
index 615d45e..47c54b9 100644
--- a/app/controllers/config.controller.js
+++ b/app/controllers/config.controller.js
@@ -314,7 +314,6 @@ angular.module("umbraco").controller("Imulus.ArchetypeConfigController", functio
             template: template,
             show: true,
             callback: function(data) {
-                $scope.archetypeConfigRenderModel = data;
             },
             dialogData: $scope.archetypeConfigRenderModel
         });
diff --git a/app/controllers/config.dialog.controller.js b/app/controllers/config.dialog.controller.js
index c057730..1661ea0 100644
--- a/app/controllers/config.dialog.controller.js
+++ b/app/controllers/config.dialog.controller.js
@@ -1,5 +1,5 @@
 angular.module('umbraco').controller('ArchetypeConfigOptionsController', function ($scope) {
-	$scope.model = angular.copy($scope.dialogData);
+    $scope.model = $scope.dialogData;
 
     //handles a fieldset group add
     $scope.addFieldsetGroup = function () {
diff --git a/app/views/archetype.config.developer.dialog.html b/app/views/archetype.config.developer.dialog.html
index 5571427..d5dacbb 100644
--- a/app/views/archetype.config.developer.dialog.html
+++ b/app/views/archetype.config.developer.dialog.html
@@ -20,12 +20,8 @@
     <div class="umb-panel-footer">
         <div class="umb-el-wrap umb-panel-buttons">
             <div class="btn-toolbar umb-btn-toolbar pull-right">
-                <a href="" ng-click="close()" class="btn btn-link">
-                    <localize key="general_cancel" class="ng-isolate-scope ng-scope">Cancel</localize>
-                </a>
-
-                <button class="btn btn-primary" ng-click="apply()">
-                    <archetype-localize key="button_apply">Apply</archetype-localize>
+                <button class="btn" ng-click="apply()">
+                    <archetype-localize key="button_close">Close</archetype-localize>
                 </button>
             </div>
         </div>
diff --git a/app/views/archetype.config.fieldset.dialog.html b/app/views/archetype.config.fieldset.dialog.html
index 1c263ab..5c062e5 100644
--- a/app/views/archetype.config.fieldset.dialog.html
+++ b/app/views/archetype.config.fieldset.dialog.html
@@ -53,12 +53,8 @@
     <div class="umb-panel-footer">
         <div class="umb-el-wrap umb-panel-buttons">
             <div class="btn-toolbar umb-btn-toolbar pull-right">
-                <a href="" ng-click="close()" class="btn btn-link">
-                    <localize key="general_cancel" class="ng-isolate-scope ng-scope">Cancel</localize>
-                </a>
-
-                <button class="btn btn-primary" ng-click="apply()">
-                    <archetype-localize key="button_apply">Apply</archetype-localize>
+                <button class="btn" ng-click="apply()">
+                    <archetype-localize key="button_close">Close</archetype-localize>
                 </button>
             </div>
         </div>
diff --git a/app/views/archetype.config.stylescript.dialog.html b/app/views/archetype.config.stylescript.dialog.html
index a987b99..3df7ac9 100644
--- a/app/views/archetype.config.stylescript.dialog.html
+++ b/app/views/archetype.config.stylescript.dialog.html
@@ -22,12 +22,8 @@
     <div class="umb-panel-footer">
         <div class="umb-el-wrap umb-panel-buttons">
             <div class="btn-toolbar umb-btn-toolbar pull-right">
-                <a href="" ng-click="close()" class="btn btn-link">
-                    <localize key="general_cancel" class="ng-isolate-scope ng-scope">Cancel</localize>
-                </a>
-
-                <button class="btn btn-primary" ng-click="apply()">
-                    <archetype-localize key="button_apply">Apply</archetype-localize>
+                <button class="btn" ng-click="apply()">
+                    <archetype-localize key="button_close">Close</archetype-localize>
                 </button>
             </div>
         </div>

From 13b59d0d61545419b92b10d1bb8a233083bba17f Mon Sep 17 00:00:00 2001
From: kgiszewski <kevin@giszewski.com>
Date: Thu, 4 Feb 2016 11:20:44 -0500
Subject: [PATCH 3/3] Bump version to v1.12.3

---
 app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs | 4 ++--
 config/meta.json                                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
index d1253d4..f7b7bb7 100644
--- a/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
+++ b/app/Umbraco/Umbraco.Archetype/Properties/VersionInfo.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("1.12.2")]
-[assembly: AssemblyFileVersion("1.12.2")]
+[assembly: AssemblyVersion("1.12.3")]
+[assembly: AssemblyFileVersion("1.12.3")]
diff --git a/config/meta.json b/config/meta.json
index 8329404..ea78cd6 100644
--- a/config/meta.json
+++ b/config/meta.json
@@ -1,6 +1,6 @@
 {
 	"name": "Archetype",
-	"version": "1.12.2",
+	"version": "1.12.3",
 	"url": "http://github.com/imulus/archetype/",
 	"author": "Imulus - Kevin Giszewski - Tom Fulton - Lee Kelleher - Matt Brailsford - Kenn Jacobsen - Et. Al.",
 	"authorUrl": "http://imulus.com/",