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

2924 Commits (6759b432e0a8397a2f1a5406a8ea6607df0babbc)

Author SHA1 Message Date
Nathan 6759b432e0 Merge pull request #438 from QuincyLarson/news-points 
News points
 2015-05-09 19:41:38 -04:00
Nathan 760f01d2d5 Update coursewares.json 2015-05-09 19:39:39 -04:00
Nathan 18645f7f91 Merge pull request #434 from terakilobyte/staging 
Change jQuery challenge description slightly.
 2015-05-09 19:38:10 -04:00
Nathan 361b07c463 Merge pull request #432 from zapstar/fix-431 
Added clarification to the search and replace bonfire (21)
 2015-05-09 19:36:31 -04:00
Quincy Larson f3646b0aae give points for upvoting, add facebook profile attribute, improve social profile icons 2015-05-09 16:23:45 -07:00
Quincy Larson 70503528d2 give user a point for submitting to news, remove broken javascript path, remove unnecessary empty js lib 2015-05-09 15:53:01 -07:00
Quincy Larson 47462991a4 add more facebook groups 2015-05-09 15:35:13 -07:00
Quincy Larson c0f6c8d124 add new facebook groups 2015-05-09 13:31:45 -07:00
Quincy Larson be28b145af Merge pull request #436 from FreeCodeCamp/staging 
Staging
 2015-05-09 11:21:15 -07:00
Quincy Larson c2f0072801 minor tweeks to improve field guide flow 2015-05-09 11:20:17 -07:00
Quincy Larson 149c715cf7 Merge pull request #435 from QuincyLarson/facebook-groups 
Facebook groups
 2015-05-09 10:59:21 -07:00
Quincy Larson b5747c7712 add facebook groups challenge, field guide and footer link 2015-05-09 10:52:02 -07:00
terakilobyte e7a8d14f5b Change jQuery challenge description slightly. Closes #433 2015-05-08 20:50:13 -04:00
terakilobyte 56b12efade Merge branch 'staging' 2015-05-08 17:13:41 -04:00
terakilobyte b6349d55b3 Use exacty wikipedia definition for smallest common multiple 2015-05-08 17:12:16 -04:00
Thirumal Venkat 8e8c1c67d1 Added clarification to Search and Replace bonfire 2015-05-08 23:26:41 +05:30
Quincy Larson 2f070d72cb Merge pull request #428 from FreeCodeCamp/staging 
Staging
 2015-05-07 23:31:59 -07:00
Berkeley Martinez 13e3d2dd77 Merge pull request #427 from QuincyLarson/field-guide-updates 
adds field guide updates
 2015-05-07 23:25:54 -07:00
Quincy Larson fe86c13947 finish updating field guides 2015-05-07 22:58:20 -07:00
Quincy Larson 8d2b82111b refine field guides 2015-05-07 22:31:20 -07:00
terakilobyte ab74e7819e Update helmet js and use newer middleware, update reference to freecodecamp in trusted group 2015-05-06 19:10:03 -04:00
Quincy Larson f97dc0e35c Merge pull request #426 from FreeCodeCamp/staging 
Fix for csp violations across all browsers and strange asset loading timing.
 2015-05-06 15:27:09 -07:00
terakilobyte ceb5c23be2 re-add commented out master header section 2015-05-06 18:17:01 -04:00
terakilobyte 77a15ed591 Remove unsafe inline, add blob: to trusted sources for compatibility with webkit 2015-05-06 18:14:00 -04:00
terakilobyte 72339f9183 Set correct mime type in jailed. Set correct types on script imports in bonfire/show. Open helmet up to potentially unsafe levels by allowing "* unsafe-inline" in scriptSrc. 2015-05-06 14:06:10 -04:00
terakilobyte 68420149b0 Revert "whitelist freecodecamp specifically in script src for helmet" 
This reverts commit 3919919daf.
 2015-05-06 12:49:59 -04:00
terakilobyte 3919919daf whitelist freecodecamp specifically in script src for helmet 2015-05-06 09:24:27 -04:00
terakilobyte adaa3cdece Remove template path, load correct javascript in universal header 2015-05-06 09:10:15 -04:00
Quincy Larson c61e3c8ed2 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-05 18:40:34 -07:00
Quincy Larson c9e7b30867 fix privacy policy link and remove redundant field guide entry 2015-05-05 18:31:03 -07:00
terakilobyte ba78710c82 Go with calculating streaks with fresh data as cached mongo can"t be relied upon 2015-05-05 21:21:13 -04:00
terakilobyte 517c37f633 More fixes to streak calculation 2015-05-05 21:13:46 -04:00
terakilobyte 30c4085d21 Quick fix for longest streak logic 2015-05-05 20:03:27 -04:00
terakilobyte 7b42757c9f Tilde bug 2015-05-05 20:00:14 -04:00
terakilobyte 0c4e6e2762 Linkify the bonfire names in profile view. 2015-05-05 19:53:54 -04:00
Quincy Larson 9c938f7978 Merge pull request #423 from QuincyLarson/master 
Bonfire display fix and new field-guide
 2015-05-05 16:42:16 -07:00
Quincy Larson 52f7dcc96b Merge remote-tracking branch 'upstream/staging' 
Conflicts:
	views/account/show.jade
 2015-05-05 16:41:28 -07:00
Quincy Larson e52c0a1578 Make bonfire sample code wrap properly within responsive div 2015-05-05 16:24:16 -07:00
Quincy Larson f5a7195e42 add deploy a website without code field guide 2015-05-05 16:23:51 -07:00
terakilobyte b73c7eac62 Ensure all bonfires have names in account profile view. Add more aptly names state flag for future user data massaging. 2015-05-05 16:12:53 -04:00
terakilobyte 1df3b2671b Stylize bonfires in account view 2015-05-05 15:36:56 -04:00
terakilobyte 1b393bb685 Closed #348. 2015-05-05 15:35:55 -04:00
Nathan f204e48ce9 Merge pull request #416 from pahlsson/pahlsson-bonfire-args-optional-fix 
Fix typo and add tests for bonfire Arguments Optional
 2015-05-05 15:25:28 -04:00
terakilobyte d3aaa5a11e Ensure twit exists in package.json and remove unecessary console statement 2015-05-05 14:24:07 -04:00
terakilobyte 2dc1ee26d2 Merge branch 'aldraco-twitterZipline' into staging 2015-05-05 14:18:34 -04:00
terakilobyte 82a1680943 Resolve merge conflicts 2015-05-05 14:18:28 -04:00
Quincy Larson 1d5392e5c1 Merge pull request #420 from terakilobyte/staging 
Delete newrelic.js file. Move static routes to bottom of express configu...
 2015-05-05 10:17:15 -07:00
terakilobyte 92b2d912d9 Delete newrelic.js file. Move static routes to bottom of express configuration as suggested in stackoverflow article. Closes #417 2015-05-05 13:14:07 -04:00
Nathan 770e298b65 Merge pull request #419 from QuincyLarson/point-fix 
add campwide meeting and fix user show points
 2015-05-05 12:48:32 -04:00
Quincy Larson 200fa53012 add campwide meeting and fix user show points 2015-05-05 09:22:38 -07:00