Commit Graph

5054 Commits

Author SHA1 Message Date
66a490bbee add simon video and forkable template for portfolio zipline 2015-08-24 22:50:36 -07:00
852c2e3094 Merge pull request #2569 from issyl0/remove_mentions_of_h1
Center Text with Bootstrap: don't mention <h1> as it doesn't exist
2015-08-24 20:04:34 -07:00
4d97932310 Merge pull request #2611 from jbmartinez/jbmartinez-2610
Added tests to enforce ID styling. Closes #2610
2015-08-24 20:03:44 -07:00
bc1393edac Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into calculator 2015-08-24 19:19:58 -07:00
a94c919374 update cost calculator 2015-08-24 19:19:47 -07:00
048a7d3dce Merge pull request #2620 from bugron/bugron-1522
Fixes missing backslash in waypoints' instructions'
2015-08-24 19:02:22 -07:00
86d7c2f35a Merge pull request #2646 from QuincyLarson/linking 2015-08-25 02:00:04 +01:00
e5a9b697ae Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-24 17:54:00 -07:00
fd440916a8 add descriptive message to failed account linking attempt 2015-08-24 17:52:12 -07:00
2d8184ce21 Merge pull request #2637 from srodman7689/srodman7689-2636
Removed extra word from the description of bootstrap Waypoint: Use Spans for Inline Elements
2015-08-24 16:58:41 -07:00
b0a572bbfc Merging of the framework: Ready for QA run - Now with nice errors and function fatal + $($) fatal detection 2015-08-25 00:49:19 +01:00
afd8bc1bd1 Merge pull request #2633 from bugron/bugron-2153
Adds a desctiption to avoid confusion in JS challenges
2015-08-24 16:21:41 -07:00
f750182a4b Adds a desctiption to avoid confusion in JS challenges 2015-08-25 04:41:02 +04:00
b3d66e1ae0 add json lint gulp task 2015-08-24 16:19:34 -07:00
15c49ec520 remove unused challenge utils 2015-08-24 16:19:06 -07:00
4403f589b8 Closes Issue #2636 2015-08-24 16:21:05 -05:00
d24611800d Merge pull request #2574 from issyl0/consistent_capitalization
Consistently capitalize "Delete" in the description and the tests
2015-08-24 12:59:24 -07:00
9d79d98e04 Center Text with Bootstrap: don't mention <h1> as it doesn't exist
- Also change the wording of the preceding sentence to be singular, as
  we only care about <h2>s.
- Fixes #1361.
2015-08-24 20:14:23 +01:00
f5e266a260 Consistently capitalize "Delete" in the description and the tests
- http://www.freecodecamp.com/challenges/waypoint-warn-your-users-of-a-dangerous-action.
- Fixes #1405.
2015-08-24 20:10:13 +01:00
175800ef37 Merge pull request #2421 from bugron/bugron-1063
fixed missing URL scheme #1063
2015-08-24 11:15:02 -07:00
26e1f3fdac Merge pull request #2568 from AryanJ-NYC/AryanJ-NYC-1876
Fixed #1876; fixed some grammar issues; adhered to JS comment convent…
2015-08-24 11:14:32 -07:00
67681d41f6 Merge pull request #2487 from bugron/bugron-news_more_btn_fix
Fixes info buttons' text in Camper News search results
2015-08-24 11:12:12 -07:00
045d1a73b6 Merge pull request #2570 from dokkillo/dokkillo-2308
issue 2308 Center Text with Bootstrap typo
2015-08-24 11:10:51 -07:00
4ff9d2ffe1 Merge pull request #2578 from issyl0/fix_github_capitalization
Consistently capitalize GitHub in the account settings text
2015-08-24 11:04:24 -07:00
c82909de0c Merge pull request #2596 from suhussai/suhussai-2592
Typo Fix. Closes #2592
2015-08-24 11:03:34 -07:00
d5118f489f Merge pull request #2619 from bugron/bugron-lisenting_typo
Fixes a typo in source code
2015-08-24 10:57:03 -07:00
cf24be1673 Merge pull request #2577 from bugron/bugron-2311
Fixes a typo #2311
2015-08-24 10:53:56 -07:00
2df93737cf Merge pull request #2565 from benschenker/benschenker-2553
Fix Link to Bug Reporting Guidelines in Contributing.md
2015-08-24 10:50:25 -07:00
d54bbaaf2d Fixes missing backslash in waypoints' instructions'
In three waypoints: [Find Numbers with Regular Expressions](http://www.freecodecamp.com/challenges/waypoint-find-numbers-with-regular-expressions), [Find White Space with Regular Expressions](http://www.freecodecamp.com/challenges/waypoint-find-white-space-with-regular-expressions), [Invert Regular Expression Matches with JavaScript](http://www.freecodecamp.com/challenges/waypoint-invert-regular-expression-matches-with-javascript) there are confusing instructions: /d+/gi instead of /\d+/gi, /s+/gi instead of /\s+/gi, /S+/gi instead of /\S+/gi.This commit fixed them.
2015-08-24 14:48:38 +04:00
49e3e20555 Fixes a typo in source code 2015-08-24 11:57:14 +04:00
141e6f7c36 Added tests for enforcing ID styling. Closes #2610 2015-08-24 03:03:02 +00:00
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
67158e876d Check all children instead of just one in 'Target Children with jQuery' 2015-08-23 15:19:05 +02: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