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
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
c1212e159c
Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging
2015-10-24 01:26:30 -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
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
f39c3eabe1
remove test based on closed @saadanerdetbare PR, closes #3362
2015-10-24 01:21:01 -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
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
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
f6fe58e866
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
40ebacf63b
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
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
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
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
e53a771cfe
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
0281e0915c
Merge pull request #3844 from krantzinator/feature/add-solutions
...
added 5 solutions to Basic Bonfies
2015-10-23 22:09:35 -07:00
4385c4d7cd
Merge pull request #3846 from vetom/patch-1
...
Updating the waypoint information
2015-10-23 22:08:00 -07:00
cbd4a14adb
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
6fd5178f71
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
cc2b04467d
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
518bf25f39
fix/test message in Where art thou bonfire
2015-10-24 01:20:50 -03:00
502510ac29
added @dting's solutions to the intermediate bonfires
...
closes #3837
2015-10-23 19:18:45 -04:00
fab104c52d
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
c1e5238a34
fix/test message in Bonfire:Where art thou
2015-10-23 15:26:23 -03:00
924d35e610
fixed unclear description for jQuery challenge using all selectors
...
suggested by @trs4ece
closes #3845
2015-10-22 17:32:40 -04:00
b26810bdf7
Merge pull request #3835 from FreeCodeCamp/feature/solutions
...
Add solutions to upper intermediate bonfires
2015-10-22 12:53:58 -07:00
9a19e7e2e6
added 5 solutions to basic bonfires
2015-10-22 08:33:10 -04:00
073650fcc4
update weather challenge with api key
2015-10-22 02:14:34 -07:00
7e1cf529ad
Merge pull request #3827 from junhaoyap/fix/style-elements
...
Check is now stricter and needs braces and semicolon
2015-10-21 23:57:13 -07:00
9c6d6359c8
Merge pull request #3831 from uwaseem/fix/issue-3830
...
Fix typo - changes 'it's attribute' to 'its attribute'
2015-10-21 23:40:56 -07:00
1ef9f0e5a2
Merge pull request #3834 from michael-krebs/fix/finders-keepers-mdn-link
...
Changes Finders Keepers MDN link from array.some() to array.filter()
2015-10-21 23:24:44 -07:00
8726ea8108
Fix nonprofit model is called nonprofit
2015-10-21 21:51:37 -07:00
4f4ddb1df4
Merge pull request #3848 from FreeCodeCamp/feature/nonprofit-ids
...
Feature/nonprofit ids
2015-10-21 21:41:48 -07:00
dd30786461
update nonprofit files and delete old commented code
2015-10-21 21:30:47 -07:00
e4af7a0c81
Make first jQuery lesson more lenient for script tag
2015-10-21 21:02:43 -07:00
529a2d8ef1
Updating the waypoint information
...
After commit ec1d3ac in learnyoumongo, exercise "Find Limit" was renamed to "Find Project".
2015-10-21 23:49:17 -04:00
d31ce05b2a
Adds dting's solutions to advanced bonfires
2015-10-21 20:56:14 -04:00
097d6917ec
add solutions to challenges object and add solutions for upper intermediate bonfires
2015-10-21 15:04:58 -07:00
ae8777d495
Changes Finders Keepers MDN link from array.some() to array.filter()
2015-10-21 17:15:25 -04:00
e1f4f71e9c
Fix typo - changes 'it's attribute' to 'its attribute'
2015-10-21 22:50:15 +08:00
e87094754a
Add stricter check for CSS selectors styling elements
2015-10-20 22:27:27 -07:00
de24edfc29
Fix typo in basic-ziplines
2015-10-20 23:09:08 -04:00
cf61a55b92
Fix first start for new devs
...
also removes job seed
2015-10-20 19:53:08 -07:00
7aca723e73
Merge pull request #3813 from ltegman/fix/nest-anchor-in-paragraph-3805
...
Fix Waypoint Nest Anchor in Paragraph Code Guidance
2015-10-20 20:22:10 +08:00
3d924e526d
Add regex test for waypoint use CSS to be more strict
2015-10-19 21:38:15 -07:00
3e503e7aad
Fix Waypoint Nest Anchor in Paragraph Code Guidance
...
Added comments to delineate which areas of the code should be modified since we were seeing a lot of confusion on the tests not passing when the `p` tag was at the bottom of the page.
Closes #3805
2015-10-19 21:33:24 -07:00
42dca733db
Merge pull request #3367 from bugron/fix/nest-all_elements_in-container_fluid
...
Adds a new test which checks if all elements are nested in .container-fluid
2015-10-19 06:07:03 +08:00
