benmcmahon100
|
a6153c86e4
|
Tweak function declaration checker
|
2015-08-25 21:48:15 +01:00 |
benmcmahon100
|
c9113faee5
|
added error to the $($) blocker
|
2015-08-25 21:07:36 +01:00 |
benmcmahon100
|
8509197b6d
|
Fixed RegEx to be super accurate again
|
2015-08-25 21:03:50 +01:00 |
benmcmahon100
|
16cd733dd3
|
Fixed RegEx to be super accurate
|
2015-08-25 20:55:19 +01:00 |
benmcmahon100
|
5441c5848e
|
I can't spell
|
2015-08-25 20:48:46 +01:00 |
benmcmahon100
|
f3d4e7dec8
|
Fixed stupid fccss and fcces not replacing :p
|
2015-08-25 20:47:37 +01:00 |
Berkeley Martinez
|
a1daf448fd
|
Merge pull request #2680 from FreeCodeCamp/FrameWork-Merger
add merged framework into staging
|
2015-08-25 12:42:27 -07:00 |
benmcmahon100
|
6ab5b0300a
|
Merge remote-tracking branch 'origin/FrameWork-Merger' into FrameWork-Merger
|
2015-08-25 20:24:04 +01:00 |
benmcmahon100
|
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 |
Ben McMahon
|
c913e9bbf7
|
Merge pull request #2679 from FreeCodeCamp/staging
update framework to remove merge conflicts
|
2015-08-25 19:41:29 +01:00 |
benmcmahon100
|
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 |
benmcmahon100
|
14cc6a7cef
|
Final touch up to the framework before merge
|
2015-08-25 19:28:13 +01:00 |
Berkeley Martinez
|
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 |
benmcmahon100
|
1133aeda9b
|
Stopped the scripts needed for the preview being loaded on each keyDown
|
2015-08-25 16:10:11 +01:00 |
Ben McMahon
|
00f0debbcd
|
Merge pull request #2672 from awesomeaniruddh/staging
replaced + by .
|
2015-08-25 15:46:22 +01:00 |
Aniruddh Agarwal
|
57c3261415
|
replaced + by .
|
2015-08-25 22:42:58 +08:00 |
Ben McMahon
|
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 |
Aniruddh Agarwal
|
0cc032a6e9
|
fixed conflicts
|
2015-08-25 22:21:33 +08:00 |
benmcmahon100
|
e2c3ff08a8
|
Fixed the goodTests var not resetting
|
2015-08-25 14:46:23 +01:00 |
benmcmahon100
|
473d40baa8
|
Fixed the bugged test window replicating tests
|
2015-08-25 14:43:34 +01:00 |
Aniruddh Agarwal
|
beb537d5eb
|
Cleaned up description for 'Sift through Text with Regular Expressions' waypoint
|
2015-08-25 20:26:32 +08:00 |
Aniruddh Agarwal
|
5ce26c5b4b
|
Expanded description of 'Build Javacript Objects' waypoint
|
2015-08-25 19:36:47 +08:00 |
Berkeley Martinez
|
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 |
Berkeley Martinez
|
3e54c81904
|
Merge pull request #2647 from QuincyLarson/calculator
Coding Bootcamp Calculator updates
|
2015-08-24 23:18:29 -07:00 |
Berkeley Martinez
|
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 |
Quincy Larson
|
66a490bbee
|
add simon video and forkable template for portfolio zipline
|
2015-08-24 22:50:36 -07:00 |
Quincy Larson
|
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 |
Quincy Larson
|
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 |
Quincy Larson
|
bc1393edac
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into calculator
|
2015-08-24 19:19:58 -07:00 |
Quincy Larson
|
a94c919374
|
update cost calculator
|
2015-08-24 19:19:47 -07:00 |
Quincy Larson
|
048a7d3dce
|
Merge pull request #2620 from bugron/bugron-1522
Fixes missing backslash in waypoints' instructions'
|
2015-08-24 19:02:22 -07:00 |
Ben McMahon
|
86d7c2f35a
|
Merge pull request #2646 from QuincyLarson/linking
|
2015-08-25 02:00:04 +01:00 |
Quincy Larson
|
e5a9b697ae
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-08-24 17:54:00 -07:00 |
Quincy Larson
|
fd440916a8
|
add descriptive message to failed account linking attempt
|
2015-08-24 17:52:12 -07:00 |
Berkeley Martinez
|
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 |
benmcmahon100
|
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 |
Berkeley Martinez
|
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 |
bugron
|
f750182a4b
|
Adds a desctiption to avoid confusion in JS challenges
|
2015-08-25 04:41:02 +04:00 |
Berkeley Martinez
|
b3d66e1ae0
|
add json lint gulp task
|
2015-08-24 16:19:34 -07:00 |
Berkeley Martinez
|
15c49ec520
|
remove unused challenge utils
|
2015-08-24 16:19:06 -07:00 |
Sean Rodman
|
4403f589b8
|
Closes Issue #2636
|
2015-08-24 16:21:05 -05:00 |
Berkeley Martinez
|
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 |
Isabell Long
|
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 |
Isabell Long
|
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 |
Berkeley Martinez
|
175800ef37
|
Merge pull request #2421 from bugron/bugron-1063
fixed missing URL scheme #1063
|
2015-08-24 11:15:02 -07:00 |
Berkeley Martinez
|
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 |
Berkeley Martinez
|
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 |
Berkeley Martinez
|
045d1a73b6
|
Merge pull request #2570 from dokkillo/dokkillo-2308
issue 2308 Center Text with Bootstrap typo
|
2015-08-24 11:10:51 -07:00 |
Berkeley Martinez
|
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 |
Berkeley Martinez
|
c82909de0c
|
Merge pull request #2596 from suhussai/suhussai-2592
Typo Fix. Closes #2592
|
2015-08-24 11:03:34 -07:00 |