Commit Graph

76 Commits

Author SHA1 Message Date
Michael Q Larson
f059bc33d8 add courseware controller and routes 2015-02-01 23:35:27 -08:00
Nathan Leniz
227c938445 massive redesign of user model and the way it interacts with bonfires, successfully returning next bonfire for the user, showing meet bonfire to unauthenticated users 2015-01-27 01:22:02 -05:00
Nathan Leniz
2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Michael Q Larson
c4bd0e4dc3 make bonfire dynamically direct to best subsequent bonfire after completion 2015-01-24 14:29:50 -08:00
Nathan Leniz
a3cf6c3ee2 Persisting completion of bonfire challenges into User model, split routes for bonfires and challenges, refactored class selectors to be challenge type specific 2015-01-24 03:11:01 -05:00
Nathan Leniz
6b4475a5b8 Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list 2015-01-24 00:44:08 -05:00
Nathan Leniz
74291d2299 More bonfire improvements. Removed redundant console statements, improved test scraping, comment scraping included, better reset behavior 2015-01-21 23:54:59 -05:00
Nathan Leniz
6ea5f5c895 Preparing for bonfire challenges, create Bonfire model, BonfireCompletion model, update bonfire controller, create initial bonfire seed data 2015-01-21 21:32:13 -05:00
Michael Q Larson
da3ed43b2f update user schema for sparseness and uniqueness on email 2015-01-11 18:24:36 -08:00
Michael Q Larson
bfe75a180d improve the profile layout and start building the public profile view 2015-01-08 18:39:16 -08:00
Michael Q Larson
0ec2e0a759 finished validation on the form fields 2015-01-08 14:56:44 -08:00
Michael Q Larson
41abdae46f further progress on the form and add angular inline 2015-01-05 17:29:37 -08:00
Michael Q Larson
db9622a2e5 public profile accessible and start updating form 2015-01-05 16:38:56 -08:00
Michael Q Larson
aab3b98f5d remove unique requirement from username 2014-12-31 22:59:01 -08:00
Michael Q Larson
c896584b21 quick fix for Twitter auth issue 2014-12-28 17:40:57 -08:00
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
80fbe1dee4 fix nonprofit form and fix some mistakes in video links 2014-11-04 14:57:00 -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
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
254740c065 socket io is connecting 2014-10-13 18:00:37 -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