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
141ae63c27
Merge pull request #51 from abimaelmartell/fix/form-labels
...
fix form inputs labels
2014-02-04 09:45:22 -08:00
4351110ea2
Add OpenShift deployment instructions
2014-02-04 12:40:07 -05:00
adedc05b54
fix form inputs labels
...
some form inputs has a wrong "for" attribute
2014-02-04 09:24:04 -08:00
7121cbfe83
Better approach to Twitter email and Facebook location
2014-02-04 08:23:52 -08:00
d28fc059d4
Add Heroku deployment instructions
2014-02-04 11:21:07 -05:00
25927389ba
Various fixes and clarifications
2014-02-04 10:37:31 -05:00
e0c0c12bc8
Added deployment link to Table of Contents
2014-02-04 04:51:34 -05:00
836f37b09b
Add new deployment info
2014-02-04 04:47:56 -05:00
05cf844e28
Add MongoLab instructions
2014-02-04 04:27:40 -05:00
3345199578
Update Readme
2014-02-04 00:53:09 -05:00
93511f861f
Merge remote-tracking branch 'origin/master'
...
* origin/master:
fix error on PR #45x
Update FAQ on deployment error
fixes #36 add a table of contents
Fix line breaks
2014-02-04 00:38:08 -05:00
61e95b582b
Merge branch 'patch-1' of https://github.com/GeneralZero/hackathon-starter into GeneralZero-patch-1
...
* 'patch-1' of https://github.com/GeneralZero/hackathon-starter :
Update profile.jade
Readded newline
Removed extra app.use(express.csrf());
Removed dynamicHelpers comment
Changed Views to accept CSRF token
Added CSRF Protection to all form views
Add CSRF Security measures on login forms
Conflicts:
views/account/profile.jade
2014-02-04 00:37:32 -05:00
4e3dbb405c
Merge pull request #46 from westonplatter/master
...
fix error on PR #45 . change "use-tools" => "useful-tools"
2014-02-03 18:16:23 -08:00
62a5edf3d1
fix error on PR #45x
2014-02-03 19:03:09 -07:00
613437f335
Merge pull request #45 from westonplatter/master
...
fixes #36 add a table of contents
2014-02-03 17:21:59 -08:00
352624e8ff
Update FAQ on deployment error
2014-02-03 20:20:10 -05:00
a06adf0c3c
fixes #36 add a table of contents
2014-02-03 18:15:47 -07:00
690046d20e
Fix line breaks
2014-02-03 19:17:11 -05:00
0b89b41376
Display gravatar if no profile image is present
2014-02-03 19:12:21 -05:00
153d7254ad
Update formatting for style consistency
2014-02-03 19:07:17 -05:00
cf4b87988b
Add icons to buttons on account page
2014-02-03 18:54:43 -05:00
09ef5201e5
Made gravatar consistent with the rest of the form in Profile Information section
2014-02-03 18:51:19 -05:00
b9ba23263c
Merge branch 'master' of github.com:dmamills/hackathon-starter
...
Conflicts:
models/User.js
2014-02-03 18:19:42 -05:00
8e804c5a1a
retro default, better size for xs
2014-02-03 18:18:28 -05:00
85c3e8e83b
retro default, better size for xs
2014-02-03 18:03:12 -05:00
f5ecfc507c
add gravatar to profile
2014-02-03 17:50:47 -05:00
911cbf5685
Add NPM navbar-brand logo
2014-02-03 13:34:15 -05:00
c5199929a5
Update profile.jade
2014-02-03 13:32:13 -05:00
1b6aa2e603
Readded newline
2014-02-03 13:31:53 -05:00
ba1916c7d3
Removed extra app.use(express.csrf());
2014-02-03 13:31:04 -05:00
8f0e61c26b
Removed dynamicHelpers comment
2014-02-03 13:27:06 -05:00
ae2c6f7dce
Merge pull request #1 from GeneralZero/master
...
Changed Views to accept CSRF token
2014-02-03 10:10:43 -08:00
c99c8fe1f8
Changed Views to accept CSRF token
2014-02-03 13:08:34 -05:00
f9ec861151
Added CSRF Protection to all form views
2014-02-03 13:02:24 -05:00
Sahat Yalkabov
Karl Jakober
Abimael Martell
Dan Stroot
Weston Platter
Daniel Mills
Brian Ridings