Commit Graph

21 Commits

Author SHA1 Message Date
Tyler Renelle
7f1892b34a classes: move item-store sorting from web to shard (so we can share with
mobile) habitrpg-shared#6651665
2013-12-05 18:20:09 -07:00
Tyler Renelle
b9845aec4a classes: fixes to buying special-gear & regular gear habitrpg-shared#ee4777d 2013-12-05 15:48:50 -07:00
Tyler Renelle
62d50a1f4d classes: fixes to buying items 2013-12-04 23:10:14 -07:00
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
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Sabe Jones
6cc41c47c7 Work on standardizing terminology 2013-11-17 09:36:38 -06:00
Tyler Renelle
931e8125b4 [#1693] make revive available to /options too 2013-10-31 09:34:12 -07:00
Tyler Renelle
6e71a76e22 challenges: back to dealing with taskLists from scopes, rather than the
habitrpg-tasks directive. Was having trouble accessing it by reference
otherwise. Would love to move off of the directive entirely and use
ng-include instead, but some scope issues with lists
2013-10-29 19:07:39 -07:00
Tyler Renelle
a078889d58 challenges: sync score to challenge, lotsa bug fixes 2013-10-28 11:34:07 -07:00
Tyler Renelle
e45d8307e7 Subdocs & script templates. Migrate the API from User.tasks =>
User.habits/dailys/todos/rewards. Move /#/tasks & /#/options page
loading from server-sent html to everything loaded in the page as script
templates (including necessary fixes for adsense). NOTE: this commit
won't work, it depends a bit on the *next* commit with Challenges
functionality, but I wanted to separate it out a bit for clarity
2013-10-28 11:34:07 -07:00
Matteo Pagliazzi
211433858c correctly remove tag from task 2013-10-24 17:50:35 +02:00
Matteo Pagliazzi
c4882942d6 fix chart shown below task edit form 2013-10-21 20:41:19 +02:00
Tyler Renelle
cef8431af0 charts: port toggleChart back in (functional, but it's not getting the
right width)
2013-10-19 16:15:48 -07:00
Matteo Pagliazzi
993a255c46 may be fix for #1560 2013-09-22 17:29:16 +02:00
Matteo Pagliazzi
55661a6659 typo 2013-09-20 18:05:01 +02:00
Matteo Pagliazzi
2c2367cf7c update store, fix #1553 2013-09-20 18:04:20 +02:00
Tyler Renelle
36b3a77877 [#1397 #1543 #1540] start adding in unlock notifications (working for some, not for all). Also some tour & header fixes 2013-09-17 14:10:10 -04:00
Tyler Renelle
9d633eceaf [#1394] bug fixes 2013-09-17 12:04:46 -04:00
Tyler Renelle
0fc413f3b7 [#1394] move notifications from controller to service, lots of notification
fixes, put streak notification back in
2013-09-17 11:43:05 -04:00
Matteo Pagliazzi
7cd075d787 initial grunt support, gzip enabled 2013-09-06 19:19:43 +02:00