Merge pull request #6 from lefnire/develop

Update my develop copy

.gitmodules

@@ -1,18 +1,6 @@
-[submodule "public/vendor/bootstrap-datepicker"]
-	path = public/vendor/bootstrap-datepicker
-	url = https://github.com/eternicode/bootstrap-datepicker.git
-[submodule "public/vendor/bootstrap-growl"]
-	path = public/vendor/bootstrap-growl
-	url = https://github.com/ifightcrime/bootstrap-growl.git
-[submodule "public/vendor/bootstrap"]
-	path = public/vendor/bootstrap
-	url = https://github.com/twitter/bootstrap.git
 [submodule "public/vendor/github-buttons"]
 	path = public/vendor/github-buttons
 	url = https://github.com/mdo/github-buttons.git
-[submodule "public/vendor/jquery-cookie"]
-	path = public/vendor/jquery-cookie
-	url = https://github.com/carhartl/jquery-cookie.git
 [submodule "public/vendor/jquery-ui"]
 	path = public/vendor/jquery-ui
 	url = https://github.com/jquery/jquery-ui.git

CHANGELOG.md

@@ -1,2 +1,12 @@
-3/3/2013
+## 3/21/2013
+ * More design tweaks to header & avatars: https://github.com/lefnire/habitrpg/issues/585
+
+## 3/20/2013
+ * New Design: https://github.com/lefnire/habitrpg/issues/585
+ * Toggle helm visible: https://trello.com/card/toggle-helm-visible/50e5d3684fe3a7266b0036d6/153
+ * Toggle Header: https://trello.com/card/toggle-header/50e5d3684fe3a7266b0036d6/241
+ * Deletable Accounts: https://trello.com/card/deletable-accounts/50e5d3684fe3a7266b0036d6/69
+ * Undo Button: https://trello.com/card/undo-button/50e5d3684fe3a7266b0036d6/20
+
+## 3/3/2013
  * Add custom day start: https://trello.com/card/custom-day-start/50e5d3684fe3a7266b0036d6/15

locales/en/app.json

@@ -0,0 +1,10 @@
+{
+  "Habit": "Habit",
+  "Daily": "Daily",
+  "Todo": "Todo",
+  "Reward": "Reward",
+  "Habits": "Habits",
+  "Dailies": "Dailies",
+  "Todos": "Todos",
+  "Rewards": "Rewards"
+}

locales/he/app.json

@@ -0,0 +1,10 @@
+{
+  "Habit": "Habit",
+  "Daily": "Daily",
+  "Todo": "Todo",
+  "Reward": "Reward",
+  "Habits": "נווו קדימה!",
+  "Dailies": "Dailies",
+  "Todos": "Todos",
+  "Rewards": "Rewards"
+}

package.json

@@ -26,7 +26,8 @@
     "superagent": "~0.12.4",
     "resolve": "~0.2.3",
     "browserify": "1.17.3",
-    "expect.js": "~0.2.0"
+    "expect.js": "~0.2.0",
+    "derby-i18n": "0.0.1"
   },
   "private": true,
   "subdomain": "habitrpg",