Commit Graph

29599 Commits

Author SHA1 Message Date
09c56cb73a Allow optional white space when nesting arrays 2015-08-14 12:08:40 +01:00
8a9a8710da Allow optional white space when nesting arrays 2015-08-14 12:08:40 +01:00
a99a1a50bd Merge pull request #1746 from ahstro/es6-tests
Mocha tests now use ES6
2015-08-14 01:52:35 -07:00
dca68ef0b0 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
af3f6bb109 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
73d11fec27 Mocha tests now use ES6 2015-08-14 09:39:29 +02:00
db6662d76d Bonfire: Where art thou test case update
Added further test cases to check for adhering to the instructions in bonfire properly.
2015-08-14 12:31:58 +05:30
2acf8b727c Bonfire: Where art thou test case update
Added further test cases to check for adhering to the instructions in bonfire properly.
2015-08-14 12:31:58 +05:30
cd4fd1720d make additional improvements to JavaScript challenge copy 2015-08-13 23:44:13 -07:00
99e7116ee5 make additional improvements to JavaScript challenge copy 2015-08-13 23:44:13 -07:00
edf9959fc9 finish jquery and start modifying javascript 2015-08-13 22:07:54 -07:00
f3cef6de46 finish jquery and start modifying javascript 2015-08-13 22:07:54 -07:00
7c5d5cc51a finish QAing bootstrap 2015-08-13 20:58:27 -07:00
f1dd82974f finish QAing bootstrap 2015-08-13 20:58:27 -07:00
060eeefd32 fix a ton of bugs in waypoints 2015-08-13 17:57:06 -07:00
914d9c81b0 fix a ton of bugs in waypoints 2015-08-13 17:57:06 -07:00
9402b3b052 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
ed0d38a474 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
c84a25c582 Merge pull request #1748 from FreeCodeCamp/jquery
Improved challenges and normalized formating
2015-08-13 15:52:02 -07:00
12f2aa9957 Merge pull request #1748 from FreeCodeCamp/jquery
Improved challenges and normalized formating
2015-08-13 15:52:02 -07:00
34c65633c0 move json and ajax challenges to under construction directory 2015-08-13 15:49:38 -07:00
dc54e37df6 move json and ajax challenges to under construction directory 2015-08-13 15:49:38 -07:00
cd5d7ac8e8 lint json 2015-08-13 15:42:17 -07:00
8cfdd4c742 add environmental vars to pm2start instead of hardcoding 2015-08-13 15:42:17 -07:00
146f42ef41 lint json 2015-08-13 15:42:17 -07:00
70d2810306 remove accordian 2015-08-13 15:41:30 -07:00
acf48aa403 show jobs in dev
remove old jobs stuff
2015-08-13 15:41:30 -07:00
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
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
837d412777 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
3f05565739 use double quotes for all string literals in waypoints 2015-08-13 15:32:40 -07:00
b14990dd63 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
0a8855fb11 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
c801b4b907 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/jquery.json
2015-08-13 13:25:53 -07:00
2711664505 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/jquery.json
2015-08-13 13:25:53 -07:00
74ba74bb3b Added a more specific example 2015-08-13 21:25:31 +01:00
095552dbbe Added a more specific example 2015-08-13 21:25:31 +01:00
043ef69d2f start adding json challenges 2015-08-13 12:55:50 -07:00
4cdd0e20d9 start adding json challenges 2015-08-13 12:55:50 -07:00
d881c14070 Add some code highlighting 2015-08-13 17:36:02 +01:00
299405694b Add some code highlighting 2015-08-13 17:36:02 +01:00
b470523d89 Added some testing and debugging challenges 2015-08-13 17:33:23 +01:00
c0140a9510 Added some testing and debugging challenges 2015-08-13 17:33:23 +01:00
5905e19e1b Merge remote-tracking branch 'origin/OOPF' into OOPF 2015-08-13 12:57:14 +01:00
40b43370eb update twitch page title thanks to @1hella for spotting this 2015-08-13 01:20:45 -07:00
c50b9c5afa Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 00:57:42 -07:00
2bbb2bd541 remove inaccurate copy from jQuery challenge 2015-08-13 00:57:36 -07:00
66bd9338ab remove inaccurate copy from jQuery challenge 2015-08-13 00:57:36 -07:00
3aacf90018 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
1b7195fbc1 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00