Commit Graph

26729 Commits

Author SHA1 Message Date
275fe55fe7 fixed conflicts 2015-08-25 22:21:33 +08:00
0cc032a6e9 fixed conflicts 2015-08-25 22:21:33 +08:00
e2c3ff08a8 Fixed the goodTests var not resetting 2015-08-25 14:46:23 +01:00
473d40baa8 Fixed the bugged test window replicating tests 2015-08-25 14:43:34 +01:00
07262eb5f1 Cleaned up description for 'Sift through Text with Regular Expressions' waypoint 2015-08-25 20:26:32 +08:00
beb537d5eb Cleaned up description for 'Sift through Text with Regular Expressions' waypoint 2015-08-25 20:26:32 +08:00
d59c504ec3 Expanded description of 'Build Javacript Objects' waypoint 2015-08-25 19:36:47 +08:00
5ce26c5b4b Expanded description of 'Build Javacript Objects' waypoint 2015-08-25 19:36:47 +08:00
782f06b737 Merge pull request #2018 from itxchy/patch-5
In the 9th jQuery challenge, I changed "#button" to "button" in the example to target all buttons.
2015-08-24 23:22:27 -07:00
734659881f Merge pull request #2018 from itxchy/patch-5
In the 9th jQuery challenge, I changed "#button" to "button" in the example to target all buttons.
2015-08-24 23:22:27 -07:00
3e54c81904 Merge pull request #2647 from QuincyLarson/calculator
Coding Bootcamp Calculator updates
2015-08-24 23:18:29 -07:00
e16a06a3c7 Merge pull request #2657 from QuincyLarson/update-ziplines
add simon video and forkable template for portfolio zipline
2015-08-24 23:17:17 -07:00
595544887c Merge pull request #2657 from QuincyLarson/update-ziplines
add simon video and forkable template for portfolio zipline
2015-08-24 23:17:17 -07:00
f744a85b90 add simon video and forkable template for portfolio zipline 2015-08-24 22:50:36 -07:00
66a490bbee add simon video and forkable template for portfolio zipline 2015-08-24 22:50:36 -07:00
c3a2b30422 Changed 'Show the Local Weather' wording to fix #2623 2015-08-24 23:11:21 -04:00
fbbbff2186 Changed 'Show the Local Weather' wording to fix #2623 2015-08-24 23:11:21 -04:00
53c982b51d 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
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
535828ba0f Merge pull request #2611 from jbmartinez/jbmartinez-2610
Added tests to enforce ID styling. Closes #2610
2015-08-24 20:03:44 -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
f6816de455 Merge pull request #2620 from bugron/bugron-1522
Fixes missing backslash in waypoints' instructions'
2015-08-24 19:02:22 -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
3014722a28 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-24 17:54:00 -07: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
4cce8e2f67 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
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
4fc38d0334 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
b3c33679b4 Adds a desctiption to avoid confusion in JS challenges 2015-08-25 04:41:02 +04: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
78a6edaa4f Closes Issue #2636 2015-08-24 16:21:05 -05:00
4403f589b8 Closes Issue #2636 2015-08-24 16:21:05 -05:00
1af6155e5c 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
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
fd54cc5a54 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
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
e50970a530 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
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
86c4d0bfd7 Merge pull request #2421 from bugron/bugron-1063
fixed missing URL scheme #1063
2015-08-24 11:15:02 -07:00
175800ef37 Merge pull request #2421 from bugron/bugron-1063
fixed missing URL scheme #1063
2015-08-24 11:15:02 -07:00
b49243ffe3 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
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