Commit Graph

79 Commits (db2ad0db21357fb2f575dd78ec549240cdcb5575)

Author SHA1 Message Date
Michael Q Larson fcd457b958 email validations work, now on to username validations 2014-12-23 18:20:53 -08:00
Berkeley Martinez 86fcfe8296 Major refactor. Add error handlers everywhere. 2014-12-23 08:48:28 -08:00
Michael Q Larson 1d56a2572a tweaked challenges 2014-12-14 09:01:37 -08:00
Michael Q Larson 177dc900cf made parallel 'points' infrastructure 2014-12-05 20:44:42 -08:00
Michael Q Larson 5c54fddaec Merge branch 'master' into timestamp
Conflicts:
	views/partials/challenges.jade
2014-12-03 23:31:36 -08:00
Michael Q Larson abcf15074b remove email regex check and restrictions and username for now 2014-12-01 20:49:08 -08:00
Michael Q Larson ec5fea2eaa start writing validations 2014-11-30 15:25:00 -08:00
Michael Q Larson 21370b83a5 start adding omniauth functionality back in and debugging in production 2014-11-29 22:22:27 -08:00
Michael Q Larson 00c92176cb update the hackathon starter base app 2014-11-29 21:32:59 -08:00
Michael Q Larson 9b9554c47d update the hash to have default values 2014-11-25 11:31:35 -08:00
Michael Q Larson d973619f4a writes completed challenges to database 2014-11-25 11:17:07 -08:00
Michael Q Larson 1a0acdea82 attempt to modify User.js 2014-11-24 18:48:07 -08:00
Michael Q Larson 06fe5390ba seems to attempt to write timestamp 2014-11-24 18:07:03 -08:00
Sahat Yalkabov 2dcea49f70 user model cleanup 2014-11-08 20:42:48 -08:00
Michael Q Larson ca0c71b77f redirects to correct challenge upon authentication 2014-11-06 23:01:01 -08:00
Michael Q Larson 1a4ee74e8f page loads now 2014-11-06 15:26:38 -08:00
Michael Q Larson d21e83eced start making challenge seed data 2014-11-06 13:06:19 -08:00
Michael Q Larson 80fbe1dee4 fix nonprofit form and fix some mistakes in video links 2014-11-04 14:57:00 -08:00
Michael Q Larson de29af1e8a update views and add routes to app.js 2014-11-02 09:07:40 -08:00
Michael Q Larson b68458cdb5 get email persisting but still need to pull it in on authentication 2014-10-24 15:22:09 -07:00
Michael Q Larson 58761e7c2b start adding challenge routes and controllers 2014-10-18 00:01:26 -07:00
Michael Q Larson 308461d4ec create bootstrap file 2014-10-16 16:18:26 -07:00
Michael Q Larson ac0ab1de37 start fixing chat 2014-10-16 09:07:06 -07:00
Michael Q Larson 8c15b4beee add oauth logins 2014-10-15 13:18:25 -07:00
Michael Q Larson 1bae5f439f start work on challenge model but getting an error; add all project euler challenges 2014-10-15 12:09:28 -07:00
Michael Q Larson 254740c065 socket io is connecting 2014-10-13 18:00:37 -07:00
Michael Q Larson ad929be410 able to write to the db 2014-10-13 16:01:52 -07:00
Michael Q Larson a5985cd73d start building out views 2014-10-13 14:14:51 -07:00
Michael Q Larson 05c31ba15d firechat and firepad installed but not fully working 2014-10-12 01:51:55 -07:00
Sahat Yalkabov d4192b2e00 Refactored Gravatar mongoose method 2014-05-02 16:16:44 -04:00
Sahat Yalkabov fc55e385e4 Added Instagram authentication 2014-04-22 15:00:27 -04:00
rockaBe 1dcbe0ec97 stores lowercase email for gravatar 2014-03-11 01:17:53 +01:00
Sahat Yalkabov d47fa07761 Removed unique and sparse properties for OAuth providers since id is already unique. Fixes #89 2014-02-27 19:46:56 -05:00
Sahat Yalkabov 0ced58c9f5 Add linkedin id field to User model 2014-02-27 11:28:48 -05:00
Sahat Yalkabov e23919c4eb Added comments to User model on instance methods and mongoose middleware. 2014-02-18 04:05:46 -05:00
Sahat Yalkabov b29b0c7965 Updated schema's default values for password token and expires fields 2014-02-18 02:57:57 -05:00
Dan Stroot 1faf279877 Added complete password reset function 2014-02-17 10:00:43 -08:00
Sahat Yalkabov b64ba9bfa5 Code style formatting 2014-02-14 10:54:03 -05:00
Daniel Mills c5a5b4fb9f check for null email for gravatar 2014-02-14 00:14:21 -05:00
Sahat Yalkabov a3ea1cb9e3 Refactor gravatar function 2014-02-07 09:54:03 -05:00
Sahat Yalkabov 73411a03b0 Merge branch 'KarlJakober-master'
* KarlJakober-master:
  Add profile information and owned games to Steam template
  Steam API template display achievements
  Steam API code refactoring, added ownedGames API call
  removes steam auth, sets up steam api requests in async
  Adds Steam auth and API

Conflicts:
	views/api/index.jade
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   README.md
#	modified:   app.js
#	modified:   config/passport.js
#	modified:   config/secrets.js
#	modified:   controllers/api.js
#	modified:   models/User.js
#	new file:   views/api/steam.jade
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   config/passport.js
#	modified:   config/secrets.js
#	modified:   models/User.js
#	modified:   views/api/index.jade
#
2014-02-05 19:45:05 -05:00
Sahat Yalkabov a2f4ffbf2b Merge branch 'master' of https://github.com/KarlJakober/hackathon-starter into KarlJakober-master
* 'master' of https://github.com/KarlJakober/hackathon-starter:
  removes steam auth, sets up steam api requests in async
2014-02-05 17:13:43 -05:00
Karl Jakober 1687440588 removes steam auth, sets up steam api requests in async 2014-02-05 21:04:02 +00:00
Sahat Yalkabov 20621d535d Merge branch 'master' of https://github.com/KarlJakober/hackathon-starter into KarlJakober-master
* 'master' of https://github.com/KarlJakober/hackathon-starter:
  Adds Steam auth and API
2014-02-05 12:26:23 -05:00
Karl Jakober aa36ad9fbb Adds Steam auth and API 2014-02-05 16:37:48 +00:00
Sahat Yalkabov 153d7254ad Update formatting for style consistency 2014-02-03 19:07:17 -05:00
Daniel Mills 8e804c5a1a retro default, better size for xs 2014-02-03 18:18:28 -05:00
Daniel Mills f5ecfc507c add gravatar to profile 2014-02-03 17:50:47 -05:00
Sahat Yalkabov c0e1a1129a Updated user schema (provider field was not used) 2014-02-01 03:34:18 -05:00
Brian Cantoni bbef4e4b43 Switch from bcrypt to bcrypt-nodejs to ease install on Windows 2014-01-28 17:51:10 -08:00