sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1429 commits 3 branches 0 tags 1.6 GiB
Commit graph

1429 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Saewitz
b8d43fabcc wip 2013-02-21 20:38:12 -05:00
Daniel Saewitz
08d57e32ff wip 2013-02-21 20:17:23 -05:00
Tyler Renelle
8fe548f703 match derbyAuth errback on invalidated session 2013-02-21 17:06:22 -05:00
Daniel Saewitz
ddff29ccf0 wip 2013-02-21 14:18:53 -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
Daniel Saewitz
b92145f5a3 wip 2013-02-20 20:07:05 -05:00
Daniel Saewitz
905e728c70 Merge branch 'develop' of github.com:lefnire/habitrpg into api 2013-02-20 20:05:06 -05:00
Daniel Saewitz
f75e3662b9 wi[ 2013-02-20 20:04:09 -05: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
lancemanfv
5142a78bee Update src/app/tasks.coffee 
20/02/13 Added a check for undefined value, more at https://github.com/lefnire/habitrpg/issues/463 -lancemanfv
 2013-02-20 23:29:06 +02:00
Tyler Renelle
1a04414571 Merge pull request #461 from switz/favicon 
@lefnire => Add favicon support
 2013-02-20 11:16:58 -08:00
Daniel Saewitz
094a5d9599 Add favicon support 2013-02-20 13:36:57 -05:00
Daniel Saewitz
897cd3f2bb wip 2013-02-20 13:35:21 -05:00
Tyler Renelle
a644b572c4 add link to addons / extensions 2013-02-19 21:58:10 -05:00
Tyler Renelle
eee1983769 remove kickstarter notification stuff 2013-02-19 21:57:33 -05:00
Daniel Saewitz
7fe4f06f0c Merge pull request #432 from switz/middleware 
@lefnire => Clean up middleware
 2013-02-19 18:01:11 -08:00
Daniel Saewitz
40036109ef Fix merge errors 2013-02-19 21:00:29 -05:00
Daniel Saewitz
2e11c0e82b Merge 2013-02-19 20:59:49 -05:00
Daniel Saewitz
484b043ec8 Merge branch 'master' of github.com:lefnire/habitrpg into middleware 2013-02-19 20:58:47 -05:00
Daniel Saewitz
b1f7c3cdfa Merge pull request #430 from switz/api 
@lefnire => Move api into separate file with new express API
 2013-02-19 17:58:11 -08:00
Daniel Saewitz
a777f6ce60 Fix indentation 2013-02-19 20:57:33 -05:00
Tyler Renelle
66a7716b4a add comments about unsubscribe issues 2013-02-19 19:36:57 -05:00
Tyler Renelle
223355fecb try without unsubscribe 2013-02-19 18:49:57 -05:00
Daniel Saewitz
bcebecb782 Merge branch 'master' of github.com:lefnire/habitrpg into api 2013-02-19 18:19:42 -05:00
Tyler Renelle
08ec9a510e only one subscribe if user solo 2013-02-19 17:33:34 -05:00
Tyler Renelle
6229a8e5bb model.fetch party, change members array, then push 2013-02-19 17:08:48 -05:00
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