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

6930 Commits (8e1f8d215948b0b2ffa97f545f588bf7b070d164)

Author SHA1 Message Date
Quincy Larson 41c0bf1f0e Merge branch 'CodeNonprofit-add/commitnonprofit' into staging 2015-12-09 15:00:58 -06:00
Quincy Larson 8c06293df3 update json for commit 2015-12-09 14:59:56 -06:00
Quincy Larson 66431753b3 Merge branch 'add/commitnonprofit' of https://github.com/CodeNonprofit/FreeCodeCamp into CodeNonprofit-add/commitnonprofit 2015-12-09 14:14:21 -06:00
Quincy Larson 747dbfe750 update landing icons 2015-12-09 14:13:18 -06:00
Michael D. Johnson aea2eaf2e7 Added 3 new nonprofits to Commit 2015-12-09 14:27:02 -05:00
Logan Tegman 22ef7fa3da Merge pull request #5069 from FreeCodeCamp/fix/reduce-header-size 
Reduce header size
 2015-12-09 11:19:35 -08:00
Berkeley Martinez 0f75aa3b88 Add freecatphotoapp to csp 2015-12-09 11:02:06 -08:00
Berkeley Martinez 9822cc67f9 Reduce header size 
This is needed to move to cloudFlare
 2015-12-09 10:56:40 -08:00
Logan Tegman 172d0f0207 Fix Bonfire Truncate a String Typo 2015-12-09 09:12:50 -08:00
Logan Tegman 0c8bf2dd9f Fix Waypoint Use Comments Test 2015-12-09 00:01:54 -08:00
Rex Schrader 4bcdb3d286 Merge pull request #5091 from LenaBarinova/fix/test-cases-do-not-catch-obvious-critcal-errors 
Fix tests on Use Conditional Logic with If and Else to fail on wrong if
 2015-12-08 16:45:04 -08:00
Berkeley Martinez f709ee30ee Fix for completedDate missing 2015-12-08 16:17:45 -08:00
Berkeley Martinez 579c569d15 Fix remove bonfire save endpoint 
fix completedChallenge saving solution
remove unnecessary code.
 2015-12-08 16:17:45 -08:00
Berkeley Martinez 9774638d43 Fix waypoints are not bonfires 2015-12-08 16:17:45 -08:00
Rex Schrader 6b7a314205 Merge pull request #5076 from FreeCodeCamp/update-ziplines 
Update ZIpline and Basejump code review instructions, remove gist export
 2015-12-08 16:13:58 -08:00
Rex Schrader da491ed374 Merge pull request #5088 from LenaBarinova/fix/free-code-camp-map 
Challenge numbering in Map fixed to work properly on IE.
 2015-12-08 15:47:42 -08:00
Logan Tegman c2e025ca23 Merge pull request #5094 from FreeCodeCamp/fix/history-semvar 
Use same history as react-router
 2015-12-08 15:39:42 -08:00
Berkeley Martinez e5bf30ce12 Use same history as react-router 2015-12-08 15:34:45 -08:00
Rex Schrader c900850256 Merge pull request #5092 from gasperno/fix/step-challenge-mobile 
step challenge button block in mobile version fixed
 2015-12-08 15:07:17 -08:00
Harsha d3f1829931 step challenge button block in mobile version fixed 2015-12-08 17:45:30 -05:00
JelenaBarinova 104552b85c Fix tests on Use Conditional Logic with If and Else to fail on wrong if implemenmtation 2015-12-08 14:28:49 -08:00
Logan Tegman 285d7cbf50 Merge pull request #5086 from FreeCodeCamp/fix/replace-tags 
Make tag replacement more robust
 2015-12-08 12:42:12 -08:00
Quincy Larson 0f51dcfdf4 add comma to 1000 2015-12-08 14:35:25 -06:00
Quincy Larson 025a1269eb remove additional gist button 2015-12-08 14:34:05 -06:00
JelenaBarinova 96375bb643 Challenge numbering in Map fixed to work properly on IE. 2015-12-08 11:46:35 -08:00
Berkeley Martinez 5270f0e42e Make tag replacement more robust 
Some challenges are incorrectly saved with no solutions
 2015-12-08 11:30:47 -08:00
Logan Tegman eb740482ec Merge pull request #5075 from FreeCodeCamp/fix/run-first-time 
Fix run first time
 2015-12-08 08:52:01 -08:00
Logan Tegman 6b9f320285 Merge pull request #5079 from dtraid/grammar 
Fix grammar in Waypoint: Prefilter JSON (who's/whose)
 2015-12-08 08:38:31 -08:00
Diego Traíd 2a0d84cc63 Fixed grammar: who's -> whose 2015-12-08 16:50:52 +01:00
Logan Tegman 7a912c355b Merge pull request #5062 from KrishnaYeolekar/fix/improved-test-for-override-css 
Fix/improved test for overriding css style
 2015-12-08 07:10:44 -08:00
Krishna Yeolekar 7807c2453d Improve tests for overriding css challenge 2015-12-08 15:19:59 +05:30
Quincy Larson 9409945ee7 Merge branch 'staging' into update-ziplines 
Conflicts:
	client/commonFramework/bindings.js
 2015-12-08 01:17:03 -06:00
Berkeley Martinez e12e49e25e Fix run first time 
Now called `only-once`
but will not throw if run more than once
also, uses node to create file
 2015-12-07 23:16:33 -08:00
Logan Tegman c23367f62b Merge pull request #5038 from bugron/fix/common-improvements 
Some common code improvements
 2015-12-07 06:48:47 -08:00
Logan Tegman 1aa470b184 Merge pull request #5024 from gasperno/fix/multiple-lines-img-tag-regex 
Modified regex in test case for passing img tag spanning multiple lines
 2015-12-07 06:40:33 -08:00
Quincy Larson 92928b552b update user stories and sharing instructions for basejumps and ziplines 2015-12-07 00:51:37 -06:00
Berkeley Martinez f585b846bf Merge pull request #5055 from QuincyLarson/fix/better-zipline-and-basejump-copy 
improve introductory challenges for ziplines and bonfires
 2015-12-06 20:41:53 -08:00
Quincy Larson 34ac4e2e71 improve introductory challenges for ziplines and bonfires 2015-12-06 22:06:26 -06:00
Harsha a051d8cc93 Modified regex in test case for passing img tag spanning multiple lines 2015-12-06 21:08:30 -05:00
Logan Tegman 6a7f7d9204 Merge pull request #5047 from bogadodiegoh/fix/jQuery-Funhouse-text 
Updated text from "jQuery Funhouse" to "jQuery Playground"
 2015-12-06 11:56:04 -08:00
Diego Bogado cbd117c64d Updated text from "jQuery Funhouse" to "jQuery Playground" 
This change fixes the issue #5032.
 2015-12-06 16:49:18 -03:00
Logan Tegman de302ae925 Merge pull request #5031 from gasperno/fix/multiple-lines-modify-regex 
fix regex to test h1 tag spanning multiple lines
 2015-12-06 10:55:36 -08:00
Arsen Melikyan 029cd52e80 Some common code improvements 2015-12-06 13:26:02 +04:00
Arsen Melikyan 99df268239 Merge pull request #5035 from FreeCodeCamp/fix/code-uri 
Make code-uri more robust
 2015-12-06 12:56:29 +04:00
Berkeley Martinez 415a39ea17 Make code-uri more robust 2015-12-05 14:53:33 -08:00
Logan Tegman addcd4fa20 Merge pull request #5023 from regonn/fix/indent 
fix indent in intermediate-bonfires.json
 2015-12-05 13:50:21 -08:00
Harsha 111ff7ed1c fix regex to test h1 tag spanning multiple lines 2015-12-05 15:54:43 -05:00
regonn ad57364427 fix indent intermediate-bonfires.json 2015-12-05 15:15:44 +09:00
Quincy Larson 0e11374188 Merge pull request #5006 from vtamara/fix/translation-minor-spanish 
Minor improvements to spanish translation
 2015-12-05 00:02:30 -06:00
Quincy Larson 9525d135f8 Merge pull request #5022 from FreeCodeCamp/QuincyLarson-remove-angular 
Remove angular
 2015-12-04 21:47:55 -06:00