Commit Graph

3001 Commits

Author SHA1 Message Date
9e8a618491 Twitter fixes. 2015-04-28 20:40:02 -04:00
2487f0421b Fix tweeting in challenges 2015-04-28 19:35:12 -04:00
38525eb77a make some minor improvements to the courseware.json file 2015-04-28 16:17:09 -07:00
0f4c13c234 improvements to basejump and zipline copy 2015-04-28 13:25:38 -07:00
35515c2da5 Merge branch 'videos' into pmi 2015-04-28 12:12:20 -07:00
0bbc803955 replace landing youtube videos with superior vimeo video 2015-04-28 12:11:49 -07:00
a8e215c74e Check everything for undefined in email reply logic for story.js 2015-04-27 20:03:37 -04:00
11c887c55f Merge branch 'QuincyLarson-pmi' into staging 2015-04-27 19:40:07 -04:00
cef70a67a9 Fix broken url 2015-04-27 19:39:58 -04:00
fd456ec9be make new landing pages and forms for project managers and nonprofits 2015-04-27 16:17:29 -07:00
327530a642 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-04-27 13:26:57 -04:00
5a6e2cc4bd minor copy edits and improvements to seed files 2015-04-27 00:33:14 -07:00
45490f75c4 make checkboxes larger and remove text clicking for completion 2015-04-27 00:10:14 -07:00
5be9dd2587 gracefully handle original story poster having been deleted in mailer 2015-04-26 23:19:03 -07:00
dac45382e2 Merge branch 'master' into videos
Conflicts:
	app.js
2015-04-26 22:52:06 -07:00
c50ce70749 minor updates to coursewares and field guides 2015-04-26 12:46:48 -07:00
03c407c3ce Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-04-25 19:00:30 -07:00
4dab70d5a6 Merge branch 'Maximization-maximization-352' into t push origin stagingstaging 2015-04-25 18:59:57 -07:00
b8bffae47b @terakilobyte cleaned up event handlers 2015-04-25 18:59:15 -07:00
20c2b7a0ac Merge branch 'maximization-352' of https://github.com/Maximization/freecodecamp into Maximization-maximization-352 2015-04-25 18:17:46 -07:00
4e9f8b9458 Merge pull request #369 from terakilobyte/staging
Bug fixes to stories and fieldguides
2015-04-25 18:14:43 -07:00
c47c783b10 Merge branch 'terakilobyte-stat push origin staginging' into staging 2015-04-25 18:08:29 -07:00
941d261b7c remove console.log statements, improve coursewares.json 2015-04-25 12:12:26 -07:00
ce84f3eeb1 Fully remove remnant of errant debug statement 2015-04-25 14:36:34 -04:00
7c8e5e60f4 Modification to script. 2015-04-25 12:44:34 -04:00
2fce595e89 Add story cleanup script to ensure all story links are proper. 2015-04-25 12:40:07 -04:00
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
1539708613 Fix Camper News email notification logic 2015-04-25 16:05:36 +02:00
a6f6d7e1cf Merge branch 'master' of github.com:QuincyLarson/freecodecamp
Conflicts:
	README.md
2015-04-24 21:39:36 -07:00
76ca1c6c5f Merge pull request #364 from QuincyLarson/field-guide-fixes
Field guide fixes
2015-04-25 00:33:39 -04:00
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
252f955285 Merge pull request #360 from benmcmahon100/patch-1
slight tidy and example
2015-04-24 20:58:32 -07:00
e327df95ac Merge branch 'master' into staging 2015-04-24 19:25:42 -04:00
15ea7f3473 Merge pull request #363 from FreeCodeCamp/root
Root
2015-04-24 19:16:43 -04:00
b6d1a097c3 Merge pull request #362 from terakilobyte/staging
Configure for production on DO.
2015-04-24 19:12:12 -04:00
e7371b0a7b Configure for production on DO. 2015-04-24 19:11:17 -04:00
96d119f22d update gitignore to ignore builtAssets/ 2015-04-24 16:10:11 -07:00
8c0d9de962 Merge pull request #359 from terakilobyte/staging
Site speed
2015-04-24 19:02:16 -04:00
f79834bec9 Greatly increase the speed of sitemap by a factor of at least 10 (Nathan, Quincy, and Berkeley pairing). 2015-04-24 18:57:55 -04:00
8c10f4efcc make improvements to coursewares.json 2015-04-24 13:57:50 -07:00
eaf81fd3f7 Closes #333 2015-04-24 16:04:25 -04:00
aa7b4cc2ff Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-04-24 15:57:19 -04:00
096edd553b Factor out $('title') to a re-usable variable to make the linter happy and remove old database lookup based on old challenge architecture. 2015-04-24 15:53:22 -04:00
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
79ff3631df minor eslint cleanup 2015-04-24 13:50:48 -04:00
62df37072d prevent global "fieldGuide" variable 2015-04-24 13:50:13 -04:00
b3929f693b Clean up privacy policy routing. Adopt same pattern from courseware/bonfire mongo lookup to fieldguides. 2015-04-24 13:49:32 -04:00
5f6177378f Clean up more linting errors and split out returns from Mongo. 2015-04-24 13:15:15 -04:00
a8689fec4a Refactor sitemap function to use async for for easier reasoning. Factor out the user fetch as this was causing a huge blocking operation and eating a massive amount of memory. 2015-04-24 13:13:50 -04:00
12fbc41761 clean up User.js a little 2015-04-24 03:04:53 -07:00