Tyler Renelle 19b6eb73e0 Merge branch 'develop' into classes ... Conflicts: public/css/index.styl src/models/user.js views/options/profile.jade views/shared/header/avatar.jade views/shared/tasks/lists.jade views/shared/tasks/task.jade		2013-12-02 18:24:33 -07:00
..
achievements.jade	contrib: links to wikia in tavern & popup	2013-11-08 19:28:07 -08:00
buy-gems.jade	typo in donate page	2013-10-22 20:55:55 -07:00
classes.jade	classes WIP	2013-11-23 16:59:41 -07:00
death.jade	On further thought, "Equipment" is better than "Gear." Also fixed a typo.	2013-11-17 10:01:27 -06:00
index.jade	classes WIP	2013-11-23 16:59:41 -07:00
login.jade	rewrite: push login modal to the front page, don't allow anonymous	2013-09-02 01:08:28 -04:00
members.jade	removed comments from testing.	2013-11-23 11:14:16 -08:00
new-stuff.jade	thanksgiving turkey & npcs	2013-11-27 11:50:18 -07:00
pets.jade	mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress	2013-11-10 11:04:41 -08:00
reroll.jade	paypal: conslidate buy gems modals	2013-10-12 16:51:01 -07:00
settings.jade	classes: armory WIP	2013-11-30 16:33:21 -07:00