Commit Graph

29555 Commits

Author SHA1 Message Date
ac4a71a229 fix signin button to use signin instead of login for path 2015-10-25 21:46:54 -07:00
8fd3f55a7a Merge pull request #3907 from FreeCodeCamp/fix/loop-waypoint-typo
fix waypoint typo
2015-10-25 19:48:13 -07:00
df8df1172b fix waypoint typo 2015-10-25 19:47:02 -07:00
033dd5ee9c fix waypoint typo 2015-10-25 19:47:02 -07:00
3883483d8d Merge pull request #3595 from FreeCodeCamp/curriculum/JSONAndAJAX
Curriculum/json and ajax for QA and copy check
2015-10-26 00:47:30 +00:00
8ed3d3e723 Merge pull request #3595 from FreeCodeCamp/curriculum/JSONAndAJAX
Curriculum/json and ajax for QA and copy check
2015-10-26 00:47:30 +00:00
7605a92e35 The word several is repeated in step 11
In step 11 of the build a personal portfolio zipline, the word
“several” is repeated.
2015-10-24 23:38:55 -05:00
2a1c48bc49 The word several is repeated in step 11
In step 11 of the build a personal portfolio zipline, the word
“several” is repeated.
2015-10-24 23:38:55 -05:00
93681509e5 Add tests to intermediate bonfire
The bonfire only tested the camper's solution for numbers upto 29. This
commit adds tests that verify the solution for numbers upto 1000. This
should motivate the campers to create a more sound logic that will work
for more numbers.
2015-10-25 10:32:48 +08:00
0e5461e08f Add tests to intermediate bonfire
The bonfire only tested the camper's solution for numbers upto 29. This
commit adds tests that verify the solution for numbers upto 1000. This
should motivate the campers to create a more sound logic that will work
for more numbers.
2015-10-25 10:32:48 +08:00
565d4d1309 Merge branch 'ahstro-3228' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3228
Conflicts:
	seed/challenges/basic-javascript.json
2015-10-24 01:39:05 -07:00
2ca89c19e9 Merge branch 'ahstro-3228' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3228
Conflicts:
	seed/challenges/basic-javascript.json
2015-10-24 01:39:05 -07:00
0e70f98171 Merge branch 'fcc-running-cats' of https://github.com/ptsurbeleu/FreeCodeCamp into ptsurbeleu-fcc-running-cats
Conflicts:
	seed/challenges/bootstrap.json
2015-10-24 01:33:26 -07:00
4cf242d4b1 Merge branch 'fcc-running-cats' of https://github.com/ptsurbeleu/FreeCodeCamp into ptsurbeleu-fcc-running-cats
Conflicts:
	seed/challenges/bootstrap.json
2015-10-24 01:33:26 -07:00
b2a19cfec5 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-24 01:26:30 -07:00
c1212e159c Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-24 01:26:30 -07:00
711b5cb8be Merge branch 'awesomeaniruddh-fix/bonfire-test' into staging 2015-10-24 01:26:18 -07:00
d1cc8350a4 Merge branch 'fix/bonfire-test' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-fix/bonfire-test
Conflicts:
	seed/challenges/basic-bonfires.json
2015-10-24 01:25:42 -07:00
6dbbf56c5c Merge branch 'fix/bonfire-test' of https://github.com/awesomeaniruddh/FreeCodeCamp into awesomeaniruddh-fix/bonfire-test
Conflicts:
	seed/challenges/basic-bonfires.json
2015-10-24 01:25:42 -07:00
882b82fe1d Merge pull request #3876 from FreeCodeCamp/fix/symmetric-dif
remove test based on closed @saadanerdetbare PR, closes #3362
2015-10-24 01:21:42 -07:00
af8fd9e653 Merge pull request #3876 from FreeCodeCamp/fix/symmetric-dif
remove test based on closed @saadanerdetbare PR, closes #3362
2015-10-24 01:21:42 -07:00
d5ddb10b7a remove test based on closed @saadanerdetbare PR, closes #3362 2015-10-24 01:21:01 -07:00
f39c3eabe1 remove test based on closed @saadanerdetbare PR, closes #3362 2015-10-24 01:21:01 -07:00
2ebc551197 Merge pull request #3380 from joel-bentley/fix/tests-on-waypoint-img-responsive
Fix tests on Waypoint Mobile Responsive Images
2015-10-24 01:14:43 -07:00
8a8157fd67 Merge pull request #3380 from joel-bentley/fix/tests-on-waypoint-img-responsive
Fix tests on Waypoint Mobile Responsive Images
2015-10-24 01:14:43 -07:00
a8f3e663e3 Merge pull request #3383 from abhisekp/correct-test-bf-where-belong
Modify tests for Bonfire - Where do I belong
2015-10-24 00:46:16 -07:00
d970e5a97c Merge pull request #3383 from abhisekp/correct-test-bf-where-belong
Modify tests for Bonfire - Where do I belong
2015-10-24 00:46:16 -07:00
333d4c0ffa Merge pull request #3384 from richchurcher/fix/where-do-i-belong
Modify description for Where do I belong
2015-10-24 00:45:28 -07:00
a4e893ead9 Merge pull request #3384 from richchurcher/fix/where-do-i-belong
Modify description for Where do I belong
2015-10-24 00:45:28 -07:00
e521cdb2a6 additional minor edits 2015-10-24 00:17:06 -07:00
8157c6e20c Temporary fix to bugs due to removeComments method-closes #3763 2015-10-24 12:45:30 +05:30
70b7383f3b Merge branch 'patch-1' of https://github.com/rngadam/FreeCodeCamp into rngadam-patch-1 2015-10-23 23:49:41 -07:00
f6fe58e866 merge staging and make my own minor improvements 2015-10-23 23:45:42 -07:00
92868736c0 merge staging and make my own minor improvements 2015-10-23 23:45:42 -07:00
dfe0ba1a7b Merge branch 'saintpeter-new-for-loops' of https://github.com/SaintPeter/FreeCodeCamp into SaintPeter-saintpeter-new-for-loops 2015-10-23 22:51:41 -07:00
a6a5b430b3 Merge branch 'saintpeter-new-for-loops' of https://github.com/SaintPeter/FreeCodeCamp into SaintPeter-saintpeter-new-for-loops 2015-10-23 22:51:41 -07:00
40ebacf63b Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-23 22:50:10 -07:00
990dbc6f52 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-23 22:50:10 -07:00
7eb1870c79 fix second instance of logger.html 2015-10-23 22:48:49 -07:00
6e7df9288a fix second instance of logger.html 2015-10-23 22:48:49 -07:00
7c7454bc94 Merge branch 'fix/test-slot-machine-to-life' of https://github.com/natac13/freecodecamp into natac13-fix/test-slot-machine-to-life 2015-10-23 22:45:23 -07:00
7ede839a02 Merge branch 'fix/test-slot-machine-to-life' of https://github.com/natac13/freecodecamp into natac13-fix/test-slot-machine-to-life 2015-10-23 22:45:23 -07:00
ce165ba791 Merge pull request #3620 from ltegman/fix-everything-be-true-tests-3394
Fix BF: Everything Be True Description and Tests
2015-10-23 22:41:12 -07:00
f16dd554fc Merge pull request #3620 from ltegman/fix-everything-be-true-tests-3394
Fix BF: Everything Be True Description and Tests
2015-10-23 22:41:12 -07:00
4954a7c999 Merge pull request #3789 from ltegman/fix/OOP-functional-lesson-cleanup-3760
Add Better Explanations to the Functional Programming Lessons
2015-10-23 22:39:59 -07:00
e552984244 Merge pull request #3789 from ltegman/fix/OOP-functional-lesson-cleanup-3760
Add Better Explanations to the Functional Programming Lessons
2015-10-23 22:39:59 -07:00
e53a771cfe Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging 2015-10-23 22:12:26 -07:00
bf6611e988 Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging 2015-10-23 22:12:26 -07:00
ed0a25e1cb Merge pull request #3841 from michael-krebs/feature/add-advanced-solutions
Adds dting's solutions to advanced bonfires
2015-10-23 22:10:18 -07:00
e89c8b5525 Merge pull request #3841 from michael-krebs/feature/add-advanced-solutions
Adds dting's solutions to advanced bonfires
2015-10-23 22:10:18 -07:00