Commit Graph

466 Commits

Author SHA1 Message Date
Quincy Larson
7e08f9d8f5 update videos 2015-05-28 17:22:45 -07:00
Quincy Larson
a9d8992b88 fix if else syntax in Jade and add cities 2015-05-28 16:59:25 -07:00
Quincy Larson
560e66527b add jobs 2015-05-28 16:40:22 -07:00
Quincy Larson
81fb739794 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-26 15:25:38 -07:00
Quincy Larson
4153bc58c6 update the cities and fix #553 2015-05-26 15:25:21 -07:00
terakilobyte
dd9e4e03c4 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-05-26 16:33:14 -04:00
Quincy Larson
0bade642a9 fix some aspects of zipline/basejump submission 2015-05-26 13:09:07 -07:00
terakilobyte
33b98f4054 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-05-26 15:18:41 -04:00
terakilobyte
885dd7e5e6 temporary fix for firefox duplication causing false completion 2015-05-26 15:18:26 -04:00
Quincy Larson
7d9ffbaa65 closes #509 2015-05-26 11:44:00 -07:00
Quincy Larson
c078702da4 fixes #492 2015-05-26 11:25:33 -07:00
terakilobyte
40837abeaa Fix conflicts 2015-05-26 13:37:00 -04:00
terakilobyte
15817591d4 Closes #493 2015-05-26 13:33:50 -04:00
Quincy Larson
5c46c552d6 fixes #487 2015-05-26 10:33:29 -07:00
Nathan
30280b0645 Merge pull request #540 from benmcmahon100/patch-4
Quick fix to issue #509
2015-05-26 13:02:46 -04:00
benmcmahon100
01ad03b9d7 Quick fix to issue #509 2015-05-26 17:58:27 +01:00
Quincy Larson
cb7f33ecea close #539 2015-05-26 09:41:49 -07:00
Quincy Larson
42dfca0f4b closes #533 2015-05-26 09:38:11 -07:00
Quincy Larson
4115638c9b closes #531 2015-05-26 09:32:32 -07:00
Quincy Larson
2ace13c56d Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-26 09:08:43 -07:00
Quincy Larson
b87e013460 closes #535 2015-05-26 09:08:29 -07:00
terakilobyte
9a7a8bacfc Create user update script to run against db to normalize zipline and basejumps for display 2015-05-26 11:49:09 -04:00
terakilobyte
6b7ede6e1e Update tests for smallest common multiple, this closes #507 2015-05-26 08:44:01 -04:00
terakilobyte
8607a9b551 rename drop it like its hot bonfire, closes #507 2015-05-26 08:40:22 -04:00
Quincy Larson
7581ed9b30 quick challenge hot fixes 2015-05-26 00:33:13 -07:00
Quincy Larson
c4e8c03cef hotfoot for missing challenge type, plus new cities 2015-05-25 23:40:15 -07:00
Quincy Larson
8ace7e4393 Merge branch 'master' into staging 2015-05-25 23:13:04 -07:00
Quincy Larson
ea820a684d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-05-25 22:47:00 -07:00
Quincy Larson
77d3b5be9f finish html, css and bootstrap challenges 2015-05-25 22:46:47 -07:00
terakilobyte
ac304bd59c Fix grammatical error in Mutations instructions 2015-05-26 00:07:10 -04:00
terakilobyte
47d350aa27 update instructions for Bonfire: Mutations 2015-05-26 00:04:50 -04:00
terakilobyte
873a0082a0 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-05-25 23:28:03 -04:00
terakilobyte
c74a8a7fc0 Consisten dasherization in stories. Updated story cleanup script. 2015-05-25 23:27:21 -04:00
Quincy Larson
eda9f17dfd add new videos 2015-05-25 20:04:19 -07:00
terakilobyte
406f4d17e5 Minor copy update for OOP portion of challenges 2015-05-25 21:23:52 -04:00
Quincy Larson
95ab51986e challenges are working when authenticated 2015-05-25 17:52:00 -07:00
Quincy Larson
e941872176 improvements to nonprofit directory view 2015-05-25 17:27:56 -07:00
Quincy Larson
9c7746a9e8 improve challenge map view 2015-05-25 17:09:49 -07:00
Quincy Larson
060f0a3c36 swap sequence of ziplines and full stack waypoints 2015-05-25 16:47:46 -07:00
Quincy Larson
dec227582d fix issues with json discovered after attempting to seed 2015-05-25 16:42:35 -07:00
Quincy Larson
c115bc355a resequence and retitle challenge sections 2015-05-25 16:37:21 -07:00
Quincy Larson
08cf4407ac further improvements to challenges 2015-05-25 16:26:04 -07:00
Quincy Larson
58183a9ed5 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-05-25 15:17:25 -07:00
Quincy Larson
8fb2f9d2e0 continue fleshing out waypoints 2015-05-25 15:17:04 -07:00
terakilobyte
fb3447c366 Update challengeMap display, more consistent dasherization 2015-05-25 16:02:25 -04:00
Quincy Larson
f9386d1291 switching to Terakilobyte's computer 2015-05-25 12:20:20 -07:00
Quincy Larson
31e10444a5 improve field guide look and add cracking code interview article 2015-05-25 00:42:32 -07:00
Quincy Larson
3ee2c29324 more challenge-related view and copy improvements 2015-05-24 23:51:56 -07:00
Quincy Larson
17259001e0 update local chapters 2015-05-24 17:46:40 -07:00
Quincy Larson
48acbd2ea7 more minor QA tasks on seed files 2015-05-24 16:08:19 -07:00