Commit Graph

119 Commits (74b77ff58c0948f539cc524ef52c69df4503731d)

Author SHA1 Message Date
Michael Q Larson a5fa27466c Clean up views, remove API controller views, add the gmail-shortcuts, control-shortcuts and deploy-a-website static views. Move all resource controller views to a resources view folder and update routes 2014-12-26 00:05:00 -08:00
Michael Q Larson fc2031062b add back in generic secrets.js file 2014-12-24 09:46:51 -08:00
Michael Q Larson d39804053c finished with profile page for now 2014-12-24 00:07:20 -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 a06744038a revert to previous form and attempt to get working later 2014-12-07 21:14:32 -08:00
Michael Q Larson f1bedbdecf some more blind tinkering 2014-12-07 21:08:33 -08:00
Michael Q Larson e173b35c2b add mailer back in 2014-12-07 21:00:21 -08:00
Michael Q Larson 64f12f8ee1 add debug stuff 2014-12-07 20:56:02 -08:00
Michael Q Larson 2777259af9 attempt to add new user mailer 2014-12-07 20:50:53 -08:00
Michael Q Larson 36ff713087 comment problematic code 2014-12-03 23:44:28 -08:00
Michael Q Larson f93801a1d4 thrashing 2014-12-03 23:42:13 -08:00
Michael Q Larson 711904d1c1 start making improvements to auth and get email from Twitter users 2014-12-03 23:28:10 -08:00
Michael Q Larson 01e86c74bc update other authentication methods 2014-12-03 18:34:42 -08:00
Michael Q Larson 6ca7bc5879 attempt to make facebook not overwrite 2014-12-03 18:17:21 -08:00
Michael Q Larson 9179c1ee06 make all oauth options flexible 2014-12-01 21:13:39 -08:00
Michael Q Larson 835c69d6b4 attempt to allow facebook login even with used email 2014-12-01 21:06:19 -08:00
Michael Q Larson a2259c937c fix passport js maybe 2014-11-29 22:30:02 -08:00
Berkeley Martinez 7c1ae2f450 Adds auth check to linked path. Removes unused routes. 2014-11-19 15:30:36 -08:00
Michael Q Larson 308461d4ec create bootstrap file 2014-10-16 16:18:26 -07:00
Michael Q Larson 30212e5f5b update passport.js 2014-10-15 14:53:36 -07:00
Michael Q Larson 2106cbdbf2 twitter username now persisted 2014-10-13 21:38:10 -07:00
Michael Q Larson 254740c065 socket io is connecting 2014-10-13 18:00:37 -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 886b1d2d0d use https profile image url in twitter auth 2014-09-01 12:12:53 -07:00
Sahat Yalkabov 04c5262bea windows-cr line endings commit 2014-07-01 17:05:49 -04:00
Sahat Yalkabov b05c12d6d4 Replaced _.findWhere with .find function 2014-06-06 16:02:37 -04:00
Sahat Yalkabov 2cbf836041 Switched from underscore to lodash library 2014-06-06 15:43:49 -04:00
Sergey Gavruk a5e1830d5f Fix instagram email 2014-05-04 10:19:11 +03:00
Sahat Yalkabov 5e5b8efa4f Updated sign-in strategies.
Removed email check when trying to link multipel accounts. Otherwise trying to link facebook and google that use the same e-mail is impossible.
2014-04-25 14:33:54 -04:00
Sahat Yalkabov fc55e385e4 Added Instagram authentication 2014-04-22 15:00:27 -04:00
Sahat Yalkabov 48792ce753 Code cleanup 2014-04-15 11:10:54 -04:00
Sahat Yalkabov 6eb9b631ce Updated comment style to make it easier to generate the code using multiline strings 2014-04-13 00:28:11 -04:00
Sahat Yalkabov 36a02ac982 Added a brief comment explanation of how passport strategy works 2014-03-03 16:32:13 -05:00
Sahat Yalkabov 4d52dbd013 Updated LinkedIn error flash message 2014-02-27 17:57:13 -05:00
Sahat Yalkabov c95ee75eee Add LinkedIn passport strategy 2014-02-27 13:08:26 -05:00
Sahat Yalkabov 5833a206f3 Updated formatting 2014-02-14 12:28:01 -05:00
Sahat Yalkabov 6b49d10fc3 Check if there is an account with provided email when linking with Facebook strategy 2014-02-14 12:26:47 -05:00
Sahat Yalkabov 3016af41e5 Update Google Strategy 2014-02-14 12:24:23 -05:00
Sahat Yalkabov 52276b3755 Check if there is an account with a given email address when linking GitHub strategy. 2014-02-14 12:23:50 -05:00
Sahat Yalkabov 2ba1bee9ec Updated flash message in Google Strategy 2014-02-14 12:02:07 -05:00
Sahat Yalkabov 66637842fc Merge branch 'master' of https://github.com/robjohnson189/hackathon-starter into robjohnson189-master
* 'master' of https://github.com/robjohnson189/hackathon-starter:
  Check if there is already an account that isn't linked to a google account but uses the google accounts email address
2014-02-14 11:54:47 -05:00
Sahat Yalkabov 0d8cdd38f1 Added comments explaining what each authentication strategy is used for. 2014-02-14 11:29:28 -05:00
Robert Johnson 077154056c Check if there is already an account that isn't linked to a google account but uses the google accounts email address 2014-02-13 20:54:09 -06:00
Sahat Yalkabov 862ddb33fd Add Venmo oauth2 strategy 2014-02-10 19:20:45 -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