Commit graph

338 commits

Author SHA1 Message Date
Tyler Renelle
98f1e0e690 bunch of model subscription fixes, mostly due to @lackac's racer
session fix
2013-02-05 18:12:39 -05:00
Tyler Renelle
966d81b9b8 some @WIP hacks on model subscriptions 2013-02-05 16:11:28 -05:00
Tyler Renelle
fe544de798 party subscriptions properly working 2013-02-05 11:44:51 -05:00
Tyler Renelle
6245d0adce setup party model subscriptions (currently very inefficient, and
unsubscribe not being utilized)
2013-02-05 01:37:13 -05:00
Tyler Renelle
a67c82aab5 accessControl basic framework for party system 2013-02-05 01:00:43 -05:00
Tyler Renelle
9723f3c37a don't need public/private paths after all, can check path requests in store accessControl callbacks 2013-02-04 23:32:40 -05:00
Tyler Renelle
6966f6a439 modify everything to accomdate migratino 2013-02-04 21:18:13 -05:00
Tyler Renelle
6d48885fdf use batchupdate on buyreroll 2013-02-04 18:13:52 -05:00
Tyler Renelle
57a7edc5d3 rename everything "friends" to "party", since we may use friends for
following/followers feature
2013-02-04 14:10:20 -05:00
Tyler Renelle
7bfefb07dd don't use userObj, back to user.get() - we'll just intercept commit 2013-02-02 14:40:24 -05:00
Tyler Renelle
ba10f7943d merge batch.queue and batch.updateAndQueue to one function set 2013-02-02 13:46:54 -05:00
Tyler Renelle
4e896240ea reset dome with revive and reset (don't want these to be necessary, stop-gap) 2013-02-02 11:40:41 -05:00
Tyler Renelle
6e2a700598 fix emulate next day button 2013-02-01 14:16:01 -05:00
Tyler Renelle
86ea99c2dc add "emulate next day" debugging button 2013-02-01 14:05:52 -05:00
Tyler Renelle
703deac359 cbug fixes. also have to explicitely get all user properties one-by-one, instead of user.get() for some reason 2013-02-01 13:27:27 -05:00
Tyler Renelle
ecaf8643a4 batch update for general scoring. note, model.on * broken 2013-02-01 00:39:42 -05:00
Tyler Renelle
1350f74c78 apply batch update to reset & revive 2013-02-01 00:11:33 -05:00
Tyler Renelle
642b63f200 add BatchUpdate class, apply to page load 2013-01-31 23:54:21 -05:00
Tyler Renelle
6adc5dab40 better check on friend exists 2013-01-30 21:31:03 -05:00
Tyler Renelle
7952cc71a1 typo 2013-01-30 21:27:37 -05:00
Tyler Renelle
7a478ab6cd fix to username, apply to main user 2013-01-30 21:22:38 -05:00
Tyler Renelle
e8ac4dcf86 unlock the party system at level 3, view.fn 'userName' 2013-01-30 18:22:52 -05:00
Tyler Renelle
55a019df1c better friend validation 2013-01-30 18:04:02 -05:00
Tyler Renelle
fcadcb000f convert armor model.fn to a view.fn, so we can use on party too 2013-01-30 17:41:06 -05:00
Tyler Renelle
7f9ef40251 trim uid entry 2013-01-30 17:29:35 -05:00
Tyler Renelle
519dcf256e reactive model fucntion seems to bust the app, may need to send to use
model.subscribe on get '/' and redirect on friend-add
2013-01-30 17:14:55 -05:00
Tyler Renelle
57ab186a62 begin party subscription & view 2013-01-30 16:52:31 -05:00
Tyler Renelle
cd331dbca5 clean up .get('/') by moving user updates & cleanup to schema.coffee 2013-01-30 15:50:54 -05:00
Tyler Renelle
3cb9749f57 pass in resetDom as callback to cron 2013-01-30 13:33:36 -05:00
Tyler Renelle
52b2532b5a armorset (v1 or v2) settings for females 2013-01-30 13:29:59 -05:00
Tyler Renelle
0e01160ee4 add setting for male / female 2013-01-30 13:25:10 -05:00
Tyler Renelle
480f589643 female armor version bug fix 2013-01-30 13:05:29 -05:00
Tyler Renelle
466256f793 lotsa changes! renaming male/female icons, fix tnl & current armor
refresh bug, model function for current armor (female pending)
2013-01-30 13:03:10 -05:00
Tyler Renelle
69e577818a fix for "can't delete todos" 2013-01-29 14:09:04 -05:00
Tyler Renelle
3242ce6e95 account for undfined lastCrons 2013-01-29 00:02:30 -05:00
Tyler Renelle
0512aacbbf another attempt at cron set optimizations 2013-01-28 21:28:45 -05:00
Tyler Renelle
1009a87954 Merge pull request #226 from toebu/completed-todos-fix
Getting rid of the completedList and completedIds
2013-01-28 12:09:12 -08:00
Nicholas Terwoord
bfe85ad6a8 HTML entities & and < are not handled correctly
- Instead of using `view.escapeHTML`, just check if todo is blank via RegEx
2013-01-27 21:36:34 -05:00
Tobias Leugger
61b848bf4f Updating the task list cleanup to not restore the completedIds list.
Fixing the mocha test to not check for the completedIds.
2013-01-27 18:55:46 +01:00
Tobias Leugger
b697e7bdf1 Getting rid of the completedList and completedIds, instead only
using the 'completed' attribute of the todo task. This fixes some
issues were a task was at the same time in the todoIds and
completedIds.
2013-01-26 11:33:51 +01:00
Tyler Renelle
ec2eac31c0 missing completeds 2013-01-24 00:15:35 -05:00
Tyler Renelle
54df0c16ff restore missing tasks in same code for checking for blank tasks and
duplicates. this is getting weird
2013-01-24 00:06:25 -05:00
Tyler Renelle
9924edcd95 fix Fatal Error: Unauthorized issue due to accessControl 2013-01-23 12:51:12 -05:00
Tyler Renelle
0183e4cd01 typo 2013-01-22 13:49:02 -05:00
Tyler Renelle
55975dfc5f subscribe to user using query instead of path 2013-01-22 13:16:42 -05:00
Tyler Renelle
377aef968b comment on model.query('users').withId(userId) not working 2013-01-22 12:02:46 -05:00
Tyler Renelle
6c57ce7da4 trying for some saner writes (maybe whole-sale overwrite isn't the
best either)
2013-01-22 11:49:53 -05:00
Tyler Renelle
3153299ea8 almost there with dom-resetting 2013-01-21 17:21:57 -05:00
Tyler Renelle
c7f2f81985 try offloading everythign to the client 2013-01-21 17:21:55 -05:00
Tyler Renelle
81e673b81a remove some server load 2013-01-21 17:21:54 -05:00
Tyler Renelle
af7fa5633b just refresh page for now, view.render(model) borks <!--$id--> dom references (maybe need to clear somehow, but view.clear() isn't working as expected) 2013-01-21 17:21:53 -05:00
Tyler Renelle
3325161092 just refresh page for now, view.render(model) borks <!--$id--> dom
references (maybe need to clear somehow, but view.clear() isn't
working as expected)
2013-01-21 17:21:51 -05:00
Tyler Renelle
016072c687 completed list bug fix, return if cron not run 2013-01-21 17:21:49 -05:00
Tyler Renelle
1fd3aa015e en-mass cron on client 2013-01-21 17:21:46 -05:00
Tyler Renelle
f2e47e9e4e en-masse revive & reset
Conflicts:
	src/app/index.coffee
2013-01-21 17:21:42 -05:00
Tyler Renelle
a9b79440ab weapons and armor fix, revive en-masse 2013-01-21 11:48:18 -05:00
Tyler Renelle
2ddab98c82 just wrap scoring.cron in a try/catch, i'm sick of this 2013-01-21 00:23:56 -05:00
Tyler Renelle
fb0d4d6d44 infinite death on cron bug 2013-01-21 00:02:46 -05:00
Tyler Renelle
b9e479e589 hp now docking on cron 2013-01-20 23:22:02 -05:00
Tyler Renelle
95b5324329 fixed cron bug using underscore instead of lodash 2013-01-20 19:35:46 -05:00
Tyler Renelle
4d93f51d55 bug fixes 2013-01-20 19:35:45 -05:00
Tyler Renelle
607740aa23 bug fixes 2013-01-20 18:06:34 -05:00
Tyler Renelle
ca91a3a07d move some more client setup to browser.coffee 2013-01-20 17:55:45 -05:00
Tyler Renelle
ff2fb0f643 casper fixes. remove cron from browser since it's run on server, will
add in an HP animation later
2013-01-20 17:49:30 -05:00
Tyler Renelle
77072909f0 move notifications to browser.coffee 2013-01-20 16:53:24 -05:00
Tyler Renelle
86402f05bd mass update scoring#cron 2013-01-20 16:37:29 -05:00
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