Commit Graph

2924 Commits (6759b432e0a8397a2f1a5406a8ea6607df0babbc)

Author SHA1 Message Date
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 b4850932dc trivial change for example 2015-04-20 19:12:14 -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
Quincy Larson 102550fd0b update the symmetric difference challenge 2015-04-19 01:18:56 -07:00
terakilobyte 2736dfe638 Merge remote-tracking branch 'origin/master' 2015-04-19 03:37:25 -04:00
terakilobyte 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
Quincy Larson 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
Quincy Larson 2c53a17521 fix an issue with checklists 2015-04-18 21:09:24 -07:00
Quincy Larson 07becee1c4 further improvements to courseware.json 2015-04-18 17:25:59 -07:00
Michael Q Larson d078c6768a make the all field guides view conform to the challengeMap aesthetic 2015-04-18 17:19:06 -07:00
Michael Q Larson d31031f92c continue updating coursewares and field-guide 2015-04-18 17:10:18 -07:00
Michael Q Larson b671ab9817 move checkboxes to the left of the showVideo view 2015-04-18 15:00:31 -07:00
Michael Q Larson aacfb86e1f improve challenge map look 2015-04-18 14:17:10 -07:00
MrRenter b2f18a790a Changed from post to put for since updating not creatings 2015-04-18 11:53:46 -04:00
Michael Q Larson 6106dfa31a presist checklist states in localStorage 2015-04-18 01:29:10 -07:00
Michael Q Larson e39dfee5ef getting closer with the persisted checklists 2015-04-17 23:51:57 -07:00
MrRenter 790a4f941d Removed alert and added server side check for 10minutes 2015-04-18 02:46:16 -04:00
MrRenter 349dbbc2af Added functuality to the edit button. Added router to /commets/:id/edit as well as commentEdit method in story js. 2015-04-18 02:40:48 -04:00
Michael Q Larson 11ece0fda1 fix courseware.json typo and make it easier to click checkboxes 2015-04-17 22:37:13 -07:00
MrRenter 47bb301a91 Made it so edit will only be displayed for the user. Since its on client side (following practices used) a final check should be used when actually saving edit to db 2015-04-17 22:36:09 -04:00
MrRenter c711b41fa0 Added code to display edit button next to discuss button when viewing a story. Button will vanish if comment was posted > 10 minutes 2015-04-17 22:33:07 -04:00