Commit Graph

61 Commits

Author SHA1 Message Date
Tyler Renelle
b2d6596f92 move _nodeEnv setup into master 2012-11-14 18:08:45 -05:00
Tyler Renelle
fb1fc7eb80 setting up for syncing private & public branches 2012-11-14 17:37:38 -05:00
Tyler Renelle
45b7c906c6 cleanup of previous server crashing workaround, i think i figured it out 2012-10-28 15:32:14 -04:00
Tyler Renelle
198987dfa0 Test userObj on server route, attempt to fixing crashing server 2012-10-28 15:32:12 -04: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
fe08c1e3cb coffee version difference 2012-10-28 15:29:28 -04:00
Tyler Renelle
9eb85a2782 trying some fixes for server crashing 2012-10-28 12:25:09 -04:00
Tyler Renelle
d504cbea38 try id = user && !_.isEmpty(user.get()) && user.get()[0].id , see https://github.com/lefnire/habitrpg/issues/7
Conflicts:
	lib/server/auth.js
	src/server/auth.coffee
2012-10-17 23:40:17 -04:00
Tyler Renelle
79fd3f0689 New REST API for scoring tasks 2012-10-12 11:54:00 -04:00
Tyler Renelle
2e2d09a7d1 better routes delegation in /:uid? 2012-10-12 11:53:58 -04:00
Tyler Renelle
8e265a1e6c ugh. no ssl 2012-10-12 08:48:31 -04:00
Tyler Renelle
c596e897ff round 3 2012-10-12 08:48:30 -04:00
Tyler Renelle
f11943349a force-ssl round 2 2012-10-12 08:48:29 -04:00
Tyler Renelle
31086df654 bug fix 2012-10-12 08:48:28 -04:00
Tyler Renelle
a37fba5524 try force-ssl again 2012-10-12 08:48:26 -04:00
Tyler Renelle
9d844a7104 remove forced-ssl for now 2012-10-12 08:48:16 -04:00
Tyler Renelle
6a42b681e3 a bunch of small fixes 2012-10-12 07:11:06 -04:00
Tyler Renelle
17914586f4 Force ssl (just a redirect, depends on x-forwarded-proto via heroku's ngnix 2012-10-11 16:22:19 -04:00
Tyler Renelle
d929905c48 use model events to handle stats notifications. not perfect, need to
fix handling of "undo exp/gp" operation
2012-09-24 09:56:34 -04:00
Tyler Renelle
1a68f00fb2 moving some schema stuff around 2012-09-24 09:52:48 -04:00
Tyler Renelle
8480ef3564 some bugs which are a result of user not being tested as already dead.
using scoring.setUser() so we don't have to pass user all over the
place, there's probably a better approach -- revisit
2012-09-20 10:57:32 -04:00
Tyler Renelle
be9d419313 Quarters system, generalized modal dialogs, bug fixes 2012-09-18 21:37:49 -04:00
Tyler Renelle
38ebce3b56 remove some unecessary files 2012-09-18 01:22:35 -04:00
Tyler Renelle
bde52a01a9 Pull in changes from private branch, including many bug fixes and -
drumrole - functioning facebook auth!!
2012-09-15 15:06:51 -04:00
Tyler Renelle
ee2c4663d5 Pull in a bunch of changes from private branch, initial everyauth code 2012-09-07 17:23:31 -04:00
Tyler Renelle
9fd4367a8a pull in some changes from private branch 2012-09-06 15:33:06 -04:00
Tyler Renelle
c9226b34bd Revert "temporarily disable accessControl so i can run schema update"
This reverts commit 01159545d8492831f4048235c2ab633a7d2d4905.
2012-09-04 23:08:11 -04:00
Tyler Renelle
79f1c635ca temporarily disable accessControl so i can run schema update 2012-09-04 23:08:06 -04:00
Tyler Renelle
4aa21e03d9 remove console.log on accessControl
Conflicts:

	src/server/setupStore.coffee
2012-09-04 14:27:53 -04:00
Tyler Renelle
4c29c93864 bug fix on accessControl for variable-length arguments (was getting
writeAccess error)

Conflicts:

	lib/server/setupStore.js
	src/server/setupStore.coffee
2012-09-04 11:45:34 -04:00
Tyler Renelle
8a4185815f move terms & privacy to staticPages
Conflicts:

	lib/server/index.js
	src/server/index.coffee
	views/app/index.html
2012-09-02 23:01:14 -04:00
Tyler Renelle
4312052fc8 add score-down, use scoring module to run up/down through modifiers 2012-08-27 23:55:05 -04:00
Tyler Renelle
c8bbfda776 basic setup for REST api - /:uid/up/:score? for now
Conflicts:

	lib/server/index.js
	src/server/index.coffee
2012-08-27 22:27:56 -04:00
Tyler Renelle
c55ce9d419 use mongo-store in express session (see
4409329271bafd68e931d1d13e5519109a9a3c8e of chat-example)
2012-08-27 10:23:48 -04:00
Tyler Renelle
b711ccfc03 Move purl authentication to server/index.js and don't redirect. keep
them on that url
2012-08-26 16:02:42 -04:00
Tyler Renelle
0e4e306046 Got accessControl working!!! 2012-08-26 11:58:20 -04:00
Tyler Renelle
55ceb9d40b try racer.io.set('transports') instead of racer.set('transports') 2012-08-24 15:28:35 -04:00
Tyler Renelle
494b26c866 userId is no longer auto-created by session middleware 2012-08-24 09:59:29 -04:00
Tyler Renelle
4b28ab9235 only use google analyatics in production 2012-08-09 11:22:44 -04:00
Tyler Renelle
73e857049e use page.redirect('/') after setting session, so don't have to use
middleware (don't need to use purl the whole time)
2012-08-06 16:55:51 -04:00
Tyler Renelle
a341ff9763 don't use dev logging on prod 2012-08-06 10:41:58 -04:00
Tyler Renelle
0a72028c27 Try hooking into session even earlier (for some reason previous
commits are causing app to freeze if accessed from multiple devices..
god i can't wait until derby releases auth)
2012-08-02 20:22:38 -04:00
Tyler Renelle
2fb562c90e remove accessControl for now, move custom session handling to ealier
in process
2012-08-02 19:07:23 -04:00
Tyler Renelle
9d0ddd08fb guid bug 2012-08-02 17:49:31 -04:00
Tyler Renelle
e2c5096311 removing accesscontrol for now, but at least only subscribing to the
necessary data
2012-08-02 14:36:55 -04:00
Tyler Renelle
71a4430efc almost got accessControl working, getting errors in createWriteGuard 2012-08-02 14:12:17 -04:00
Tyler Renelle
595ad960f3 attempts at purlMiddleware - using server/index.js to set
session.userId so can properly handle access paths
2012-07-31 19:21:45 -04:00
Tyler Renelle
630a6bf9ce Remove loading of a bunch of external javascript files if usign mobile device 2012-07-31 12:59:42 -04:00
Tyler Renelle
b0a95b69d2 Setup queries.coffee 2012-07-19 14:48:05 -04:00
Tyler Renelle
edf9cbc8dc set to xhr-polling for nodejitsu 2012-07-18 09:44:44 -04:00