Commit Graph

18 Commits

Author SHA1 Message Date
Quincy Larson
feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
Quincy Larson
3f49b6288f move calculator back to its own view and out of field guide 2015-07-31 17:30:27 -07:00
Quincy Larson
4fb3b3e7cc add more cities and move the bootcamp calculator to field guide entries (still untested). 2015-07-02 13:59:13 -07:00
Quincy Larson
883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00
Quincy Larson
2e1babb12d finalize calculator for release 2015-06-16 13:46:24 -07:00
Quincy Larson
40b5b05ea4 factor JavaScript and JSON into separate files 2015-06-16 13:03:13 -07:00
Quincy Larson
2cb0a3d717 futher improve calculator ux 2015-06-16 12:32:12 -07:00
Quincy Larson
23eb74c762 improve ux on calculator clicking 2015-06-15 21:44:19 -07:00
Quincy Larson
c9ba210afa factor bootcamp JSON into seperate file 2015-06-15 20:49:55 -07:00
Quincy Larson
6b909d8f59 start refactoring calculator logic 2015-06-15 18:00:13 -07:00
Quincy Larson
6c33d4bf78 calculator works 2015-06-14 21:17:48 -07:00
Quincy Larson
0ef39904a9 major improvements to calculator logic 2015-06-14 17:55:23 -07:00
Quincy Larson
2a98e5c851 fix calculator view file location 2015-06-14 01:39:22 -07:00
Quincy Larson
43f347bae0 Merge branch 'calculator' into staging
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
2015-06-14 01:10:48 -07:00
Quincy Larson
5fb89cb091 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:16:31 -07:00
Quincy Larson
61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
Quincy Larson
f6596d2654 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
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
2015-06-02 13:44:53 -07:00
terakilobyte
d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00