greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
697 Commits
3 Branches
0 Tags
959 MiB
Commit Graph

292 Commits (0774772dcd3fa2f741e962d2062748cca1f095d5)

Author SHA1 Message Date
Sahat Yalkabov 0774772dcd Add owned games thumbnails 2014-02-05 23:27:13 -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 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
Sahat Yalkabov aa3e6e6a67 Add profile information and owned games to Steam template 2014-02-05 19:39:31 -05:00
Sahat Yalkabov eedfb77ac6 Steam API template display achievements 2014-02-05 19:30:00 -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 a86326c40c Placed lock icon outside of URL 2014-02-05 12:53:30 -05: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
Sahat Yalkabov e4d3fba68b Radio button text wrapped with span tag 2014-02-05 12:11:20 -05:00
Karl Jakober aa36ad9fbb Adds Steam auth and API 2014-02-05 16:37:48 +00:00
Abimael Martell adedc05b54 fix form inputs labels 
some form inputs has a wrong "for" attribute
 2014-02-04 09:24:04 -08:00
Sahat Yalkabov 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
Sahat Yalkabov 0b89b41376 Display gravatar if no profile image is present 2014-02-03 19:12:21 -05:00
Sahat Yalkabov cf4b87988b Add icons to buttons on account page 2014-02-03 18:54:43 -05:00
Sahat Yalkabov 09ef5201e5 Made gravatar consistent with the rest of the form in Profile Information section 2014-02-03 18:51:19 -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
Brian Ridings c5199929a5 Update profile.jade 2014-02-03 13:32:13 -05:00
Brian Ridings 1b6aa2e603 Readded newline 2014-02-03 13:31:53 -05:00
Brian Ridings c99c8fe1f8 Changed Views to accept CSRF token 2014-02-03 13:08:34 -05:00
Brian Ridings f9ec861151 Added CSRF Protection to all form views 2014-02-03 13:02:24 -05:00
Sahat Yalkabov abd06d56c5 Removed blank lines 2014-02-03 09:25:33 -05:00
Ignazio Setti defa74f022 Use asset concatenation functions for loading styles and scripts inside layout file 2014-02-03 08:36:24 -05:00
Sahat Yalkabov 2412559ca7 Updated default style 2014-02-01 02:07:30 -05:00
Sahat Yalkabov f3a6cc4a89 Added lock icons instead of login required text 2014-02-01 01:58:40 -05:00
Sahat Yalkabov 8e17019208 Updated bootstrap and jquery references in layout 2014-02-01 01:33:45 -05:00
Sahat Yalkabov 77332fd641 Added fa icons to navbar 2014-02-01 01:32:36 -05:00
Sahat Yalkabov 6934aa1f98 Include CSS files inside styles.less, reduces number of HTTP requests 2014-01-31 00:29:29 -05:00
Sahat Yalkabov c5638ef5d2 Removed forgot password template and link on login page. 2014-01-29 19:40:40 -05:00
Sahat Yalkabov e9830325cd Update to Flip in X animation on home page success alert 2014-01-29 02:27:40 -05:00
Sahat Yalkabov 066bdd4f12 Display user email if Full Name is not present 2014-01-28 23:43:01 -05:00
Sahat Yalkabov a98844493a Removed .lead class from the list of APIs 2014-01-28 22:59:48 -05:00
Sahat Yalkabov 471f53f28b Added .profile-image class to an image in navbar to make it more explicit and easier to style 2014-01-28 22:49:23 -05:00
Sahat Yalkabov 12ee6a6b9d Add help-block with "Forgot your password" 2014-01-28 18:58:23 -05:00
Sahat Yalkabov 83fd4cc2a1 Add Forgot Password view 2014-01-28 18:57:58 -05:00
Sahat Yalkabov 717e47d52d Merge pull request #16 from williamle8300/patch-1 
Fixed spelling typo: "irreversible"
 2014-01-28 14:54:23 -08:00
Sahat Yalkabov 666a70a50e Update contact page to work with express-flash 2014-01-28 17:44:25 -05:00
Sahat Yalkabov 45d0c35f9d Update flash notifications on login, profile, signup pages to work with new express-flash 2014-01-28 17:41:13 -05:00
williamle8300 7890b38c28 Fixed spelling typo: "irreversible" 2014-01-28 14:35:44 -08:00
Ignazio Setti 32f64b3a92 Split the view into partials 2014-01-28 20:03:41 +01:00
Sahat Yalkabov 639db23067 Static content caching 2014-01-28 01:45:45 -05:00
Tim Messerschmidt 12d402f8fb Adds view for PayPal SDK sample 2014-01-27 12:21:43 -08:00
Tim Messerschmidt 3ca51fbbc4 Adds PayPal to the API browser 2014-01-27 11:36:59 -08:00
Sahat Yalkabov 839f91488a Fixed animation and data-dismiss on profile flash messages 2014-01-27 07:56:47 -05:00
Sahat Yalkabov 37fcec2221 Removed flat-ui-radios.js script call. 2014-01-27 07:56:30 -05:00
Sahat Yalkabov 802d685ee8 Add Login required text on some api links 2014-01-26 17:29:19 -05:00
Sahat Yalkabov ab09056976 Add sticky footer 2014-01-24 02:14:40 -05:00
Sahat Yalkabov 930aab7046 Update login and contact templates 2014-01-23 22:48:24 -05:00
Sahat Yalkabov be73f9c62f Add express validators to signup page, replaces custom written if statements 2014-01-23 22:39:59 -05:00