Commit Graph

4730 Commits (cbb0397dae3c56e9ed5b68df708922663d05ad58)

Author SHA1 Message Date
Quincy Larson cbb0397dae replace evernote links with more reliable imgur links 2015-08-22 17:44:53 -07:00
Quincy Larson ebf1530d6f update JavaScript copy from pull request 2015-08-22 17:40:59 -07:00
Quincy Larson bb64ff18a1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-22 15:16:30 -07:00
Quincy Larson a28a79124c Merge pull request #2530 from abhisekp/patch-5
Fix Add your JavaScript Slot Machine Instructions
2015-08-22 15:16:16 -07:00
Quincy Larson a1cd8c8720 update the fcc-footer style slightly 2015-08-22 14:58:59 -07:00
Abhisek Pattnaik 3b6da88e7f Fix error in string 2015-08-23 03:26:20 +05:30
Abhisek Pattnaik e87913edad Fix Add your JavaScript Slot Machine Instructions 2015-08-23 03:22:05 +05:30
benmcmahon100 c35fde061d Fixed help modal part 2 2015-08-22 22:51:48 +01:00
Quincy Larson 73eb6ec2d1 kind of got the modals working - Ben will finish this 2015-08-22 12:10:08 -07:00
Quincy Larson cd4823de76 comment out a line that was causing JavaScript errors 2015-08-22 11:42:27 -07:00
Quincy Larson e9050290eb remove now unnecessary jquery functions 2015-08-22 11:42:11 -07:00
Berkeley Martinez 33418cc813 Merge pull request #2419 from bugron/bugron-1064
fixed unclosed "code" tag #1064
2015-08-22 11:01:15 -07:00
Berkeley Martinez e4908513e9 Merge pull request #2501 from issyl0/fix_typos
Fix typos in Target Parent jQuery and Spans for Inline Elements waypoints
2015-08-22 11:00:47 -07:00
Isabell Long 3d818147a5 Spans for Inline Elements: remove "grow" as we already said "fill"
- Fixes #2332.
2015-08-22 18:51:21 +01:00
Isabell Long ab35e56661 Target Parent jQuery: elements => element because we reference only one
- Partially fixes #2392.
2015-08-22 18:46:37 +01:00
Berkeley Martinez f90f59f0c6 Merge pull request #2498 from issyl0/add_full_stops
Add full stops at the end of "Random Whole Number" waypoint
2015-08-22 10:14:04 -07:00
Isabell Long a816dc5a19 Add periods at the end of sentences in the Random Whole Number waypoint
- Partially fixes #1991.
2015-08-22 18:08:58 +01:00
Berkeley Martinez 8545105232 Merge pull request #2496 from issyl0/fix_code_tag_form_elements
Add missing <code> tags to form element bootstrap waypoint
2015-08-22 09:22:30 -07:00
Isabell Long 3ff2fc946c Add missing <code> tags to form element bootstrap waypoint
- Fixes #2409.
2015-08-22 17:19:46 +01:00
Berkeley Martinez c094032255 Merge pull request #2493 from uwaseem/uwaseem-2479
Fixed grammar - replaced 'but' with 'by'
2015-08-22 09:11:02 -07:00
waseem 7fad44e648 Fixed grammar - replaced 'but' with 'by' 2015-08-22 22:21:15 +08:00
benmcmahon100 901f1a977d Merge remote-tracking branch 'origin/staging' into staging 2015-08-22 00:59:34 +01:00
benmcmahon100 38a73e392f Deactivated scroll locking 2015-08-22 00:59:21 +01:00
Berkeley Martinez f5a652e046 fix remove console log 2015-08-21 16:09:50 -07:00
Berkeley Martinez 0f3acc629c fix profile linking 2015-08-21 16:09:07 -07:00
Berkeley Martinez d5c6a54923 Merge pull request #2459 from allan-hernandez/patch-1
Confusing Wells Text - #2391 #2458
2015-08-21 14:43:25 -07:00
benmcmahon100 cd511ad314 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:40:18 +01:00
benmcmahon100 ae6746f978 Fix a syntax(ish) error 2015-08-21 22:37:34 +01:00
Allan Hernandez 1c2748b623 Update bootstrap.json
Clarifying - Agree with @BerkeleyTrue on clarity
2015-08-21 16:35:14 -05:00
benmcmahon100 ae43cb0fa3 Merge pull request #2451 from ahstro/ahstro-2440
Moved myArray into 'Only change code'-block
2015-08-21 22:34:16 +01:00
Berkeley Martinez 9dd3960a0b Merge pull request #2454 from saadanerdetbare/saadanerdetbare-2431
2431 changed wording on testresult
2015-08-21 14:30:27 -07:00
Allan Hernandez 007f913517 Confusing Wells Text - #2391 #2458
Checklist instructions were incorrect as seen in

closes #2391 
closes #2458
2015-08-21 16:17:21 -05:00
benmcmahon100 0f1baeeb68 Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 22:01:11 +01:00
benmcmahon100 e33a929f0c Fix #2444 2015-08-21 22:01:03 +01:00
Jakob Dahl 49fcdec9b7 2431 reworded 2nd test 2015-08-21 22:54:03 +02:00
Jakob Dahl dd71ada021 2431 changed wording on testresult 2015-08-21 22:06:04 +02:00
Berkeley Martinez c32e89baff fix delete is a keyword not a function 2015-08-21 12:37:47 -07:00
ahstro ae6271964f Moved myArray into 'Only change code'-block 2015-08-21 21:22:25 +02:00
benmcmahon100 d87b0457fe Merge remote-tracking branch 'origin/staging' into staging 2015-08-21 20:21:15 +01:00
benmcmahon100 9584c7870a Update JSON 2015-08-21 20:20:56 +01:00
Berkeley Martinez 6d3fcb3d0b Merge pull request #2342 from dokkillo/dokkillo-2333
issue 2333 : Fix grammar error in Waypoint
2015-08-21 09:37:17 -07:00
Arsen Melikyan 3d16d96133 fixed #1064 2015-08-21 17:56:44 +04:00
Quincy Larson adc50b764d uncomment social linking 2015-08-20 19:52:48 -07:00
benmcmahon100 184b913895 Merge remote-tracking branch 'origin/staging' into staging 2015-08-20 23:39:06 +01:00
benmcmahon100 4de75fc9e7 Fix #2364 2015-08-20 23:38:16 +01:00
Berkeley Martinez 2f4e459e82 Merge branch 'master' into staging 2015-08-20 15:19:18 -07:00
dokkillo 81afc27412 issue 2333 2015-08-20 20:24:25 +02:00
Berkeley Martinez d14eb0dbaa fix 401 account/delete if not auth 2015-08-20 09:40:29 -07:00
benmcmahon100 708b8dc0dc Merge pull request #2241 from dokkillo/dokkillo-2238
issue #2238
2015-08-20 17:35:23 +01:00
benmcmahon100 bec51ec2db Merge pull request #2315 from erratadei/erratadei-1754-and-2305
change in basic bonfire Mutations
2015-08-20 17:32:34 +01:00