Commit Graph

4863 Commits

Author SHA1 Message Date
f06d6ca650 Merging of the framework: Ready for QA run 2015-08-24 01:16:15 +01:00
d445aeb569 Merge pull request #2593 from srodman7689/srodman7689-2552
Closes issue #2552
2015-08-24 01:15:05 +01:00
5e97207174 Close issue #2552 2015-08-23 18:59:34 -05:00
f0a783c9df Added some leniency to the test so that it doesn't require a new line 2015-08-24 00:29:34 +01:00
8136443f87 Fix #2605 2015-08-24 00:22:35 +01:00
390469a1b6 Framework work not working - in progress 2015-08-23 22:45:28 +01:00
1477f56f97 Merge of the frameworks: the desolation of the views 2015-08-23 22:26:02 +01:00
ede956e1d6 Merge of the frameworks: an unexpected merge 2015-08-23 21:59:29 +01:00
2cc09ce374 Typo Fix. Closes #2592
Changed "greater then" to "greater than" in Waypoint 30, http://freecodecamp.com/challenges/waypoint-generate-random-whole-numbers-with-javascript
2015-08-23 12:20:28 -06:00
84f976c0d8 Update README.md 2015-08-23 08:18:40 -07:00
d85eded058 Consistently capitalize GitHub in the account settings text
- Also remove the capital D from Delete in the confirmation line—it's
  not the start of a sentence.
2015-08-23 13:52:14 +01:00
e960cbd9b1 Fixes a typo #2311 2015-08-23 16:38:38 +04:00
7d1398d01d issue 2308 2015-08-23 12:14:03 +02:00
ba0ff40604 Fixed #1876; fixed some grammar issues; adhered to JS comment conventions 2015-08-23 05:19:45 -04:00
a8e3af20b0 Replaced backticks with <code></code> 2015-08-23 05:03:52 -04:00
2d3c0c2780 Deleted tab 2015-08-23 03:47:13 -04:00
7b53607492 Fixes #1950 using @benschenker's suggested text. 2015-08-23 03:42:42 -04:00
a6175aa47a Fix Link to Bug Reporting Guidelines in Contributing.md 2015-08-23 07:20:27 +00:00
fa31b38083 Update README.md
Added some additional steps for getting started with the repo
2015-08-22 22:09:49 -07:00
9fc3fd72b1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-22 18:08:37 -07:00
4cc423e488 possibly fix issue with bootstrap wells challenge 2015-08-22 18:08:25 -07:00
0107ec6006 replace other images with imgur images and turn one image into a code snippet 2015-08-22 17:47:52 -07:00
cbb0397dae replace evernote links with more reliable imgur links 2015-08-22 17:44:53 -07:00
ebf1530d6f update JavaScript copy from pull request 2015-08-22 17:40:59 -07:00
810e40e4db Merge pull request #2505 from issyl0/fix_typo_iterate_with_js
In the while loop iterator section, advise while loops, not for loops
2015-08-22 17:22:14 -07:00
4d9a5dc7fa Merge pull request #2520 from ahstro/contributing
Added CONTRIBUTING.md
2015-08-22 15:24:46 -07:00
46c3e638e5 Merge pull request #2529 from issyl0/consistently_use_double_quotes
Target Even Numbered Elements: consistently use double quotes
2015-08-22 15:23:59 -07:00
9ae92c92b2 Target Even Numbered Elements: consistently use double quotes
- Fixes #2528.
2015-08-22 23:20:48 +01:00
38397fa5f7 Fixed help modal part 3: the modal strikes back 2015-08-22 23:18:10 +01:00
bb64ff18a1 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-22 15:16:30 -07:00
a28a79124c Merge pull request #2530 from abhisekp/patch-5
Fix Add your JavaScript Slot Machine Instructions
2015-08-22 15:16:16 -07:00
a1cd8c8720 update the fcc-footer style slightly 2015-08-22 14:58:59 -07:00
3b6da88e7f Fix error in string 2015-08-23 03:26:20 +05:30
e87913edad Fix Add your JavaScript Slot Machine Instructions 2015-08-23 03:22:05 +05:30
c35fde061d Fixed help modal part 2 2015-08-22 22:51:48 +01:00
99f285d2e4 Added CONTRIBUTING.md 2015-08-22 22:37:47 +02:00
1206655940 In the while loop iterator section, advise while loops, not for loops
- Fixes #2504.
2015-08-22 20:27:08 +01:00
73eb6ec2d1 kind of got the modals working - Ben will finish this 2015-08-22 12:10:08 -07:00
cd4823de76 comment out a line that was causing JavaScript errors 2015-08-22 11:42:27 -07:00
e9050290eb remove now unnecessary jquery functions 2015-08-22 11:42:11 -07:00
33418cc813 Merge pull request #2419 from bugron/bugron-1064
fixed unclosed "code" tag #1064
2015-08-22 11:01:15 -07:00
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
3d818147a5 Spans for Inline Elements: remove "grow" as we already said "fill"
- Fixes #2332.
2015-08-22 18:51:21 +01:00
ab35e56661 Target Parent jQuery: elements => element because we reference only one
- Partially fixes #2392.
2015-08-22 18:46:37 +01:00
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
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
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
3ff2fc946c Add missing <code> tags to form element bootstrap waypoint
- Fixes #2409.
2015-08-22 17:19:46 +01:00
c094032255 Merge pull request #2493 from uwaseem/uwaseem-2479
Fixed grammar - replaced 'but' with 'by'
2015-08-22 09:11:02 -07:00
7fad44e648 Fixed grammar - replaced 'but' with 'by' 2015-08-22 22:21:15 +08:00