Commit Graph

6550 Commits (c3fca1a4fa69a19dce1d59e19d1f73d8d3e1e6bf)

Author SHA1 Message Date
Rex Schrader c3fca1a4fa Merge pull request #5329 from bogadodiegoh/fix-replace-extra-escape
Updated escape expression with '''
2015-12-16 18:47:19 -08:00
Diego Bogado 1e74f83f36 Updated escape expression with '''
Updated text in json-apis-and-ajax.json file to replace extra
'\', used in line 138.
2015-12-16 23:02:24 -03:00
Logan Tegman 41a462bc83 Merge pull request #5302 from AkiraLaine/staging
fixed "greenfield" typo - closes #5296
2015-12-16 10:57:55 -08:00
Logan Tegman 2a5c382697 Merge pull request #5316 from josh3336/fix/mobile-map-list
Fixes issue with map line numbering breaking into differnet lines
2015-12-16 10:56:02 -08:00
joshua pagano 254a3511cc Fixes issue with map line numbering breaking into differnet lines
[Fixes #5309]
2015-12-15 22:53:55 -08:00
Berkeley Martinez 7681b3155d Merge pull request #5292 from FreeCodeCamp/greenkeeper-webpack-stream-3.1.0
Update webpack-stream to version 3.1.0 🚀
2015-12-15 14:29:08 -08:00
Akira Laine 2d1192f362 fixed "greenfield" typo - closes #5296 2015-12-15 20:28:31 +11:00
Logan Tegman 7080b67a2e Merge pull request #5058 from FreeCodeCamp/feature/hikes
Add super blocks and challenge placeholders
2015-12-14 13:33:43 -08:00
Berkeley Martinez 0fca3bad7f Filter out coming soon from challenge blocks 2015-12-14 13:19:30 -08:00
Berkeley Martinez 355c8214e6 Filter out coming soon challenges from returnNextChallenge 2015-12-14 13:19:30 -08:00
Berkeley Martinez 2d559efdee Fix for block order 2015-12-14 13:19:30 -08:00
Berkeley Martinez cdd067607f Fix challenge order 2015-12-14 13:19:30 -08:00
Berkeley Martinez 38d71abda6 Fix block stream not being set correctly 2015-12-14 13:19:30 -08:00
Berkeley Martinez 773358980c Fix cert name 2015-12-14 13:19:30 -08:00
Berkeley Martinez 107f42e8f4 Change verify cert to back end 2015-12-14 13:19:30 -08:00
Quincy Larson c8e7b7d682 minor fix to challenge sequence 2015-12-14 13:19:30 -08:00
Quincy Larson c4064d4e99 minor fixes to challenge map 2015-12-14 13:19:30 -08:00
Quincy Larson 65b7edca0b hardcode the full stack and interview prep sections 2015-12-14 13:19:30 -08:00
Berkeley Martinez 6db0252ab1 Fix map indenting 2015-12-14 13:19:30 -08:00
Berkeley Martinez 0b4052fc38 Add prop to user model 2015-12-14 13:19:30 -08:00
Berkeley Martinez 2aa611047f Change full stack to back end 2015-12-14 13:19:30 -08:00
Quincy Larson a553cbbb2b add interviewing and nonprofit projects to map 2015-12-14 13:19:30 -08:00
Quincy Larson 9f7934911d add interview-preparation 2015-12-14 13:19:30 -08:00
Quincy Larson eb4cb35000 fix the sequence within the challenge blocks 2015-12-14 13:19:30 -08:00
Quincy Larson 5ea3282baf add full stack development folder 2015-12-14 13:19:30 -08:00
Berkeley Martinez 521dea581a Fix jsonlint glob 2015-12-14 13:19:30 -08:00
Berkeley Martinez 51e38dc9d3 Re-add spanish translations 2015-12-14 13:19:30 -08:00
Berkeley Martinez c39128b6bc Should be thousands 2015-12-14 13:19:30 -08:00
Berkeley Martinez 0c4a780f54 Add logic to allow coming soon challenge to be seen and not used 2015-12-14 13:19:30 -08:00
Berkeley Martinez fe8fe0ff0d Fix lint error 2015-12-14 13:19:30 -08:00
Berkeley Martinez 5c2bdd974a Add isComingSoon flag 2015-12-14 13:19:30 -08:00
Berkeley Martinez 9848aa8eab Remove console.log 2015-12-14 13:19:30 -08:00
Berkeley Martinez f7f587194d Add superblock ordering 2015-12-14 13:19:30 -08:00
Berkeley Martinez 108179e72e Fix react motion api change 2015-12-14 13:19:30 -08:00
Berkeley Martinez c87737a0c5 Remove 800 hour thingy 2015-12-14 13:19:30 -08:00
Berkeley Martinez c736a5c00f Use regex to hide hikes
Capitalize super block
2015-12-14 13:19:30 -08:00
Berkeley Martinez 8175fbb297 Remove console.log 2015-12-14 13:19:30 -08:00
Berkeley Martinez 8037ff9038 Remove hikes from map view 2015-12-14 13:19:30 -08:00
Berkeley Martinez ab043d1c6d Change map logic and view 2015-12-14 13:19:30 -08:00
Quincy Larson 4c1d84cbf4 fix duplicate ids 2015-12-14 13:19:30 -08:00
Quincy Larson 29cee8b921 restructure challenges within directories 2015-12-14 13:19:30 -08:00
Berkeley Martinez adc0ce28e5 Add superBlock to challenge seed 2015-12-14 13:19:30 -08:00
Berkeley Martinez 9f922310ea Add recursive file seeding 2015-12-14 13:19:30 -08:00
Berkeley Martinez 75821c4db3 Change hikes order 2015-12-14 13:19:30 -08:00
greenkeeperio-bot e0afc54a14 chore(package): update webpack-stream to version 3.1.0
http://greenkeeper.io/
2015-12-14 10:47:37 -08:00
Logan Tegman 7e7fbd1848 Merge pull request #5180 from yjcxy12/fix/npm_run_only_once
fix npm script only-once: changed ech to echo
2015-12-13 12:43:10 -08:00
Xiangyun Chi 428d391df8 fix npm script only-once: changed ech to echo 2015-12-13 20:19:45 +00:00
Rex Schrader 5627c13ee7 Merge pull request #5175 from yjcxy12/fix/issue#5167
Fixed hard coded values pass for Waypoint: Make Unique Objects
2015-12-13 11:12:15 -08:00
Rex Schrader 8ce6d5a60a Merge pull request #5169 from FreeCodeCamp/fix/challenge-time-ga
Fix challenge ga time completion
2015-12-13 11:04:12 -08:00
Rex Schrader 25ad1d5660 Merge pull request #5168 from FreeCodeCamp/fix/loopback-mongodb
Fix loopback-connector-mongodb breaking change
2015-12-13 10:54:36 -08:00