Commit Graph

88 Commits

Author SHA1 Message Date
Quincy Larson
98bf10a7d3 QA javascript challenges and remove slot machine for now 2015-08-15 11:11:25 -07:00
Quincy Larson
2bbad67141 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 17:29:28 -07:00
Quincy Larson
aed4b6bfe1 improvements to copy of text and test output 2015-08-14 17:26:24 -07:00
benmcmahon100
326c22276d Added a helper function to main.js for challenge making 2015-08-15 01:08:33 +01:00
Quincy Larson
e6297de282 add semicolons to end of all tests in js-style challenges 2015-08-14 14:48:59 -07:00
Quincy Larson
3a81e6efb3 improve javascript challenge copy 2015-08-14 14:40:02 -07:00
Quincy Larson
338485db8e Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 13:50:31 -07:00
Quincy Larson
28e0ad29cf more improvements to javascript challenges 2015-08-14 13:50:20 -07:00
benmcmahon100
d0b5bcd0b0 Fixed a weird error involving RegEx and single quotes 2015-08-14 20:26:05 +01:00
benmcmahon100
8a9a8710da Allow optional white space when nesting arrays 2015-08-14 12:08:40 +01:00
Quincy Larson
af3f6bb109 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
Quincy Larson
99e7116ee5 make additional improvements to JavaScript challenge copy 2015-08-13 23:44:13 -07:00
Quincy Larson
f3cef6de46 finish jquery and start modifying javascript 2015-08-13 22:07:54 -07:00
Quincy Larson
fea723efbd Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-08-13 15:39:30 -07:00
Quincy Larson
3f05565739 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
benmcmahon100
095552dbbe Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson
d138757c52 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
benmcmahon100
1dc66b7671 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100
9df99eb635 Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
Quincy Larson
db6db2e403 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -07:00
sonorangirl
fb44b50941 Made some spaces optional for 4th test 2015-08-10 19:32:52 -07:00
sonorangirl
8efe8ee825 Fixed RegEx so that 4th test would pass 2015-08-10 19:22:18 -07:00
sonorangirl
8a16942036 Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -07:00
Isabell Long
76e4fc2d33 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
1d724f145e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -07:00
Shouvik Roy
02717582d8 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
Berkeley Martinez
26e69c8621 add type to challenges 2015-08-07 23:37:32 -07:00
Berkeley Martinez
f241a362d5 rename top level title to name 2015-08-07 18:43:45 -07:00
ahstro
e7c8589d08 Everything is horrible 2015-08-08 02:38:16 +02:00
Quincy Larson
c5ad1ad851 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 23:19:18 -07:00
Quincy Larson
629eaa6ef9 restructure curriculum to split jQuery and Ajax into seperate sections 2015-08-06 23:19:05 -07:00
Samuel Plumppu
4349d06d16 fixed typos 2015-08-06 20:45:59 +02:00
benmcmahon100
e68bc0272d Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1593 2015-08-06 14:54:44 +01:00
benmcmahon100
5eb9c060e1 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1599 2015-08-06 14:51:26 +01:00
Quincy Larson
dfb48fbdad update dashed name 2015-08-06 02:26:09 -07:00
Quincy Larson
2e0e7d5a74 rename all of Ben's JavaScript challenges to be more in line with other waypoints 2015-08-06 02:06:53 -07:00
Marcin Flotyński
5882b9b84f Fixed a few typos in javascript-basic 2015-08-06 09:03:03 +02:00
benmcmahon100
117306de33 Merge pull request #1576 from cristianvnica/cristianvnica-1575
Fixing #1575
2015-08-05 21:24:05 +01:00
Cristian V. Nica
caef8c9da8 Fixing #1575
Fixing small typo
2015-08-05 23:22:37 +03:00
benmcmahon100
974bf503ec Merge pull request #1572 from cristianvnica/cristianvnica-1571
Trying to fix: #1571
2015-08-05 20:43:17 +01:00
Quincy Larson
40cdf76035 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-05 11:58:09 -07:00
Quincy Larson
01e408d48c new final-ish curriculum structure 2015-08-05 11:57:58 -07:00
Cristian V. Nica
5ff371fc6f Trying to fix: #1571
I have found a small typo on challenge: An Array Of new Information
2015-08-05 21:55:25 +03:00
benmcmahon100
f68c6d0fa3 Changed the object lessons to use dot notation instead of bracket
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1564
2015-08-05 17:31:42 +01:00
benmcmahon100
e7cac3ccf9 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1559 2015-08-05 16:54:57 +01:00
benmcmahon100
ceed3c4877 Fix some typos 2015-08-05 15:38:54 +01:00
Quincy Larson
959fde64fc add a span challenge and replace more old outside images with s3 images 2015-08-05 00:06:20 -07:00
benmcmahon100
fc0ccf3aea Fixed typos in magical maths waypoints and restored server.js to a previous working state 2015-08-04 13:28:41 +01:00
Quincy Larson
aa10e1ff69 quick sweep to make sure all tests run properly 2015-08-03 23:03:12 -07:00
Quincy Larson
eb8b9df5ad Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-03 21:17:55 -07:00