Commit Graph

3216 Commits (7729f207291ea3116eceac3f59f3bc2982b77b44)

Author SHA1 Message Date
Quincy Larson 026f210b6e fix the button hotkeys in the showZiplineOrBasejump view 2015-04-29 22:32:52 -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
terakilobyte 55afd8518c Add missing semi-colon 2015-04-29 20:55:47 -04:00
A. Drake e77eae2643 Edited per instructions in codepen to let users specify additional screen names 2015-04-29 20:07:38 -04:00
terakilobyte 1e21d5d7aa Fix some linting errors in app.js and highlight questionable code with todo comments 2015-04-29 19:30:51 -04: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
Munsterberg a1de124c61 Fixed typo on nonprofit detail page 2015-04-29 13:17:33 -04:00
Nathan c71514cc81 Merge pull request #390 from alex-dixon/fieldguide-hotfix
Revert Mac keyboard shortcuts in field guide
2015-04-29 10:46:14 -04:00
Alex Dixon ddb93897bc Revert Mac keyboard shortcuts 2015-04-29 07:16:17 -07:00
A. Drake ffa2404993 Added API endpoint for twitter calls to use in codepen. NOTE added tokens to env file 2015-04-29 08:00:57 -04:00
A. Drake 81ccadc106 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-04-29 07:39:12 -04:00
Quincy Larson 7e7cdab867 field guide fixes for @zersiax 2015-04-28 22:54:55 -07:00
Quincy Larson 589059aa05 start styling news for mobile 2015-04-28 22:29:59 -07:00
terakilobyte 9e8a618491 Twitter fixes. 2015-04-28 20:40:02 -04:00
terakilobyte 2487f0421b Fix tweeting in challenges 2015-04-28 19:35:12 -04: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 35515c2da5 Merge branch 'videos' into pmi 2015-04-28 12:12:20 -07:00
Quincy Larson 0bbc803955 replace landing youtube videos with superior vimeo video 2015-04-28 12:11:49 -07:00
terakilobyte a8e215c74e Check everything for undefined in email reply logic for story.js 2015-04-27 20:03:37 -04:00
terakilobyte 11c887c55f Merge branch 'QuincyLarson-pmi' into staging 2015-04-27 19:40:07 -04:00
terakilobyte cef70a67a9 Fix broken url 2015-04-27 19:39:58 -04:00
Quincy Larson fd456ec9be make new landing pages and forms for project managers and nonprofits 2015-04-27 16:17:29 -07:00
A. Drake 327530a642 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-04-27 13:26:57 -04:00
Quincy Larson 5a6e2cc4bd minor copy edits and improvements to seed files 2015-04-27 00:33:14 -07:00
Quincy Larson 45490f75c4 make checkboxes larger and remove text clicking for completion 2015-04-27 00:10:14 -07:00
Quincy Larson 5be9dd2587 gracefully handle original story poster having been deleted in mailer 2015-04-26 23:19:03 -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 03c407c3ce Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-04-25 19:00:30 -07:00
Quincy Larson 4dab70d5a6 Merge branch 'Maximization-maximization-352' into t push origin stagingstaging 2015-04-25 18:59:57 -07:00
Quincy Larson b8bffae47b @terakilobyte cleaned up event handlers 2015-04-25 18:59:15 -07:00
Quincy Larson 20c2b7a0ac Merge branch 'maximization-352' of https://github.com/Maximization/freecodecamp into Maximization-maximization-352 2015-04-25 18:17:46 -07:00
Quincy Larson 4e9f8b9458 Merge pull request #369 from terakilobyte/staging
Bug fixes to stories and fieldguides
2015-04-25 18:14:43 -07:00
Quincy Larson c47c783b10 Merge branch 'terakilobyte-stat push origin staginging' into staging 2015-04-25 18:08:29 -07:00
Quincy Larson 941d261b7c remove console.log statements, improve coursewares.json 2015-04-25 12:12:26 -07:00
terakilobyte ce84f3eeb1 Fully remove remnant of errant debug statement 2015-04-25 14:36:34 -04: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
terakilobyte a9feb269f6 Remove some debug/console.log statements.
Fix allFieldGuideIds method in resources.js to return an array of _ids, not an array of objects.
Field guide controller now correctly completes field guides. Closes #367.
2015-04-25 12:28:14 -04:00
Maxim Orlov 1539708613 Fix Camper News email notification logic 2015-04-25 16:05:36 +02:00
Quincy Larson a6f6d7e1cf Merge branch 'master' of github.com:QuincyLarson/freecodecamp
Conflicts:
	README.md
2015-04-24 21:39:36 -07:00
Nathan 76ca1c6c5f Merge pull request #364 from QuincyLarson/field-guide-fixes
Field guide fixes
2015-04-25 00:33:39 -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
terakilobyte e327df95ac Merge branch 'master' into staging 2015-04-24 19:25:42 -04:00
Nathan 15ea7f3473 Merge pull request #363 from FreeCodeCamp/root
Root
2015-04-24 19:16:43 -04:00
Nathan b6d1a097c3 Merge pull request #362 from terakilobyte/staging
Configure for production on DO.
2015-04-24 19:12:12 -04:00