Commit Graph

4610 Commits (d49b303de30cf52d4e50594ed8cd712da10dcfbc)

Author SHA1 Message Date
Berkeley Martinez 129eebcc41 fix type should be rand not updated 2015-08-15 12:28:19 -07:00
Berkeley Martinez 2538a6c5fb Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-08-15 12:25:39 -07:00
Berkeley Martinez 13b38aefb5 add random attribute to user props
Allows easier random sampling
2015-08-15 12:19:36 -07:00
Isabell Long fa454cfdd4 Close a <code> tag so that only actual code is marked
- Fixes #1767, hopefully.
2015-08-15 19:53:04 +01:00
Quincy Larson 1dd0294a18 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-15 11:11:40 -07:00
Quincy Larson 98bf10a7d3 QA javascript challenges and remove slot machine for now 2015-08-15 11:11:25 -07:00
Berkeley Martinez f710fa1af6 remove pm2 memory fanciness 2015-08-14 18:48:24 -07:00
Berkeley Martinez bcdda9c62a fix unexpected syntax error on map 2015-08-14 18:25:34 -07:00
Berkeley Martinez 42303dc6aa fix progressBar not showing
reduce function needs initial seed

closes #1753
2015-08-14 18:24:14 -07:00
Berkeley Martinez 59609b655c migration improvements 2015-08-14 18:24:13 -07:00
Berkeley Martinez dfb85e4ba7 fix prevent crash from user migrated profiles 2015-08-14 18:24:13 -07:00
Quincy Larson 40ab7d2911 more style improvements to front end challenges 2015-08-14 18:17:34 -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
benmcmahon100 3d42b09bca Added a helper function to main.js for challenge making 2015-08-14 23:57:43 +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 6377cc124e Moved a permanent set css prop from jquery to CSS 2015-08-14 21:48:17 +01:00
benmcmahon100 d784cfcd76 Fix editor height locking features where it was displaying overflow instead of autoing 2015-08-14 21:46:13 +01:00
benmcmahon100 f07f74f523 Fixed a weird error involving RegEx and single quotes 2015-08-14 21:45:25 +01:00
Roger Turnau 01d71ca1d9 Added improved instructions to Least Common Multiple Bonfire. 2015-08-14 16:29:16 -04: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
Berkeley Martinez a99a1a50bd Merge pull request #1746 from ahstro/es6-tests
Mocha tests now use ES6
2015-08-14 01:52:35 -07:00
Quincy Larson af3f6bb109 more improvements to javascript challenges 2015-08-14 01:13:07 -07:00
ahstro 73d11fec27 Mocha tests now use ES6 2015-08-14 09:39:29 +02: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 f1dd82974f finish QAing bootstrap 2015-08-13 20:58:27 -07:00
Quincy Larson 914d9c81b0 fix a ton of bugs in waypoints 2015-08-13 17:57:06 -07:00
Quincy Larson ed0d38a474 make more progress QAing challenges 2015-08-13 17:20:52 -07:00
Berkeley Martinez 12f2aa9957 Merge pull request #1748 from FreeCodeCamp/jquery
Improved challenges and normalized formating
2015-08-13 15:52:02 -07:00
Quincy Larson dc54e37df6 move json and ajax challenges to under construction directory 2015-08-13 15:49:38 -07:00
Berkeley Martinez 8cfdd4c742 add environmental vars to pm2start instead of hardcoding 2015-08-13 15:42:17 -07:00
Berkeley Martinez 146f42ef41 lint json 2015-08-13 15:42:17 -07:00
Berkeley Martinez 70d2810306 remove accordian 2015-08-13 15:41:30 -07:00
Berkeley Martinez acf48aa403 show jobs in dev
remove old jobs stuff
2015-08-13 15:41:30 -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
Quincy Larson 0a8855fb11 Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-13 14:36:41 -07:00
Quincy Larson 2711664505 Merge branch 'staging' into jquery
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/jquery.json
2015-08-13 13:25:53 -07:00
benmcmahon100 095552dbbe Added a more specific example 2015-08-13 21:25:31 +01:00
Quincy Larson 4cdd0e20d9 start adding json challenges 2015-08-13 12:55:50 -07:00
benmcmahon100 299405694b Add some code highlighting 2015-08-13 17:36:02 +01:00
benmcmahon100 c0140a9510 Added some testing and debugging challenges 2015-08-13 17:33:23 +01:00
benmcmahon100 5905e19e1b Merge remote-tracking branch 'origin/OOPF' into OOPF 2015-08-13 12:57:14 +01:00
Quincy Larson 40b43370eb update twitch page title thanks to @1hella for spotting this 2015-08-13 01:20:45 -07:00