Skip to content

Commit

Permalink
Merge branch 'develop' into zakkain-ui-tweaks
Browse files Browse the repository at this point in the history
Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks

Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank

Conflicts:
	styles/app/tasks.styl
  • Loading branch information
lefnire committed Mar 21, 2013
2 parents fa94bef + 7c77126 commit fa89b20
Show file tree
Hide file tree
Showing 32 changed files with 1,356 additions and 258 deletions.
12 changes: 0 additions & 12 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,9 @@
3/3/2013
## 3/21/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
Loading

0 comments on commit fa89b20

Please sign in to comment.