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
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
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
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
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
b2a19cfec5
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
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
d5ddb10b7a
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
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
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
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
92868736c0
merge staging and make my own minor improvements
2015-10-23 23:45:42 -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
990dbc6f52
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-10-23 22:50:10 -07:00
6e7df9288a
fix second instance of logger.html
2015-10-23 22:48:49 -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
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
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
bf6611e988
Merge branch 'fix/jQuery-script-tag' of https://github.com/junhaoyap/FreeCodeCamp into staging
2015-10-23 22:12:26 -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
100075eea1
Merge pull request #3844 from krantzinator/feature/add-solutions
...
added 5 solutions to Basic Bonfies
2015-10-23 22:09:35 -07:00
ae084236c2
Merge pull request #3846 from vetom/patch-1
...
Updating the waypoint information
2015-10-23 22:08:00 -07:00
84223fceff
Merge pull request #3847 from junhaoyap/fix/jQuery-script-tag
...
Make first jQuery lesson more lenient for script tag
2015-10-23 21:55:37 -07:00
4d816df10a
Merge pull request #3869 from natac13/fix/add-solution-intermediate-bonfires
...
added @dting's solutions to the intermediate bonfires
2015-10-23 21:44:45 -07:00
b149bc7a04
Merge pull request #3863 from ribeirojpn/fix/test-message-in-Bonfire-Where-art-thou
...
fix first test message in Where art thou bonfire
2015-10-23 21:34:10 -07:00
d2cab92237
finish editing ajax challenges
2015-10-23 21:32:51 -07:00
75d5f92f31
fix/test message in Where art thou bonfire
2015-10-24 01:20:50 -03:00
b6423979a4
confirm that all tests pass as intended
2015-10-23 16:46:21 -07:00
e7c6e626e0
merge staging and overhaul ajax challenges
2015-10-23 16:19:00 -07:00
79ee2e31e9
added @dting's solutions to the intermediate bonfires
...
closes #3837
2015-10-23 19:18:45 -04:00
0f7b9add2f
Merge pull request #3868 from FreeCodeCamp/fix/javascript-linting
...
Fix linting in JavaScript editor
2015-10-24 00:05:53 +01:00
756efcd9fb
Fix linting in JavaScript editor
2015-10-23 15:38:51 -07:00
69387e57ee
Merge pull request #3824 from FreeCodeCamp/fix/init-app-for-dev
...
Fix first start for new devs
2015-10-23 14:32:15 -07:00
1fa5db288f
Merge pull request #3849 from FreeCodeCamp/feature/block-camper-news
...
Add camper must be auth with gitub to post to news
2015-10-23 14:28:47 -07:00
2ac70458b0
remove unnecessary bullet point from Camper News view
2015-10-23 14:28:27 -07:00
4910118366
update flash message
2015-10-23 14:12:09 -07:00
1db84d1455
Merge branch 'staging' into feature/block-camper-news
2015-10-23 14:08:19 -07:00
b2bbe00388
fix/test message in Bonfire:Where art thou
2015-10-23 15:26:23 -03:00
844f978fb0
Merge pull request #3854 from natac13/fix/unclear-description-target-with-jquery-selectors-#3845
...
fixed unclear description for jQuery challenge using all selectors
2015-10-22 23:49:22 -07:00
e7cae04c52
fixed unclear description for jQuery challenge using all selectors
...
suggested by @trs4ece
closes #3845
2015-10-22 17:32:40 -04:00
d29d3407ec
Merge pull request #3835 from FreeCodeCamp/feature/solutions
...
Add solutions to upper intermediate bonfires
2015-10-22 12:53:58 -07:00
2c33a1e568
Merge pull request #3851 from FreeCodeCamp/fix/weather
...
update weather challenge with api key
2015-10-22 21:06:30 +08:00
1d3fbc656a
added 5 solutions to basic bonfires
2015-10-22 08:33:10 -04:00
d8ebb7bf38
update weather challenge with api key
2015-10-22 02:14:34 -07:00
