Commit graph

25741 commits

Author SHA1 Message Date
Tyler Renelle
fc49e57201 try model.fetches for party members for now, with browser refreshes. 2013-02-19 16:49:38 -05:00
Tyler Renelle
14fb52c11e put date-picker back in 2013-02-19 13:43:10 -05:00
Tyler Renelle
f0f565e5cc put reset dom back in 2013-02-19 13:38:26 -05:00
Tyler Renelle
90af514fbc try removing datepicker and moving browser stuff to the bottom 2013-02-19 12:57:41 -05:00
Tyler Renelle
dc20272217 include less jquery-ui, more bootstrap 2013-02-19 12:26:51 -05:00
Tyler Renelle
41b5ef3141 add "resolve": "~0.2.3". browserify seems to not include validator
properly, under derby-auth. @switz found this resolve version to be
updated in recent racer commit causing the issue. we need to figure
out what in derby-auth is incompatible here
2013-02-18 23:39:50 -05:00
Tyler Renelle
5698db29fb unsubscribe to first selfQ query (we subscribe to it twice for a
reason in the comments, it's jank)
2013-02-18 21:53:50 -05:00
Daniel Saewitz
f229145aae Remove serverRoutes 2013-02-18 20:32:19 -05:00
Daniel Saewitz
e4622803c9 Remove serverRoutes 2013-02-18 20:14:43 -05:00
Daniel Saewitz
5ea38e3fc4 merge 2013-02-18 20:12:06 -05:00
Daniel Saewitz
4a28d25d5d Align comments 2013-02-18 19:53:48 -05:00
Daniel Saewitz
0945434dda Update to most recent codebase 2013-02-18 19:15:35 -05:00
Daniel Saewitz
425b8aa870 Merge 2013-02-18 19:11:29 -05:00
Tyler Renelle
c3a5401a93 add nodetime for profiling production 2013-02-18 16:09:41 -05:00
Daniel Saewitz
52e5b42ad5 Reorder some code around 2013-02-18 16:09:05 -05:00
Daniel Saewitz
8c41425462 Cleanup middleware 2013-02-18 16:06:52 -05:00
Daniel Saewitz
3372750f94 Move large middleware to separate file for cleanliness 2013-02-18 16:00:46 -05:00
Daniel Saewitz
c6db2c0578 Remove parens 2013-02-18 15:56:05 -05:00
Daniel Saewitz
330fed17c4 Added comment 2013-02-18 15:54:21 -05:00
Daniel Saewitz
32327b427a Move api and other routes into separate files 2013-02-18 15:45:31 -05:00
Tyler Renelle
15bf49dc43 try removing unsubscribe 2013-02-18 15:26:10 -05:00
Tyler Renelle
be4c05ca4f use new derby-auth store construction - has to happen before
middleware setup
2013-02-18 14:15:45 -05:00
Tyler Renelle
c0a21ac08d back to model.subscribe, gonna play with some other thingsc 2013-02-18 13:40:09 -05:00
Tyler Renelle
daac7f424f temp fix for withId query motif not being defined (just fetch parties,
don't subscribe to them). Note this isn't fully functional, it's a
hotfix to patch the major errors
2013-02-18 12:49:53 -05:00
Tyler Renelle
c8c6050f59 remove celebration alert 2013-02-18 01:35:17 -05:00
Tyler Renelle
881847b13a remove debugger 2013-02-17 15:18:10 -05:00
Tyler Renelle
22ac8e1d16 add faux achievements, fix error page 2013-02-17 15:07:56 -05:00
Tyler Renelle
1757f137f0 add BrowserQuest as submodule in public/vendor 2013-02-17 14:43:12 -05:00
Tyler Renelle
dc3f708e0d comment out gcal link for now 2013-02-17 14:37:17 -05:00
Tyler Renelle
20ee3ffb62 remove cron taskObj? workaround since we're cleaning null tasks on load 2013-02-17 14:37:04 -05:00
Tyler Renelle
4bdbbfe764 fix to corrupted tasks - remove them when cleaning the user 2013-02-17 14:16:58 -05:00
Tyler Renelle
fc1ccfa953 hacked datepicker into working 2013-02-17 13:58:16 -05:00
Tyler Renelle
77f49f9bd8 todo comment 2013-02-17 13:18:55 -05:00
Tyler Renelle
57b8f2920f use derby & racer #habitrpg 2013-02-17 13:10:00 -05:00
Tyler Renelle
12a452a571 cron fix for borked tasks 2013-02-17 12:55:10 -05:00
Tyler Renelle
3aef9f1ac0 Merge branch 'master' into develop 2013-02-17 12:32:15 -05:00
Tyler Renelle
626745bb66 Merge branch 'master' of github.com:lefnire/habitrpg 2013-02-17 12:21:16 -05:00
Tyler Renelle
8a606b627a handle _.where bug for corrupt tasks 2013-02-17 12:21:07 -05:00
Tyler Renelle
6e307e0f6d handle _.where bug for corrupt tasks 2013-02-17 12:20:18 -05:00
Tyler Renelle
c14bc8ef76 Merge pull request #410 from Shaners/master
75 New Pet Sprites, 1 New Mount
2013-02-17 09:12:08 -08:00
Tyler Renelle
a4c508e905 Merge pull request #412 from toebu/casper-tests
Fixing the dailies casper tests (almost). Found out that the main problem...
2013-02-17 09:11:58 -08:00
Tobias Leugger
48656ed8fa Fixing the dailies casper tests (almost). Found out that the main problem why most tests aren't working: the derby app seems to need some time after a click/action before the model is updated. This means sometime the user object was completely empty. I've introduced a short wait before retrieving the model that fixes this problem. 2013-02-17 17:55:30 +01:00
Shane Lister
ca41e1dab6 75 New Pets, 1 New Mount
Mainly just colour variations for the previously made pets. 1 New pet
and 1 new Mount.
2013-02-17 02:57:08 -08:00
Tyler Renelle
0669511ebe Merge branch 'master' into develop 2013-02-17 02:46:36 -05:00
Tyler Renelle
cc6b6775fc fix assets on splash 2013-02-17 02:46:34 -05:00
Tyler Renelle
eb56efb0dc for now remove badges section of profile 2013-02-17 01:55:17 -05:00
Tyler Renelle
a3ef2e1977 temporary method for active profile username - {#if} on private paths
in derby seems iffy
2013-02-17 01:51:40 -05:00
Tyler Renelle
6dafefc45a show profile for the individual you clicked 2013-02-17 01:31:10 -05:00
Tyler Renelle
4602e0bf5b more separation 2013-02-17 00:55:52 -05:00
Tyler Renelle
dd5f2f7a12 move more html files around 2013-02-17 00:45:17 -05:00