Commit Graph

84 Commits

Author SHA1 Message Date
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
Sahat Yalkabov
992b2cd5da Updated schema 2014-01-07 16:33:48 -05:00
Sahat Yalkabov
a89959a2a6 Removed DB validations 2014-01-01 02:35:37 -05:00
Sahat Yalkabov
a9cd6e07ac User profile pictures now defaults to empty string, it won't be displayed if it's not present 2013-12-11 22:16:06 -05:00
Sahat Yalkabov
d961615a02 Added back flatUI CSS 2013-12-11 15:34:53 -05:00
Sahat Yalkabov
4144814368 Fixed foursquare api controller to work with new token schema 2013-12-07 12:37:32 -05:00
Sahat Yalkabov
c03d62da08 Changed tokens from an object of objects to just an array, Tumblr strategy now pushes a new token in addition to tokenSecret as well as token kind 2013-12-07 02:17:46 -05:00
Sahat Yalkabov
f60960be79 Added new tumblr token field 2013-12-07 00:29:57 -05:00
Sahat Yalkabov
bc2fa13d22 Sparse indexing on username field to prevent duplicate null username error 2013-12-06 02:03:27 -05:00
Sahat Yalkabov
52827c7c9b removed picture selectors on account page 2013-12-06 01:14:10 -05:00
Sahat Yalkabov
ce3a8c78ec Added gender to user schema and radio buttons to account page 2013-12-06 00:18:39 -05:00
Sahat Yalkabov
9c389c1afb Profile data defaults to empty string to prevent value of undefined on account page 2013-12-06 00:03:07 -05:00
Sahat Yalkabov
69f41c296a Schema refactoring 2013-12-05 23:46:47 -05:00
Sahat Yalkabov
1ddd639592 Client-side required password and email fields 2013-12-05 23:12:43 -05:00
Sahat Yalkabov
3ecd3ad148 Simplified local strategy signup process, email is now a username 2013-12-05 22:48:09 -05:00
Sahat Yalkabov
0c842286ef Added google token, modified admin attribute, email is now username and old email is just plain email, no longer a primary key, first name and last name are just name now 2013-12-05 22:42:20 -05:00
Sahat Yalkabov
d642e8d332 oauth tokens are now explicitly defined in the model schema 2013-11-30 00:52:53 -05:00
Sahat Yalkabov
13bd8ef9c8 Changed tokens type from Array to Mixed to allow overriding existing tokens instead of pushing duplicates 2013-11-19 17:28:04 -05:00
Sahat Yalkabov
0747ee7303 Changed model name so hopefully that fixes a bug where it was User with capital letter in IDE and user with loweer case letter in Git 2013-11-19 17:15:13 -05:00