Tyler Renelle fa89b20dd5 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
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

2013-03-21 12:36:05 -06:00

..

alerts.html

add general "new stuff" notification, linking to changelog

2013-03-21 10:31:23 -06:00

avatar.html

Merge branch 'develop' into zakkain-ui-tweaks

2013-03-21 12:36:05 -06:00

footer.html

copyright 2013

2013-03-20 09:36:50 -06:00

header.html

Merge branch 'develop' into zakkain-ui-tweaks

2013-03-21 12:36:05 -06:00

index.html

Merge branch 'develop' into zakkain-ui-tweaks

2013-03-21 12:36:05 -06:00

modals.html

add missing namespaces for rewards & tasks for consistency & organization

2013-03-16 19:22:53 -04:00

party.html

move party stats to a modal

2013-03-15 17:30:50 -04:00

rewards.html

move rewards column into rewards rewards.html

2013-03-18 16:47:03 -04:00

settings.html

Merge branch 'develop' into zakkain-ui-tweaks

2013-03-21 12:36:05 -06:00

tasks.html

Merge branch 'develop' of github.com:lefnire/habitrpg into develop

2013-03-18 21:51:54 -06:00