Commit graph

1357 commits

Author SHA1 Message Date
Philip How
55faeda4e0 Notification changes to .coffees 2013-02-27 23:26:53 -05:00
Philip How
76fd1336da Notification style sheets 2013-02-27 23:26:51 -05:00
Tyler Renelle
76d84a392e Merge remote-tracking branch 'ruddfawcett/master' into develop 2013-02-27 22:36:13 -05:00
Tyler Renelle
bc46b9159a add change password 2013-02-27 22:23:08 -05:00
Rudd Fawcett
48fdcc9edb icons 2013-02-27 22:21:16 -05:00
Rudd Fawcett
f13e46fb9c Icons v2 2013-02-27 22:19:10 -05:00
Tyler Renelle
f787df9c19 change default icons for ipods / iphons 2013-02-27 20:53:55 -05:00
Tyler Renelle
e7ddfb8892 move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule) 2013-02-27 20:24:57 -05:00
Tyler Renelle
376d2d88de Merge branch 'master' into develop 2013-02-27 20:18:17 -05:00
Tyler Renelle
f2cfe2436e Merge branch 'develop' 2013-02-27 18:11:09 -05:00
Tyler Renelle
a06574e73f Merge pull request #535 from MrConcept/notifications
Notifications
2013-02-27 14:52:21 -08:00
Philip How
3982b754d0 Notification changes to .coffees 2013-02-27 22:46:21 +00:00
Philip How
c68b337403 Notification style sheets 2013-02-27 22:41:36 +00:00
Tyler Renelle
18c0d4e6aa pin coffeescript 2013-02-27 17:11:10 -05:00
Tyler Renelle
c9a7330002 unlock parties for users who get invited, regardless of level 2013-02-27 16:40:17 -05:00
Tyler Renelle
9a0ac02102 fixes to party bugs 2013-02-27 16:21:06 -05:00
Tyler Renelle
811d6de107 fix to previous - don't do it dynamically, do it on save 2013-02-27 09:15:06 -05:00
Tyler Renelle
01182b377d add a self-serve restore modal for users who want to restore their stats 2013-02-27 09:07:51 -05:00
Tyler Renelle
203e0a124a proper stripe ajax formatting 2013-02-26 17:41:51 -05:00
Tyler Renelle
7c0abe4a47 remove "testing party bug" 2013-02-26 16:54:31 -05:00
Tyler Renelle
9b20d8ceba move scoring to its own class (attempt to remove model from hanging
around in closure on server, which is what's causing our memory leak -
see http://goo.gl/7Gt0M)
2013-02-26 16:51:00 -05:00
Tyler Renelle
63392d644f use derby-auth new findOne() motif spec (aka, no more
res.at(0).get()). Also, try tripple subscription on parties instead of
multiple individual subs
2013-02-26 16:37:47 -05:00
Tyler Renelle
0a3fc9f715 instructions on running node-webkit-agent for debugging memory leaks 2013-02-26 12:42:53 -05:00
Tyler Renelle
7c480124cf show infinite stack trace in development 2013-02-26 12:10:23 -05:00
Tyler Renelle
06da720dfb return next(err) for errors in subscription callbacks. Also, try
reloading the page when userObj? is null (bustedSession victims. See
the comments)
2013-02-25 18:59:14 -05:00
Tyler Renelle
89e5ec2d10 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-02-25 18:36:07 -05:00
Tyler Renelle
24dbae3a41 update config.json.exampl for default mongo db 2013-02-25 18:34:11 -05:00
Tyler Renelle
c58df43c84 Merge branch 'develop' 2013-02-25 15:30:43 -05:00
Tobias Leugger
f154a3ba66 Fixing all casper tests except registration and rest 2013-02-23 19:06:48 +01:00
Tyler Renelle
2641670ebe add check on isServer in busted session, accept(false) 2013-02-22 13:48:39 -05:00
Tyler Renelle
b15654b18b fix to previous 2013-02-22 12:52:07 -05:00
Tyler Renelle
554ec66a71 for now accept invalidated sessions in sotre 2013-02-22 12:46:23 -05:00
Tyler Renelle
4f5ebf31d3 remove nodetime, freeze browserify@1.17.3 2013-02-22 00:08:49 -05:00
Tyler Renelle
603733848b remove nodetime, freeze browserify@1.17.3 2013-02-22 00:08:40 -05:00
Tyler Renelle
c6efcea9cf check invalidated session on somre more paths 2013-02-21 21:06:29 -05:00
Tyler Renelle
8fe548f703 match derbyAuth errback on invalidated session 2013-02-21 17:06:22 -05:00
Tyler Renelle
2d04dd4cb9 when redirecting to /?play=1, we get access-denied for
model.session.userId for some reason. seems user initialization
happens during that process, so we just do another page refresh and
we're good
2013-02-21 13:40:03 -05:00
Tyler Renelle
a649863308 try only allowing _userId subscriptions on client routes (memory leak
attempt, see see http://goo.gl/TPYIt)
2013-02-21 12:45:30 -05:00
Tyler Renelle
6e0caa6e7a try only allowing _userId subscriptions on client routes (memory leak
attempt, see see http://goo.gl/TPYIt)
2013-02-21 12:45:05 -05:00
Tyler Renelle
7781e4b578 Merge branch 'master' into develop 2013-02-21 11:21:37 -05:00
Tyler Renelle
b7dfc21bac test '_userId' instead of session.userId 2013-02-21 11:21:32 -05:00
Tyler Renelle
1de9d303d8 test '_userId' instead of session.userId 2013-02-21 11:21:14 -05:00
Tyler Renelle
61ec5c19da Merge branch 'master' of github.com:lefnire/habitrpg 2013-02-21 10:34:24 -05:00
Tyler Renelle
29770fbc0e chagne some wording on splash & 500.html 2013-02-21 10:33:44 -05:00
Tyler Renelle
4d0d5d3dc9 remove more kickstarter stuff 2013-02-21 10:31:52 -05:00
Stan Lindsey
d28ae976fa Update src/app/items.coffee 2013-02-21 02:26:31 +00:00
Stan Lindsey
843ead6de9 Update src/app/items.coffee 2013-02-21 02:26:15 +00:00
Tyler Renelle
f3eb07a537 Merge pull request #464 from lancemanfv/master
Issue #463 fix (adding empty tasks)
2013-02-20 16:03:01 -08:00
Tyler Renelle
0842883027 Merge pull request #469 from toebu/casper-tests
Fixing the dailies and todos casper test (now even with working cron tests)
2013-02-20 16:02:02 -08:00
Tobias Leugger
68282f4cd3 Fixing the dailies and todos casper test (now even with working cron tests) 2013-02-21 00:56:27 +01:00