Commit Graph

2742 Commits

Author SHA1 Message Date
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
6675bec162 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-23 23:48:19 -07:00
Quincy Larson
7920dd0a6b Merge pull request #354 from FreeCodeCamp/terakilobyte-patch-1
Update README.md
2015-04-23 17:52:20 -07:00
Quincy Larson
ef60528632 Update README.md 2015-04-23 17:51:45 -07:00
Nathan
bc2069d80e Update README.md 2015-04-23 20:22:14 -04:00
Quincy Larson
f049ff8f27 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-23 16:18:28 -07:00
Nathan
2caf37fab4 Update README.md 2015-04-23 19:05:27 -04:00
Quincy Larson
ac611d61fb minor copy fix 2015-04-23 16:04:42 -07:00
Nathan
b892d10c0d Update README.md 2015-04-23 19:00:55 -04:00
Nathan
af2335b337 Update README.md 2015-04-23 18:54:20 -04:00
Quincy Larson
84fd61721a Merge pull request #351 from ChillTrain/FieldGuideLink
Fix for issue #342: "You can contribute to our field guide here" Page No...
2015-04-23 15:49:16 -07:00
Quincy Larson
cc5d01184f Merge pull request #350 from ChillTrain/ZiplineCopyTypo
Fix for issue #349: Zipline Copy Typo
2015-04-23 15:48:17 -07:00
chilltrain
d75a1b5973 Fix for issue #342: "You can contribute to our field guide here" Page Not Found 2015-04-23 16:29:18 -05:00
chilltrain
c2a78b1278 Fix for issue #349: Zipline Copy Typo 2015-04-23 16:10:08 -05:00
Quincy Larson
92db9e5aba fix the sitemap 2015-04-23 11:56:37 -07:00
Quincy Larson
63a41a34b8 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-23 07:57:23 -07:00
Quincy Larson
be36f3dafd remove confusing modal 2015-04-23 07:57:14 -07:00
terakilobyte
2af8e4bf5c Merge remote-tracking branch 'upstream/master' 2015-04-22 21:13:21 -04:00
Quincy Larson
26d84a21e0 fix issues with unauthenticated field guide browsing 2015-04-22 15:50:11 -07:00
terakilobyte
36a99d84c0 Fix courseware update points on completion 2015-04-22 18:41:04 -04:00
Quincy Larson
237a754289 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-22 14:54:52 -07:00
Quincy Larson
f2179c6be6 non-www now points to www 2015-04-22 14:53:58 -07:00
terakilobyte
935ba93b19 On to my next challenge change 2015-04-22 08:36:31 -04:00
terakilobyte
f321d7f22f Merge branch 'master' of heroku.com:freecodecamp 2015-04-22 07:46:20 -04:00
Quincy Larson
0394c6d764 re-enable oauth providers 2015-04-22 04:40:25 -07:00
terakilobyte
a64024cb61 Merge remote-tracking branch 'upstream/master' 2015-04-22 07:31:13 -04:00
terakilobyte
ca812f09ae Update User model for migration 2015-04-22 07:30:40 -04:00
Quincy Larson
97173ccca7 add new challenge videos and update copy 2015-04-22 04:25:44 -07:00
Quincy Larson
34ac36a64a Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-21 19:46:08 -07:00
Quincy Larson
2507b08768 archive future coursewares in seed_data file 2015-04-21 19:45:57 -07:00
Quincy Larson
3a54f3b5ad update the meta image files for our new curriculum 2015-04-21 19:38:13 -07:00
Nathan
92157ebdff Merge pull request #311 from FreeCodeCamp/seek-and-destroy
Attempt to fix wording on seek and destroy bonfire issue #293
2015-04-21 22:28:14 -04:00
terakilobyte
a38aa375cc Merge remote-tracking branch 'upstream/master' 2015-04-21 17:40:25 -04:00
terakilobyte
e9c13124f1 Remove mention of ng-lodash from universal-head 2015-04-21 17:39:34 -04:00
Quincy Larson
05944b5c53 cosmetic update to nonprofit project page 2015-04-20 23:55:30 -07:00
Quincy Larson
95543ace12 update the try mongo challenge 2015-04-20 22:39:01 -07:00
Quincy Larson
50c404d9be Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-20 22:34:53 -07:00
Quincy Larson
e245b4d813 remove mongo course for now 2015-04-20 19:11:19 -07:00
Quincy Larson
c6b1bc79d3 make some improvements to our field guides 2015-04-20 18:51:24 -07:00
Nathan
e3822edd93 Update README.md 2015-04-20 02:20:14 -04:00
terakilobyte
7cbd8e1c04 merge pr for unique story slugs 2015-04-20 00:28:55 -04:00
terakilobyte
66bf61cfdf Merge branch 'MrRenter-commentEditTwoEleven' 2015-04-19 22:22:27 -04:00
terakilobyte
8781bc3e63 Accept comment edit pr 2015-04-19 22:22:11 -04:00
terakilobyte
4473b6b620 Merge remote-tracking branch 'upstream/master' 2015-04-19 21:07:47 -04:00
terakilobyte
083cd7d710 Fix json for get 'started with ziplines' ziplines 2015-04-19 21:07:38 -04:00
Quincy Larson
b115b81204 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-19 18:07:29 -07:00
Quincy Larson
993819cf3b mirror the zipline view and the showVideo view 2015-04-19 18:07:19 -07:00
terakilobyte
f396dad029 Fix upvote button on initial story submission. 2015-04-19 20:28:56 -04:00
terakilobyte
1596cdfedb Merge remote-tracking branch 'upstream/master' 2015-04-19 19:45:25 -04:00
Quincy Larson
d9ddda6cb9 record videos and add to courseware.json and field-guide.json 2015-04-19 16:28:11 -07:00