5f9bb319ed
small change
2012-12-05 09:24:12 -08:00
bf1857e25c
don't allow popover html, security risk. change default content
...
keeping this in mind
2012-12-05 09:21:50 -08:00
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
0820f17991
try safe:true for mongo
2012-12-04 16:20:46 -08:00
07a614259f
username/password registration now available
2012-12-04 15:18:59 -08:00
c0588283a0
fix auth for new derby-auth version
2012-11-28 09:15:03 -05:00
c20552b99f
only set unique idlists if there were duplicates to begin with
2012-11-15 23:14:59 -05:00
c828593cac
remove set _loggedIn , handled by derby-auth
2012-11-15 22:44:23 -05:00
96d0681063
put cron back to timeout 1s, revisit later
2012-11-15 14:19:19 -05:00
2bece89b37
fix legacy facebook name bug
2012-11-15 13:10:59 -05:00
16e60ae3d4
domain option for production
2012-11-15 11:39:11 -05:00
f1912635b0
*sigh*
2012-11-15 11:33:38 -05:00
c3f6671004
heroku is having trouble with derby-auth/node_modules/guid
2012-11-15 11:26:05 -05:00
008a4f4aa7
woops, don't need everyauth
2012-11-15 11:17:55 -05:00
5310bb0908
redirect purl to /users/:uid for compatibility with derby-auth. still
...
legacy, will remove eventually
2012-11-15 10:26:35 -05:00
91364e19b6
gut custom everyauth code & replace with derby-auth
2012-11-15 00:47:58 -05:00
b2d6596f92
move _nodeEnv setup into master
2012-11-14 18:08:45 -05:00
0088ea516b
pull in some small changes from private
2012-11-14 17:50:49 -05:00
fb1fc7eb80
setting up for syncing private & public branches
2012-11-14 17:37:38 -05:00
45b7c906c6
cleanup of previous server crashing workaround, i think i figured it out
2012-10-28 15:32:14 -04:00
198987dfa0
Test userObj on server route, attempt to fixing crashing server
2012-10-28 15:32:12 -04:00
322963c898
try going back to underscore and node.clone, heroku doesn't like lodash
2012-10-28 15:32:08 -04:00
86251bd794
Revert "Revert "add reset button""
...
This reverts commit 8deebf293d12bfaf7cf68e4a27ff76abd76b0ffa.
Conflicts:
lib/app/index.js
2012-10-28 15:31:53 -04:00
21c48527e7
trying some fixes on crashing server
2012-10-28 15:31:41 -04:00
82fabb17cc
Revert "add reset button"
...
This reverts commit 023f7ab28ad5a216f752e9f93d99ba876e17dfc0.
Conflicts:
lib/app/index.js
2012-10-28 15:31:39 -04:00
677266acf5
add reset button
...
Conflicts:
lib/app/index.js
2012-10-28 15:31:18 -04:00
9eb85a2782
trying some fixes for server crashing
2012-10-28 12:25:09 -04:00
d5cc627c74
remove duplicates on the server instead
...
Conflicts:
lib/app/index.js
2012-10-18 00:08:15 -04:00
f64b4d171c
remove duplicates on cron. very hacky, need to figure out why
...
duplicates are being created in the first place
2012-10-17 23:40:20 -04:00
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
79fd3f0689
New REST API for scoring tasks
2012-10-12 11:54:00 -04:00
2e2d09a7d1
better routes delegation in /:uid?
2012-10-12 11:53:58 -04:00
b672a07632
ssl round 4
2012-10-12 08:48:32 -04:00
8e265a1e6c
ugh. no ssl
2012-10-12 08:48:31 -04:00
c596e897ff
round 3
2012-10-12 08:48:30 -04:00
f11943349a
force-ssl round 2
2012-10-12 08:48:29 -04:00
31086df654
bug fix
2012-10-12 08:48:28 -04:00
a37fba5524
try force-ssl again
2012-10-12 08:48:26 -04:00
9d844a7104
remove forced-ssl for now
2012-10-12 08:48:16 -04:00
6a42b681e3
a bunch of small fixes
2012-10-12 07:11:06 -04:00
17914586f4
Force ssl (just a redirect, depends on x-forwarded-proto via heroku's ngnix
2012-10-11 16:22:19 -04:00
cb42e88f13
cleaner date format in graphs
2012-10-11 12:52:40 -04:00
eb9e385eb1
cleaning up the modificationsLookup function
2012-10-11 12:41:31 -04:00
476fb63a0d
tests passing for basic scoring
2012-10-11 11:41:47 -04:00
bad2f6f5b3
Revert "Just pass in task object to taskClasses view helper", this was
...
breaking deleting tasks - revisit later
This reverts commit d04140977f
2012-10-11 11:15:39 -04:00
d04140977f
Just pass in task object to taskClasses view helper
2012-09-29 18:03:47 -04:00
38e1a95140
some fixes to test/user.mocha based on scoring lookup function
2012-09-26 21:36:28 -04:00
18d8e93e55
remove rerollsRemaining, export delta function
2012-09-26 00:19:19 -04:00
80ac213fda
export some scoring functions for use in testing
2012-09-25 23:51:15 -04:00
2e08217799
aha! my first bug caught by mocha
2012-09-25 23:02:54 -04:00
Tyler Renelle