From 26828bb6f364fc122a9eb4c907e7304b524ee4ab Mon Sep 17 00:00:00 2001 From: jelhan Date: Sun, 6 Jul 2014 18:06:25 +0200 Subject: [PATCH] Smaller Fixes --- app/index.html | 185 +++++++++++++++++++++++------------------- bower.json | 8 +- nbproject/project.xml | 2 +- 3 files changed, 108 insertions(+), 87 deletions(-) diff --git a/app/index.html b/app/index.html index 4cae96b..6df70d1 100644 --- a/app/index.html +++ b/app/index.html @@ -1,104 +1,125 @@ - - - - - Croodle + + + + Croodle + + - - - + + + - - - + - - + - - - - - - - - - - - - - - - + + - - + - - + - - - - - - - - - - + + + - + - + - - - - + - + + - + + + + + + + + - - - - - - - - + + + + + + - -
-
- - - - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + + + + + + + + \ No newline at end of file diff --git a/bower.json b/bower.json index 0c1c011..6fa8178 100644 --- a/bower.json +++ b/bower.json @@ -1,11 +1,11 @@ { "name": "croodle", "dependencies": { - "handlebars": "~1.1.2", - "jquery": "~1.9.1", + "handlebars": "~1.3.0", + "jquery": "~1.10.2", "qunit": "~1.12.0", "ember-qunit": "https://github.com/rpflorence/ember-qunit.git#master", - "ember": "~1.5.0", + "ember": "~1.6.0-beta.5", "ember-data": "~1.0.0-beta.7", "ember-resolver": "~0.1.1", "ic-ajax": "~1.0.4", @@ -14,7 +14,7 @@ "ember-load-initializers": "git://github.com/stefanpenner/ember-load-initializers.git#0.0.1", "moment": "~2.7.0", "sjcl": "~1.0.0", - "ember-validations": "http://builds.dockyard.com.s3.amazonaws.com/ember-validations/tags/1-0-beta-2/ember-validations.min.js", + "ember-validations": "http://builds.dockyard.com.s3.amazonaws.com/ember-validations/tags/1-0-beta-2/ember-validations.js", "bootstrap": "~3.2.0", "bootstrap-datepicker": "~1.3.0", "ember-forms": "*", diff --git a/nbproject/project.xml b/nbproject/project.xml index 7dd70e7..43ba180 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -3,7 +3,7 @@ org.netbeans.modules.php.project - croodle EAK + croodle