Merge branch 'master' into b-dynamic-country-confirm

transparencyint · Mar 6, 2013 · 9ffb308 · 9ffb308
2 parents a4b7e54 + 4ba5dc1
commit 9ffb308
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/app/views/actor_group_actor_view.js b/app/views/actor_group_actor_view.js
@@ -32,8 +32,12 @@ module.exports = DraggableView.extend({
     // don't remove
   },
 
-  dragByDelta: function(dx, dy){
+  dragStart: function(event){
     if(!this.cloned) this.clone();
+    DraggableView.prototype.dragStart.call(this, event);
+  },
+
+  dragByDelta: function(dx, dy){
     this.model.moveByDelta(dx, dy);
   },
 

diff --git a/app/views/templates/index.eco b/app/views/templates/index.eco
@@ -30,6 +30,6 @@
     <% else: %>
       <a href="/login/">Login</a>
     <% end %>
-      <a href="http://www.transparency.org/privacy">Privacy</a><a href="http://www.transparency.org/terms">Terms</a><a href="http://www.transparency.org/impressum">Impressum</a>
+      <a href="http://www.transparency.org/privacy">Privacy</a><a href="http://www.transparency.org/terms">Terms</a><a href="http://www.transparency.org/impressum">Imprint</a>
   </div>
 </footer>
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "author": "Your Name",
     "name": "cgip",
     "description": "Package description",
-    "version": "0.0.1-9",
+    "version": "0.0.1-11",
     "engines": {
         "node": "0.8.x"
     },