Tyler Renelle a3003a758d Merge branch 'tags' into develop ...

Conflicts:
	src/app/index.coffee
	src/app/tasks.coffee
	styles/app/index.styl
	views/app/index.html
	views/app/settings.html
	views/app/tasks.html

2013-05-06 14:01:43 +01:00

..

alerts.html

wording update

2013-05-04 11:45:51 +01:00

avatar.html

adjust achievement view logic for previous commit

2013-05-04 16:41:07 +01:00

filters.html

add tag-editing context (add new, delete). still have to refresh after everything, do to the live-bound each bug

2013-03-18 20:25:01 -04:00

footer.html

rename _view.* to _* - don't know why I did that whole _view.* thing

2013-04-07 20:29:13 -04:00

game-pane.html

Merge develop and add functionality to party chat

2013-05-05 13:07:36 -04:00

header.html

don't show stats popover for main user

2013-05-03 10:56:51 +01:00

index.html

Merge branch 'tags' into develop

2013-05-06 14:01:43 +01:00

modals.html

begin implementing streaks

2013-05-03 18:20:28 +01:00

party.html

full username test in chat (_user.profile.name only part of the

2013-05-05 23:29:10 +01:00

pets.html

dynamic pets, fix #897

2013-05-05 13:54:32 +01:00

rewards.html

add backer, npc, and contributor achievements (still need to run

2013-05-04 14:24:37 +01:00

settings.html

settings in two panes rather than sub-tabs

2013-05-06 09:55:44 +01:00

tasks.html

Merge branch 'tags' into develop

2013-05-06 14:01:43 +01:00