Commit Graph

1364 Commits

Author SHA1 Message Date
Berkeley Martinez
382393e1f2 fix challenge ordering
Now challenges are ordered on map first by top order value of json file
second by index of array
2015-08-10 23:29:32 -07:00
Quincy Larson
22ce7219a6 get everything seeding again 2015-08-10 22:17:49 -07:00
Quincy Larson
f2356c6767 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
Berkeley Martinez
5ad9cf8fab Merge pull request #1512 from djordjelacmanovic/djordjelacmanovic-1511
fixed issue #1511 - now checking for words longer than 9 chars
2015-08-10 20:40:39 -07:00
Berkeley Martinez
0420624d6a Merge pull request #1612 from ahstro/ahstro-1467
Improve 'Turn an image to a Link'-waypoint
2015-08-10 20:25:54 -07:00
Berkeley Martinez
a36fcdabdd Merge pull request #1614 from ahstro/ahstro-1461
Grammatical error in 'Use Hex Code for Specific Colors'
2015-08-10 20:23:29 -07:00
Berkeley Martinez
b3de4e5de4 Merge pull request #1616 from ahstro/ahstro-1451
Wrong element in 'Target HTML Elements with Selectors Using jQuery'
2015-08-10 20:21:59 -07:00
Quincy Larson
eb5d275d23 improve get-started view and fix duplicate bonfire issue 2015-08-10 20:13:13 -07:00
Quincy Larson
d61dd76875 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into onboarding 2015-08-10 19:58:56 -07:00
sonorangirl
0670f73b6d Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
sonorangirl
f8c63c9dba Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
Berkeley Martinez
50f3845f32 Merge pull request #1671 from ahstro/ahstro-1402
Disregard order in 'Symmetric Difference'
2015-08-10 19:11:33 -07:00
Quincy Larson
354338e99f Merge branch 'staging' into onboarding 2015-08-10 18:30:34 -07:00
Quincy Larson
04d6de9a05 Merge branch 'staging' into onboarding 2015-08-10 18:30:15 -07:00
sonorangirl
e7f1f12a6f Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00
Berkeley Martinez
93df41acc6 fix duplicate id's 2015-08-10 17:40:45 -07:00
Berkeley Martinez
3c4213dd03 fix missing quote escape 2015-08-10 17:35:16 -07:00
Berkeley Martinez
cf1bb322e8 Merge pull request #1709 from martinkwan/patch-2
Updated DNA Pairing link
2015-08-10 16:39:13 -07:00
Berkeley Martinez
784572009e Merge pull request #1706 from kurzninja/patch-3
Fix for incorrect RGB test value
2015-08-10 16:27:15 -07:00
Berkeley Martinez
8b4a554e2c Merge pull request #1697 from martinkwan/patch-1
Updated Pig Latin Link
2015-08-10 15:46:12 -07:00
Quincy Larson
59e6204768 Merge branch 'staging' into onboarding 2015-08-10 15:42:07 -07:00
Martin Kwan
dbf92d04e1 Updated DNA Pairing link
Updated link so it would open in a new tab instead of the current tab
2015-08-10 14:42:37 -07:00
Martin Kwan
ee0392482d Update intermediate-bonfires.json 2015-08-10 13:42:33 -07:00
Berkeley Martinez
b1003b403c add to seed script: exit on error
filter challenge blocks that do not have challenges
2015-08-10 12:15:30 -07:00
Brett Guillory
062d73af14 Fix for incorrect RGB test value
RGB test value was testing for (0,0,255) which is B, should be testing for (0, 255,0), which is green.
2015-08-10 13:20:18 -05:00
Martin Kwan
b784ef90b6 Updated Pig Latin Link
Updated link so it would open in a new tab instead of the current tab
2015-08-10 00:40:12 -07:00
Berkeley Martinez
7dc6b4de86 Merge pull request #1613 from ahstro/wrong-class
Updated test case comment in 'fluid containers'
2015-08-09 23:06:56 -07:00
Berkeley Martinez
d2069827d5 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00
Berkeley Martinez
a7ba4bacf8 fix challenge naming scheme 2015-08-09 22:46:44 -07:00
Berkeley Martinez
339dfaeb1e Merge pull request #1675 from alanmbarr/alanmbarr-1375
Update bootstrap.json waypoint-line-up-form-elements-responsively-with-bootstrap typo
2015-08-09 22:46:09 -07:00
Berkeley Martinez
a45d23fd86 Merge pull request #1692 from royshouvik/patch-1
Update basic-javascript.json to fix #1642
2015-08-09 22:41:58 -07:00
Quincy Larson
2c6b1e9312 Merge branch 'staging' into onboarding 2015-08-09 22:00:26 -07:00
Quincy Larson
6ba77ca9f6 update curriculum structure again 2015-08-09 21:26:26 -07:00
Shouvik Roy
30b913b2d8 Update basic-javascript.json to fix #1642
Fixed following issues
#1639 : Fixed ```description``` to have "In JavaScript" instead of "in JavaScript" and added punctuation.
#1640 #1641 Added punctuation and fixed typo to have "perform mathematical functions" instead of "preform mathematical functions".
2015-08-10 07:32:57 +05:30
Quincy Larson
7ce1a06c54 remove pair programming Bonfire warm up challenge 2015-08-09 17:03:49 -07:00
Isabell Long
2f714f1541 Fix typos in the Basic Javascript challenge
- Partially fixes #1519 - looks like some of those typos had already
  been fixed.
2015-08-09 19:32:10 +00:00
Berkeley Martinez
babd7cb2eb Merge pull request #1704 from ahstro/completion-monitor
Refactored CompletionMonitor() slightly
2015-08-10 11:30:14 -07:00
Berkeley Martinez
4fae8d59b3 fix mising type
remove extra bonfire in title
2015-08-10 11:27:12 -07:00
ahstro
ce6f0b4a61 Incorrect JSON caused error during seed 2015-08-10 20:11:59 +02:00
ahstro
1fba648672 Refactored CompletionMonitor() slightly 2015-08-10 18:44:19 +02:00
Berkeley Martinez
22c416c7db add challenge order to individual challenge 2015-08-09 07:40:16 -07:00
alanmbarr
8a003d1c6a other typo
text input instead of area for clarity
2015-08-08 22:10:07 -07:00
alanmbarr
d3bbed92ed Update bootstrap.json 2015-08-08 21:59:03 -07:00
ahstro
e262b5d6bf Disregard order in 'Symmetric Difference' #1402 2015-08-09 02:08:44 +02:00
Quincy Larson
26a616b2d0 start onboarding page 2015-08-08 16:13:23 -07:00
benmcmahon100
af5633bf6b Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-08 17:21:13 +01:00
benmcmahon100
5e9a9d07fb Update to include OOP & functional programming course layout 2015-08-08 17:11:11 +01:00
Berkeley Martinez
150d531079 create name/dashName at seed 2015-08-08 07:50:35 -07:00
Berkeley Martinez
24e45d18ce add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez
d31b53da2a rename top level title to name 2015-08-07 18:43:45 -07:00