Commit Graph

780 Commits

Author SHA1 Message Date
1143ac4320 Add CSRF input to Account Delete form. 2014-02-07 23:41:15 -05:00
cec811ebad Added OS icons to Prerequisites 2014-02-07 18:34:40 -05:00
60439335e2 Merge pull request #62 from blister/master
Fixed minor bug in the flash example in README.md
2014-02-07 18:15:18 -05:00
12bc85b736 Update README.md 2014-02-07 17:56:21 -05:00
f16e71dc88 Fixed minor bug in the flash example in README.md
Minor bug in the req.flash Data Usage Controller example. String passed instead of an object wrapped string.
2014-02-07 17:54:13 -05:00
9915b37c98 Adding a note on how to remove Facebook's "#_=_" 2014-02-07 10:08:25 -08:00
db50b485da Merge remote-tracking branch 'origin/master'
* origin/master:
  Added Express tutorial link
2014-02-07 10:21:27 -05:00
a456508e60 Update jsdoc strings 2014-02-07 10:21:18 -05:00
f0c649145a Update Contributing section 2014-02-07 10:09:25 -05:00
f3bcafb42f Remove mongoose reference 2014-02-07 09:57:05 -05:00
a3ea1cb9e3 Refactor gravatar function 2014-02-07 09:54:03 -05:00
fab3c1455d Pass size of 60px to gravatar function from navbar. Since it won't be larger than that, no point loading a larger 200px image and then shrinking it. 60px already takes into consideration retina displays. The actual size of avatar is 30px. 2014-02-07 09:53:48 -05:00
116378642f Update instruction comments in application.js 2014-02-07 09:46:59 -05:00
de3d62b66b Replaced hardcoded success flash with express-flash 2014-02-07 08:04:22 +00:00
ed70466c43 introduce configurable login providers to selectively show/hide different login methods 2014-02-06 21:52:49 -06:00
7a1af5afe8 Added Express tutorial link 2014-02-06 08:55:19 -05:00
090e116546 Clarified instructions on app.locals.pretty = true 2014-02-06 08:45:07 -05:00
69a52ad3e1 Add comment blocks for twilio get and post controllers 2014-02-06 08:40:14 -05:00
b303a40aff Merge remote-tracking branch 'origin/master'
* origin/master:
  Updated Project Structure table
  Add mongoose section
  Updated Steam logo and API key instructions
2014-02-06 08:34:27 -05:00
aec3807d34 Updated docs button group on Twilio page.
Pass err.message instead of error object to the middleware.
2014-02-06 08:33:37 -05:00
78a3e681fb Success notification and redirect back to Twilio API page on successful text send. 2014-02-06 08:16:35 -05:00
a34dabbc68 Added Twilio POST route and controller 2014-02-06 08:09:54 -05:00
4e483fb07e Add 403 Forbidden on POST requests to FAQ 2014-02-06 08:09:39 -05:00
41cfc59cda Added Twilio API template, controller and route; + twilio library. 2014-02-06 07:46:47 -05:00
bed77159b9 Updated Project Structure table 2014-02-06 07:21:47 -05:00
56cac69379 Add mongoose section 2014-02-06 07:14:21 -05:00
86dcde4e25 Updated Steam logo and API key instructions 2014-02-06 04:50:41 -05:00
2475825c9b Responsive forms on User profile page. Fixes #58. 2014-02-06 04:40:13 -05:00
f0422b5dd8 Added error messages when Steam ID is invalid or missing 2014-02-06 04:13:42 -05:00
78b27a4841 Updated API index page 2014-02-06 04:07:12 -05:00
f34e5d57dc Changed playerSummaries to playerSummary since i am only getting information a single Steam ID 2014-02-06 03:54:26 -05:00
6fcdabb1b4 Added profile information, avatar, login status, and other nice improvements on Steam page 2014-02-06 03:51:06 -05:00
888f4eb86a Include free games in getOwnedGames, added custom thumbnail hover effect 2014-02-06 02:51:16 -05:00
0774772dcd Add owned games thumbnails 2014-02-05 23:27:13 -05:00
5aadeed73a Re-arranged routes, added comment blocks 2014-02-05 19:57:29 -05:00
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
38296e38b1 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
2014-02-05 19:44:54 -05:00
aa3e6e6a67 Add profile information and owned games to Steam template 2014-02-05 19:39:31 -05:00
eedfb77ac6 Steam API template display achievements 2014-02-05 19:30:00 -05:00
7fa3a401e6 Steam API code refactoring, added ownedGames API call 2014-02-05 19:29:46 -05:00
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
1687440588 removes steam auth, sets up steam api requests in async 2014-02-05 21:04:02 +00:00
de8601fb79 Update README 2014-02-05 12:56:38 -05:00
a86326c40c Placed lock icon outside of URL 2014-02-05 12:53:30 -05:00
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
3da95d635e Fixed missing checkbox images, tweaked radio button styles 2014-02-05 12:14:52 -05:00
e4d3fba68b Radio button text wrapped with span tag 2014-02-05 12:11:20 -05:00
aa36ad9fbb Adds Steam auth and API 2014-02-05 16:37:48 +00:00
1cc0bb4526 Safe reference Facebook profile location 2014-02-04 13:28:27 -05:00
f56bd90dce Merge branch 'master' of https://github.com/dstroot/hackathon-starter into dstroot-master
* 'master' of https://github.com/dstroot/hackathon-starter:
  Better approach to Twitter email and Facebook location
2014-02-04 13:26:28 -05:00