Commit Graph

87 Commits

Author SHA1 Message Date
Quincy Larson
0c3e20977d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 17:29:28 -07:00
Quincy Larson
7670d73ff5 improvements to copy of text and test output 2015-08-14 17:26:24 -07:00
benmcmahon100
273b731d29 Added a helper function to main.js for challenge making 2015-08-15 01:08:33 +01:00
Quincy Larson
fc7fcdc6a6 add semicolons to end of all tests in js-style challenges 2015-08-14 14:48:59 -07:00
Quincy Larson
56a8c203a7 improve javascript challenge copy 2015-08-14 14:40:02 -07:00
Quincy Larson
b56fd5b250 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-14 13:50:31 -07:00
Quincy Larson
a272b6f5ec more improvements to javascript challenges 2015-08-14 13:50:20 -07:00
benmcmahon100
e55b3f1782 Fixed a weird error involving RegEx and single quotes 2015-08-14 20:26:05 +01:00
benmcmahon100
09c56cb73a Allow optional white space when nesting arrays 2015-08-14 12:08:40 +01:00
Quincy Larson
dca68ef0b0 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
Quincy Larson
cd4fd1720d make additional improvements to JavaScript challenge copy 2015-08-13 23:44:13 -07:00
Quincy Larson
edf9959fc9 finish jquery and start modifying javascript 2015-08-13 22:07:54 -07:00
Quincy Larson
9275bd5076 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
837d412777 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
benmcmahon100
74ba74bb3b Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson
0fdf9fbe62 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
	seed/challenges/jquery.json
2015-08-12 02:06:03 -07:00
benmcmahon100
05afe79320 First four OOP challenges and the final slot machine challenge. 2015-08-12 00:11:56 +01:00
benmcmahon100
1827857eed Removed new incomplete JS Challenges and moved to OOPF branch. 2015-08-11 15:39:07 +01:00
Quincy Larson
f2356c6767 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/bootstrap.json
2015-08-10 22:03:51 -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
sonorangirl
e7f1f12a6f Fixed typos in 1st slot machine challenge 2015-08-10 18:05:07 -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
d2069827d5 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-09 22:58:46 -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
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
ahstro
75919c63f3 Everything is horrible 2015-08-08 02:38:16 +02:00
Quincy Larson
9f926c8f08 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-06 23:19:18 -07:00
Quincy Larson
aa58671ee3 restructure curriculum to split jQuery and Ajax into seperate sections 2015-08-06 23:19:05 -07:00
Samuel Plumppu
0624b65292 fixed typos 2015-08-06 20:45:59 +02:00
benmcmahon100
7284bbf7a7 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1593 2015-08-06 14:54:44 +01:00
benmcmahon100
a82265e883 Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1599 2015-08-06 14:51:26 +01:00
Quincy Larson
73ab630e0b update dashed name 2015-08-06 02:26:09 -07:00
Quincy Larson
ac44b5b481 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
d90bb6a4f4 Fixed a few typos in javascript-basic 2015-08-06 09:03:03 +02:00
benmcmahon100
59991365f5 Merge pull request #1576 from cristianvnica/cristianvnica-1575
Fixing #1575
2015-08-05 21:24:05 +01:00
Cristian V. Nica
241147a5c8 Fixing #1575
Fixing small typo
2015-08-05 23:22:37 +03:00
benmcmahon100
585ef7db12 Merge pull request #1572 from cristianvnica/cristianvnica-1571
Trying to fix: #1571
2015-08-05 20:43:17 +01:00
Quincy Larson
0254a9bd57 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-05 11:58:09 -07:00
Quincy Larson
40c371238d new final-ish curriculum structure 2015-08-05 11:57:58 -07:00
Cristian V. Nica
367bcdf35c 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
a784d9e960 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
b6dc52cf08 fix https://github.com/FreeCodeCamp/freecodecamp/issues/1559 2015-08-05 16:54:57 +01:00
benmcmahon100
92091cea96 Fix some typos 2015-08-05 15:38:54 +01:00
Quincy Larson
d838036ed2 add a span challenge and replace more old outside images with s3 images 2015-08-05 00:06:20 -07:00
benmcmahon100
e944889f69 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
1de4de80eb quick sweep to make sure all tests run properly 2015-08-03 23:03:12 -07:00
Quincy Larson
5a4560c0fb Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-03 21:17:55 -07:00
benmcmahon100
de124a4f81 Fixed two typos and fixed a no tests tun error 2015-08-03 20:43:23 +01:00