Commit graph

222 commits

Author SHA1 Message Date
Tyler Renelle
3dc9bad6ae redirect when userObj not present (that should never be happening, but
it is - diagnosing)
2013-01-20 12:11:20 -05:00
Tyler Renelle
dce251a767 check armor/weapon on userObj (shouldnt have to?) 2013-01-18 21:42:43 -05:00
Tyler Renelle
25227abce9 user balance part of schema 2013-01-18 21:38:29 -05:00
Tyler Renelle
ff3eadb1f6 kickstarter check on userobj 2013-01-18 18:20:34 -05:00
Tyler Renelle
ef980102ba mass assignment on server #3 2013-01-18 17:40:09 -05:00
Tyler Renelle
3c8d18e55e mass assignment on server #2 (@WIP) 2013-01-18 17:29:28 -05:00
Tyler Renelle
7f0d4ee1ec mass assignment on the server (@WIP) 2013-01-18 17:11:45 -05:00
Tyler Renelle
b95e063543 remove aws notification 2013-01-18 12:11:06 -05:00
Tyler Renelle
7d640db6b1 comment out force ssl 2013-01-18 12:10:54 -05:00
Tyler Renelle
4b48336098 aws notification 2013-01-18 12:10:15 -05:00
Tyler Renelle
f1bfe7ae69 Revert "remove duplicates, also remove grey / empty tasks"
This reverts commit 89dcc25364.
2013-01-15 21:38:00 -05:00
Tyler Renelle
d03b4b5477 Revert "woops, typo with last commit"
This reverts commit 172afc5f13.
2013-01-15 21:28:56 -05:00
Tyler Renelle
172afc5f13 woops, typo with last commit 2013-01-15 21:24:49 -05:00
Tyler Renelle
89dcc25364 remove duplicates, also remove grey / empty tasks 2013-01-15 21:02:30 -05:00
Tyler Renelle
f5a07f0a1c use stripe v2 for easier checkout form 2013-01-15 14:35:25 -05:00
Tyler Renelle
4702b64fe4 reset armor & weapon on too 2013-01-14 18:54:57 -05:00
Tyler Renelle
d3b5cd454d show kickstarter for everyone 2013-01-12 12:27:59 -05:00
Tyler Renelle
2ec926dff3 no more tokens on death 2013-01-11 14:04:07 -05:00
Tyler Renelle
860b89cdb1 show kickstarter notification 2013-01-10 22:06:53 -05:00
Tyler Renelle
4e9c0def68 reset balance when user clicks reset 2013-01-08 09:48:11 -05:00
Tyler Renelle
e4afeb9b8e move from underscore to lodash so don't need extra clone module 2013-01-02 12:27:36 -05:00
Tyler Renelle
5546031ddb test username first, before facebook 2013-01-01 20:29:39 -05:00
Tyler Renelle
c4099f8519 duplicates bug: _.uniq was expected list to be sorted, they're not sorted 2013-01-01 19:12:45 -05:00
Tyler Renelle
77f938a9ba re-order createApp / .use 2012-12-31 16:09:36 -05:00
Tyler Renelle
57122e9ebe update to latest derby#master, including necessary changes from https://github.com/codeparty/derby/issues/187 2012-12-27 13:02:58 -05:00
Tyler Renelle
b41b5d3603 upgrade bootstrap-tour to use html 2012-12-12 20:29:28 -07:00
Tyler Renelle
b8d4a9d6a2 move all javascript file loading (/public/js/* and external scripts)
from html file to javascript load function. This way we can utilize
require() for concatenation & faster page load, and $.getScript() for
async script-loading
2012-12-05 08:09:27 -08:00
Tyler Renelle
07a614259f username/password registration now available 2012-12-04 15:18:59 -08:00
Tyler Renelle
c20552b99f only set unique idlists if there were duplicates to begin with 2012-11-15 23:14:59 -05:00
Tyler Renelle
c828593cac remove set _loggedIn , handled by derby-auth 2012-11-15 22:44:23 -05:00
Tyler Renelle
96d0681063 put cron back to timeout 1s, revisit later 2012-11-15 14:19:19 -05:00
Tyler Renelle
2bece89b37 fix legacy facebook name bug 2012-11-15 13:10:59 -05:00
Tyler Renelle
f1912635b0 *sigh* 2012-11-15 11:33:38 -05:00
Tyler Renelle
c3f6671004 heroku is having trouble with derby-auth/node_modules/guid 2012-11-15 11:26:05 -05:00
Tyler Renelle
5310bb0908 redirect purl to /users/:uid for compatibility with derby-auth. still
legacy, will remove eventually
2012-11-15 10:26:35 -05:00
Tyler Renelle
91364e19b6 gut custom everyauth code & replace with derby-auth 2012-11-15 00:47:58 -05:00
Tyler Renelle
fb1fc7eb80 setting up for syncing private & public branches 2012-11-14 17:37:38 -05:00
Tyler Renelle
322963c898 try going back to underscore and node.clone, heroku doesn't like lodash 2012-10-28 15:32:08 -04:00
Tyler Renelle
86251bd794 Revert "Revert "add reset button""
This reverts commit 8deebf293d12bfaf7cf68e4a27ff76abd76b0ffa.

Conflicts:
	lib/app/index.js
2012-10-28 15:31:53 -04:00
Tyler Renelle
82fabb17cc Revert "add reset button"
This reverts commit 023f7ab28ad5a216f752e9f93d99ba876e17dfc0.

Conflicts:
	lib/app/index.js
2012-10-28 15:31:39 -04:00
Tyler Renelle
677266acf5 add reset button
Conflicts:
	lib/app/index.js
2012-10-28 15:31:18 -04:00
Tyler Renelle
d5cc627c74 remove duplicates on the server instead
Conflicts:
	lib/app/index.js
2012-10-18 00:08:15 -04:00
Tyler Renelle
2e2d09a7d1 better routes delegation in /:uid? 2012-10-12 11:53:58 -04:00
Tyler Renelle
b672a07632 ssl round 4 2012-10-12 08:48:32 -04:00
Tyler Renelle
6a42b681e3 a bunch of small fixes 2012-10-12 07:11:06 -04:00
Tyler Renelle
cb42e88f13 cleaner date format in graphs 2012-10-11 12:52:40 -04:00
Tyler Renelle
f78cd64218 bug fix on missing task 2012-09-24 21:29:53 -04:00
Tyler Renelle
9d165a0ff7 async + user aggregate hp loss 2012-09-24 21:23:29 -04:00
Tyler Renelle
ce901f7b93 back to syncronous calls on the client 2012-09-24 20:10:49 -04:00
Tyler Renelle
893b0bd383 try running cron on the server instead 2012-09-24 19:40:18 -04:00