Commit Graph

4826 Commits

Author SHA1 Message Date
b24f367749 Changes nonexistent variable name to proper one 2015-08-26 18:59:59 +04:00
851af506b5 Merge pull request #2691 from QuincyLarson/alt-text
Add more alt text to onboarding page.
2015-08-25 15:21:44 -07:00
300e79273a increase height fix timeout 2015-08-25 14:55:45 -07:00
14d1d1db02 fix left panel jitter jump 2015-08-25 14:49:19 -07:00
b1b07a5b9e Fixed major Fudge up with challenges without functions 2015-08-25 22:25:00 +01:00
56b18f313b update get-started alt text 2015-08-25 14:23:47 -07:00
a6153c86e4 Tweak function declaration checker 2015-08-25 21:48:15 +01:00
c9113faee5 added error to the $($) blocker 2015-08-25 21:07:36 +01:00
8509197b6d Fixed RegEx to be super accurate again 2015-08-25 21:03:50 +01:00
16cd733dd3 Fixed RegEx to be super accurate 2015-08-25 20:55:19 +01:00
5441c5848e I can't spell 2015-08-25 20:48:46 +01:00
f3d4e7dec8 Fixed stupid fccss and fcces not replacing :p 2015-08-25 20:47:37 +01:00
a1daf448fd Merge pull request #2680 from FreeCodeCamp/FrameWork-Merger
add merged framework into staging
2015-08-25 12:42:27 -07:00
6ab5b0300a Merge remote-tracking branch 'origin/FrameWork-Merger' into FrameWork-Merger 2015-08-25 20:24:04 +01:00
7f467dbb8d Fixed scoped jQuery showing up in error messages and jQuery methods and chaining in spoofed jQuery 2015-08-25 20:23:47 +01:00
c913e9bbf7 Merge pull request #2679 from FreeCodeCamp/staging
update framework to remove merge conflicts
2015-08-25 19:41:29 +01:00
d33168fe25 Merge remote-tracking branch 'origin/FrameWork-Merger' into FrameWork-Merger
Conflicts:
	public/js/lib/coursewares/commonFrameWork.js
2015-08-25 19:28:27 +01:00
14cc6a7cef Final touch up to the framework before merge 2015-08-25 19:28:13 +01:00
50f1705cbc start updating alt text 2015-08-25 08:59:42 -07:00
5120540795 Merge pull request #2567 from AryanJ-NYC/AryanJ-NYC-1950
Added exercise description to 'Waypoint: Iterate over Arrays with map'
2015-08-25 08:42:23 -07:00
1133aeda9b Stopped the scripts needed for the preview being loaded on each keyDown 2015-08-25 16:10:11 +01:00
00f0debbcd Merge pull request #2672 from awesomeaniruddh/staging
replaced + by .
2015-08-25 15:46:22 +01:00
57c3261415 replaced + by . 2015-08-25 22:42:58 +08:00
d8a192a81a Merge pull request #2665 from awesomeaniruddh/staging
Cleaned up the descriptions for a couple of basic javascript waypoints
2015-08-25 15:42:26 +01: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
beb537d5eb Cleaned up description for 'Sift through Text with Regular Expressions' waypoint 2015-08-25 20:26:32 +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
3e54c81904 Merge pull request #2647 from QuincyLarson/calculator
Coding Bootcamp Calculator updates
2015-08-24 23:18:29 -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
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