Commit Graph

2734 Commits

Author SHA1 Message Date
f049ff8f27 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-23 16:18:28 -07:00
ac611d61fb minor copy fix 2015-04-23 16:04:42 -07:00
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
cc5d01184f Merge pull request #350 from ChillTrain/ZiplineCopyTypo
Fix for issue #349: Zipline Copy Typo
2015-04-23 15:48:17 -07:00
d75a1b5973 Fix for issue #342: "You can contribute to our field guide here" Page Not Found 2015-04-23 16:29:18 -05:00
c2a78b1278 Fix for issue #349: Zipline Copy Typo 2015-04-23 16:10:08 -05:00
92db9e5aba fix the sitemap 2015-04-23 11:56:37 -07:00
63a41a34b8 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-23 07:57:23 -07:00
be36f3dafd remove confusing modal 2015-04-23 07:57:14 -07:00
2af8e4bf5c Merge remote-tracking branch 'upstream/master' 2015-04-22 21:13:21 -04:00
26d84a21e0 fix issues with unauthenticated field guide browsing 2015-04-22 15:50:11 -07:00
36a99d84c0 Fix courseware update points on completion 2015-04-22 18:41:04 -04:00
237a754289 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-22 14:54:52 -07:00
f2179c6be6 non-www now points to www 2015-04-22 14:53:58 -07:00
935ba93b19 On to my next challenge change 2015-04-22 08:36:31 -04:00
f321d7f22f Merge branch 'master' of heroku.com:freecodecamp 2015-04-22 07:46:20 -04:00
0394c6d764 re-enable oauth providers 2015-04-22 04:40:25 -07:00
a64024cb61 Merge remote-tracking branch 'upstream/master' 2015-04-22 07:31:13 -04:00
ca812f09ae Update User model for migration 2015-04-22 07:30:40 -04:00
97173ccca7 add new challenge videos and update copy 2015-04-22 04:25:44 -07:00
34ac36a64a Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-21 19:46:08 -07:00
2507b08768 archive future coursewares in seed_data file 2015-04-21 19:45:57 -07:00
3a54f3b5ad update the meta image files for our new curriculum 2015-04-21 19:38:13 -07:00
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
a38aa375cc Merge remote-tracking branch 'upstream/master' 2015-04-21 17:40:25 -04:00
e9c13124f1 Remove mention of ng-lodash from universal-head 2015-04-21 17:39:34 -04:00
05944b5c53 cosmetic update to nonprofit project page 2015-04-20 23:55:30 -07:00
95543ace12 update the try mongo challenge 2015-04-20 22:39:01 -07:00
50c404d9be Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-20 22:34:53 -07:00
e245b4d813 remove mongo course for now 2015-04-20 19:11:19 -07:00
c6b1bc79d3 make some improvements to our field guides 2015-04-20 18:51:24 -07:00
e3822edd93 Update README.md 2015-04-20 02:20:14 -04:00
7cbd8e1c04 merge pr for unique story slugs 2015-04-20 00:28:55 -04:00
66bf61cfdf Merge branch 'MrRenter-commentEditTwoEleven' 2015-04-19 22:22:27 -04:00
8781bc3e63 Accept comment edit pr 2015-04-19 22:22:11 -04:00
4473b6b620 Merge remote-tracking branch 'upstream/master' 2015-04-19 21:07:47 -04:00
083cd7d710 Fix json for get 'started with ziplines' ziplines 2015-04-19 21:07:38 -04:00
b115b81204 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-19 18:07:29 -07:00
993819cf3b mirror the zipline view and the showVideo view 2015-04-19 18:07:19 -07:00
f396dad029 Fix upvote button on initial story submission. 2015-04-19 20:28:56 -04:00
1596cdfedb Merge remote-tracking branch 'upstream/master' 2015-04-19 19:45:25 -04:00
d9ddda6cb9 record videos and add to courseware.json and field-guide.json 2015-04-19 16:28:11 -07:00
102550fd0b update the symmetric difference challenge 2015-04-19 01:18:56 -07:00
2736dfe638 Merge remote-tracking branch 'origin/master' 2015-04-19 03:37:25 -04:00
08bf658897 Harden camper news and don't expose user object. Upvoting still needs to be looked at. 2015-04-19 03:36:54 -04:00
9fa12b8ad4 Merge pull request #310 from FreeCodeCamp/QuincyLarson-README-patch
Update README.md with better contribution directions. Point to AirBnB st...
2015-04-18 22:38:56 -07:00
2c53a17521 fix an issue with checklists 2015-04-18 21:09:24 -07:00
07becee1c4 further improvements to courseware.json 2015-04-18 17:25:59 -07:00
d078c6768a make the all field guides view conform to the challengeMap aesthetic 2015-04-18 17:19:06 -07:00
d31031f92c continue updating coursewares and field-guide 2015-04-18 17:10:18 -07:00