Commit graph

345 commits

Author SHA1 Message Date
Tyler Renelle
878bf3f72a remove commented-out force-ssl, since we're handling it in nginx. refer back here if needed again 2013-04-18 16:55:04 -04:00
Tyler Renelle
3772672e95 move task-corruption cleanup to the browser. @yangit see if this fixes
the freeze on your end?
2013-04-18 16:52:47 -04:00
Tyler Renelle
47d2e299db only do batch.commit() for corruptedTasks if corruption was found 2013-04-18 16:32:30 -04:00
Tyler Renelle
7e0329ef3a move all feature-unlocking popover notifications into unlock.coffee,
so we can better manage from one location and share some code. @switz
notice my change to scoring.coffee - see the comment added for the
reasoning. This before/after checking change is required for the
API
2013-04-16 13:46:44 -04:00
Tyler Renelle
3b3d4d243a better wasCorrupted test 2013-04-11 11:49:55 -04:00
Tyler Renelle
81eb2afd9d some more comments on corrupt tasks 2013-04-11 11:39:54 -04:00
Tyler Renelle
8ed72ae2aa back to transction for corruptTasks 2013-04-11 11:33:50 -04:00
Tyler Renelle
570f376421 more fixes to task corruption 2013-04-10 19:24:27 -04:00
Tyler Renelle
b736713624 alright, i give up. put the full restore/cleanup function back in.
refLists...
2013-04-10 18:32:38 -04:00
Tyler Renelle
761aeef8cf move task corruption cleanup back to server to solve #803. This might
pose a problem for #769, but it seems that websockets / nginx version
was the real culprit there.
2013-04-10 17:30:50 -04:00
Tyler Renelle
f6e53a377f some bug-fixes & cleanup on removal of _view.* 2013-04-08 11:24:45 -04:00
Tyler Renelle
9222b56777 move task-corruption cleanup to cron, restore missing tasks to list -
let's see if this fixes #777
2013-04-07 20:38:28 -04:00
Tyler Renelle
6522badaa6 rename _view.* to _* - don't know why I did that whole _view.* thing
in the first place, but whatevs
2013-04-07 20:29:13 -04:00
Tyler Renelle
584759bd25 shift some require() statements around, attempt to get things out of
app.coffee top-level scope - working towards mem leak fix
2013-04-04 16:44:54 -04:00
Tyler Renelle
1c2cc06a6e BREAKING CHANGE! this removes list cleanup / re-establishment. In the past, id-lists in refLists were being completely emptied (see #85 & #86). I'm still not sure why (see https://github.com/codeparty/racer/issues/101 or https://github.com/codeparty/derby/issues/237 possibly?). This commit reverts working around that issue, but potentially fixes #769. Going to test this on heroku a bit before merging in 2013-04-04 16:24:13 -04:00
Tyler Renelle
0abbc98b1c move all view helpers out of their respective files and into
helpers.coffee. we need viewHelpers at top-level scope, but nothing
else per se - this is preparation for memory leak fixing
2013-04-04 16:17:30 -04:00
Tyler Renelle
f6b2c08a60 Merge branch 'develop' into pets
Conflicts:
	views/app/rewards.html
2013-03-26 17:54:31 -07:00
Daniel Saewitz
8107200105 i18n implemented 2013-03-23 16:03:12 -04:00
Tyler Renelle
3ce2686662 Merge branch 'develop' into switz-inventory
Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
Merge branch 'develop' into switz-inventory

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
2013-03-21 13:51:38 -06:00
Tyler Renelle
0c1151b123 don't add bootstrap css files in when instantiating derby-ui-boostrap,
instead compile in with the css. index.coffee directives are run
against static pages too, which overwrites our bootstrap
responsive (which we need) with the app's custom responsive styles. We
may change this, but for now this commit allows us to keep the
marketing site and main site styles separate
2013-03-17 09:11:19 -04:00
Daniel Saewitz
7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Daniel Saewitz
510bcda47c wip 2013-03-08 12:44:21 -05:00
Zachary Kain
ce19fed852 remove responsive from bootstrap includes. Rolling our own! 2013-03-06 00:50:38 -05:00
Tyler Renelle
bd19e09fcf possible fix for #324 - shuffle some function placement to be sure
definition precedes function call. put re-rendering
functionality (setupSortable, setupTour, etc) into app.on('render')
2013-03-04 11:17:17 -05:00
Tyler Renelle
d20fccea75 pass model by reference to scoring functions 2013-03-02 23:38: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
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
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
90af514fbc try removing datepicker and moving browser stuff to the bottom 2013-02-19 12:57:41 -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
4bdbbfe764 fix to corrupted tasks - remove them when cleaning the user 2013-02-17 14:16:58 -05:00
Tyler Renelle
b61a4bf062 merge in all the profile code 2013-02-17 00:05:22 -05:00
Tyler Renelle
8ca41e2b99 move bootstrap responsive inclusion into lib/app/index.js - will also
allow us to cut down on components included
2013-02-16 19:27:00 -05:00
Tyler Renelle
baa149b6ba proper party unsubscribe callbacking 2013-02-11 19:31:01 -05:00
Tyler Renelle
03779c73ab close "new party" <form> tag. #330, wah wah wah 2013-02-11 19:27:35 -05:00
Tyler Renelle
5ea0dfe713 move idList back to root-level, is what's causing the sort bug - see https://github.com/codeparty/racer/pull/73 2013-02-08 21:03:56 -05:00
Tyler Renelle
230d672fc7 refactor much of the hodge-podge code into their own files 2013-02-08 18:03:46 -05:00
Tyler Renelle
4ac5d5e24d put debugging in if in debugging environment 2013-02-08 13:57:00 -05:00
Tyler Renelle
9250b8b2b5 some more fixes on "nextItem" 2013-02-08 12:50:37 -05:00
Tyler Renelle
b4fda373cb all item-code refactored into its own classes, item store working 2013-02-08 02:01:48 -05:00
Tyler Renelle
8d28cf1bfa start moving item-specific code to it's own file 2013-02-08 01:32:55 -05:00
Tyler Renelle
1bcd4a3fbd some more half-backed changes for the new customization engine 2013-02-08 01:04:38 -05:00
Tyler Renelle
b6398964fe got most of the character customizations working 2013-02-07 22:28:44 -05:00
Tyler Renelle
b134ec558d add in popover for customizations (can't get css working properly) 2013-02-07 21:24:04 -05:00
Tyler Renelle
a8882620d5 party subscriptions fixes 2013-02-07 19:19:26 -05:00
Tyler Renelle
4bb155939d attempt #2 at user obj being null 2013-02-06 22:55:34 -05:00
Tyler Renelle
f020eb1162 fix to undfeind 'items' (this shouldn't be happening) 2013-02-06 15:19:37 -05:00
Tyler Renelle
1aa047d163 remove debuggging buttons 2013-02-06 15:05:14 -05:00
Tyler Renelle
9854bc1a3c some typo fixes 2013-02-06 14:12:05 -05:00
Tyler Renelle
7764447355 many fixes to party system actions causing dom refresh 2013-02-06 13:59:56 -05:00