Commit Graph

3368 Commits

Author SHA1 Message Date
929eb64f1e Merge branch 'master' into interview 2015-06-07 22:29:03 -07:00
6c9db8c27f super nitpicky copy edit 2015-06-07 22:26:58 -07:00
400bcaf8c8 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-07 22:23:13 -07:00
32c327593e add cities 2015-06-07 22:23:08 -07:00
b7145f4604 fix #856 2015-06-07 21:59:04 -07:00
198d7897f7 Merge pull request #844 from treece/treece-841
Fixes RegExp so it matches the class .blue-text
2015-06-07 21:55:08 -07:00
b88533d189 Merge pull request #855 from treece/treece-845
Removed aarmy example from descr and changed the test for it to passing
2015-06-07 21:52:51 -07:00
0c799ec02f make bonfire view look like html view 2015-06-07 21:49:14 -07:00
662c17de90 get a couple more waypoints working 2015-06-07 19:46:28 -07:00
b84d41bcd6 write tests for first 5 jquery challenges 2015-06-07 18:29:00 -07:00
6953cb6347 make the view even more compact 2015-06-06 22:55:24 -07:00
feb0678a46 start shrinking down the views. 2015-06-06 22:51:39 -07:00
7cfca0b5f8 Bump a delay on test runs and show pattern for expect tests 2015-06-06 23:58:27 -04:00
00ac753063 Merge branch 'master' into interview 2015-06-06 22:31:49 -04:00
de831a9d3c Removed aarmy example from descr and changed the test for it to passing 2015-06-06 21:53:27 -04:00
5bcffa3ccb Add necessary emmet js file 2015-06-06 20:17:35 -04:00
426a1c27c2 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-06 20:11:28 -04:00
e5a8c27e07 Add emmet functionality to html views 2015-06-06 20:10:47 -04:00
be633105c5 Fixed blue-text and urgently-red regex constructors 2015-06-06 16:43:27 -04:00
1b1dc0ca4d add additional jquery challengeSeed and tests 2015-06-06 11:57:40 -07:00
debb746222 Merge pull request #851 from nighthawk702/nighthawk702-get-set-typo-fix
Fixed typo in Get Set for Ziplines waypoint.
2015-06-06 10:51:05 -07:00
49b938173a Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-06 10:18:26 -07:00
ef504339cc remove saturday summit modal 2015-06-06 10:17:49 -07:00
b210d7226c Update returnnextfieldguide to look at dashedName property 2015-06-06 11:57:53 -04:00
a0dcf77a14 add Saturday School field guide 2015-06-06 08:44:53 -07:00
a740bfd8bd Fixed typo in Get Set for Ziplines waypoint.
Changed "Click the gear next the JavaScript." to "Click the gear next to the JavaScript."
2015-06-06 14:38:43 +03:00
aef35860dc fix mobile view issue 2015-06-05 22:35:13 -07:00
6e1d5968bc improve mobile menu 2015-06-05 22:11:30 -07:00
23a242104b start work on jquery curriculum 2015-06-05 12:05:23 -07:00
b8b807a38d update twitter contest text 2015-06-05 00:25:23 -07:00
b606450aec update field guide flash message 2015-06-05 00:15:38 -07:00
bd400c2aef Update Camper News contest 2015-06-04 23:52:20 -07:00
7d2546335c fix typo in basic javascript challenges 2015-06-04 23:52:04 -07:00
b347d157fb remove vestigial redirects 2015-06-04 23:51:42 -07:00
169de8e576 update map modal and make t-rex rarer and more intense 2015-06-04 23:50:59 -07:00
04ed850ef9 Escaped dot in RegExp for the Waypoint: Override Styles with Important 2015-06-05 01:33:10 -04:00
d86c405ef1 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-04 20:40:49 -07:00
d00db04211 fix broken link and add city 2015-06-04 20:40:26 -07:00
14d7b5f92f Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-04 23:39:58 -04:00
72ed16f6cf Add hpp for express vulnerability fix 2015-06-04 23:39:51 -04:00
6256bfec0e Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-04 19:41:05 -07:00
53a31509e6 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-04 22:36:08 -04:00
f002e7c3f7 Always output tests in the order ran ignoring success or failure. Bump version numbers of framework files to force fresh browser fetches. 2015-06-04 22:35:42 -04:00
f808587827 add get emails script 2015-06-04 18:07:00 -07:00
b6ddb0fa4b fix 839 2015-06-04 14:20:00 -07:00
8900f8f8a1 fix 840 2015-06-04 14:18:47 -07:00
1515462fcf fix #819 2015-06-04 12:50:42 -07:00
c7cbdd7e69 update forms 2015-06-04 12:32:19 -07:00
79e90c82a8 close issues by updating json files 2015-06-04 01:01:48 -07:00
ee1f336475 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	public/css/main.less
2015-06-04 00:22:16 -07:00