Commit Graph

337 Commits

Author SHA1 Message Date
Quincy Larson
abc04c0065 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-09 18:36:41 -07:00
Quincy Larson
cc90d97bdb add code of conduct 2015-05-09 18:36:21 -07:00
Nathan
6759b432e0 Merge pull request #438 from QuincyLarson/news-points
News points
2015-05-09 19:41:38 -04:00
Nathan
760f01d2d5 Update coursewares.json 2015-05-09 19:39:39 -04:00
Nathan
18645f7f91 Merge pull request #434 from terakilobyte/staging
Change jQuery challenge description slightly.
2015-05-09 19:38:10 -04:00
Nathan
361b07c463 Merge pull request #432 from zapstar/fix-431
Added clarification to the search and replace bonfire (21)
2015-05-09 19:36:31 -04:00
Quincy Larson
47462991a4 add more facebook groups 2015-05-09 15:35:13 -07:00
Quincy Larson
c0f6c8d124 add new facebook groups 2015-05-09 13:31:45 -07:00
Quincy Larson
149c715cf7 Merge pull request #435 from QuincyLarson/facebook-groups
Facebook groups
2015-05-09 10:59:21 -07:00
Quincy Larson
b5747c7712 add facebook groups challenge, field guide and footer link 2015-05-09 10:52:02 -07:00
terakilobyte
e7a8d14f5b Change jQuery challenge description slightly. Closes #433 2015-05-08 20:50:13 -04:00
terakilobyte
b6349d55b3 Use exacty wikipedia definition for smallest common multiple 2015-05-08 17:12:16 -04:00
Thirumal Venkat
8e8c1c67d1 Added clarification to Search and Replace bonfire 2015-05-08 23:26:41 +05:30
Quincy Larson
fe86c13947 finish updating field guides 2015-05-07 22:58:20 -07:00
Quincy Larson
8d2b82111b refine field guides 2015-05-07 22:31:20 -07:00
Quincy Larson
c9e7b30867 fix privacy policy link and remove redundant field guide entry 2015-05-05 18:31:03 -07:00
Quincy Larson
52f7dcc96b Merge remote-tracking branch 'upstream/staging'
Conflicts:
	views/account/show.jade
2015-05-05 16:41:28 -07:00
Quincy Larson
f5a7195e42 add deploy a website without code field guide 2015-05-05 16:23:51 -07:00
Victor Påhlsson
c305f1f5cd Fix typo and add tests for Arguments Optional
Add tests for the second argument and fix a typo.
2015-05-05 11:49:18 +02:00
Quincy Larson
714ff14ea8 fix typo in field guide 2015-05-03 22:43:23 -07:00
Quincy Larson
04ed00f4b7 fix #412 2015-05-02 18:55:27 -07:00
Quincy Larson
7cbcf46377 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	app.js
	views/challengeMap/show.jade
2015-05-01 23:12:56 -07:00
terakilobyte
cbdba845df Resolve merge conflicts 2015-05-02 00:41:38 -04:00
terakilobyte
4729ef31b4 Get rid of duplicate field guide for mac keyboard shortcuts 2015-05-01 17:17:12 -04:00
Quincy Larson
2cb02176a4 more camper news improvements 2015-04-30 15:56:14 -07:00
Quincy Larson
cc13b325d6 fix some issues with @terakilobyte and beautify the camper news index view 2015-04-30 14:55:00 -07:00
Quincy Larson
164411e2c4 fix spelling of pinterest 2015-04-30 08:53:48 -07:00
Quincy Larson
0c1ba64a83 fix copy around git commits on basejumps 2015-04-29 22:13:03 -07:00
Quincy Larson
19a556af80 add videos to some challenges 2015-04-29 22:05:21 -07:00
Quincy Larson
a201633e09 improvements and fixes for our field guide. Add 20 day announcement modal 2015-04-29 15:31:49 -07:00
Quincy Larson
22f8cc2b65 improvements to field guide 2015-04-29 12:30:53 -07:00
Alex Dixon
ddb93897bc Revert Mac keyboard shortcuts 2015-04-29 07:16:17 -07:00
Quincy Larson
7e7cdab867 field guide fixes for @zersiax 2015-04-28 22:54:55 -07:00
Quincy Larson
38525eb77a make some minor improvements to the courseware.json file 2015-04-28 16:17:09 -07:00
Quincy Larson
0f4c13c234 improvements to basejump and zipline copy 2015-04-28 13:25:38 -07:00
Quincy Larson
5a6e2cc4bd minor copy edits and improvements to seed files 2015-04-27 00:33:14 -07:00
Quincy Larson
dac45382e2 Merge branch 'master' into videos
Conflicts:
	app.js
2015-04-26 22:52:06 -07:00
Quincy Larson
c50ce70749 minor updates to coursewares and field guides 2015-04-26 12:46:48 -07:00
Quincy Larson
941d261b7c remove console.log statements, improve coursewares.json 2015-04-25 12:12:26 -07:00
terakilobyte
7c8e5e60f4 Modification to script. 2015-04-25 12:44:34 -04:00
terakilobyte
2fce595e89 Add story cleanup script to ensure all story links are proper. 2015-04-25 12:40:07 -04:00
Quincy Larson
e49c9ca87e make some improvements to the field guide articles and move the bonfire styleguide into field guides 2015-04-24 21:30:22 -07:00
Quincy Larson
252f955285 Merge pull request #360 from benmcmahon100/patch-1
slight tidy and example
2015-04-24 20:58:32 -07:00
Nathan
15ea7f3473 Merge pull request #363 from FreeCodeCamp/root
Root
2015-04-24 19:16:43 -04:00
Quincy Larson
8c10f4efcc make improvements to coursewares.json 2015-04-24 13:57:50 -07:00
terakilobyte
eaf81fd3f7 Closes #333 2015-04-24 16:04:25 -04:00
benmcmahon100
a6d5aa05d0 slight tidy and example
Replaced one occurrence of gitter with slack and added an example bit torrent client after someone pointed out in the help section that there was not guide to demonstrate how to do so.
2015-04-24 20:48:29 +01:00
Quincy Larson
bea77c580e redirect user to bonfires if has completed waypoints but not bonfires gulp 2015-04-24 02:02:02 -07:00
Quincy Larson
f049ff8f27 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-23 16:18:28 -07:00
Quincy Larson
ac611d61fb minor copy fix 2015-04-23 16:04:42 -07:00