gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Browse Source 
Conflicts:
	app.js
	controllers/challengeMap.js
	controllers/resources.js
	server/views/partials/field-guide.jade
	server/views/partials/github.jade
	server/views/partials/nonprofit-application-progress-bar.jade
	server/views/partials/nonprofits.jade
This commit is contained in:
Quincy Larson
2015-06-02 13:44:53 -07:00
parent e87e132325 40bc945a20
commit f6596d2654
421 changed files with 1688 additions and 231849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -126,7 +126,7 @@ Project Structure
| **views/partials**/footer.jade | Footer partial template. |
| **views**/layout.jade | Base template. |
| **views**/home.jade | Home page template. |
| app.js | Main application file. |
| server.js | Main application file. |
List of Packages
@@ -155,7 +155,7 @@ List of Packages
| github-api | GitHub API library. |
| jade | Template engine for Express. |
| less | LESS compiler. Used implicitly by connect-assets. |
| helmet | Restricts Cross site requests. You can modify its settings in app.js |
| helmet | Restricts Cross site requests. You can modify its settings in server.js |
| mongoose | MongoDB ODM. |
| nodemailer | Node.js library for sending emails. |
| passport | Simple and elegant authentication library for node.js |