greatbody
/
freeCodeCamp
mirror of https://github.com/freeCodeCamp/freeCodeCamp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
5,505 Commits
3 Branches
0 Tags
959 MiB
Commit Graph

315 Commits (327ddaa35eeecf088a0a2bcc7ff4a9a028e42599)

Author SHA1 Message Date
Berkeley Martinez ac35b4bf73 fix some typo's 2015-07-23 15:49:03 -07:00
Berkeley Martinez c1b0035d17 add bundle to react jade template 2015-07-23 15:49:02 -07:00
Berkeley Martinez a5e7009a57 initial react app(WIP) 2015-07-23 15:49:00 -07:00
LumenTeun e05cc3fbb9 Profile pictures in 'Camper News' now link to profiles. #1235 2015-07-11 01:12:17 +02:00
Quincy Larson 8072a4b7f2 fix modal closing a on showJS view 2015-07-10 10:12:53 -07:00
Quincy Larson 41f5325ab6 update landing page 2015-07-07 10:45:56 -07:00
Quincy Larson db324186da update showjs view 2015-07-05 17:15:54 -07:00
Quincy Larson 0301d3bc61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-07-02 13:59:22 -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 10f53bdd49 Merge pull request #1161 from LumenTeun/grammar 
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
 2015-07-02 13:56:11 -07:00
benmcmahon100 71ea26ab96 Implemented scroll-locker 2015-07-02 21:32:20 +01:00
benmcmahon100 8bed9fa7d7 Implemented scroll-locker 2015-07-02 21:31:59 +01:00
benmcmahon100 0a59bd5cfb Implemented scroll-locker 2015-07-02 21:31:28 +01:00
Berkeley Martinez 580e2e3ebd add redirect for https 2015-07-01 14:35:15 -07:00
LumenTeun 75948c4bc1 Quite a few spelling and grammar fixes 2015-06-30 04:28:43 +02:00
Quincy Larson 7e2d5c91e2 minor ui improvements 2015-06-26 01:28:02 -07:00
Quincy Larson 378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
 2015-06-26 01:08:40 -07:00
Berkeley Martinez 310bf7f6fb fix navbar should point to /news not /stories 2015-06-25 23:43:02 -07:00
Quincy Larson 6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez 82c96ec0ba bump main.js version 2015-06-25 23:20:16 -07:00
Quincy Larson e9450b9321 start building sponsor views 2015-06-25 15:15:41 -07:00
Quincy Larson 4d620c5796 comment out feature map modal and camper news notification 2015-06-24 07:06:40 -07:00
Quincy Larson ce0731df5f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade
 2015-06-21 15:53:16 -07:00
Berkeley Martinez 8f445b58f2 fix chat links go to Gitter Room 2015-06-20 23:11:33 -07:00
Berkeley Martinez 742a49b70d fix mainjs resetEditor 2015-06-20 22:48:59 -07:00
Berkeley Martinez 03ea412b4a major challenges refactor 
commented out resetEditor in main
remove heatmap timout
 2015-06-20 19:55:07 -07:00
Quincy Larson a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson 883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00
Quincy Larson ccc29b7fcb improve upon @lemonyandrew pull request 2015-06-19 17:26:04 -07:00
Quincy Larson d5ea05e448 Merge branch 'Lemony-Andrew-master' into staging 
Conflicts:
	server/views/coursewares/showBonfire.jade
 2015-06-19 16:17:59 -07:00
Quincy Larson 0621b8c62b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 13:46:37 -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
terakilobyte 0a8356e50f Configure production to run in https 2015-06-16 14:30:16 -04:00
terakilobyte b0b236821e More inspectlet configuring 2015-06-16 12:30:49 -04:00
terakilobyte 308e539e1e More protocol experimentation 2015-06-16 12:23:49 -04:00
terakilobyte 3546cf4765 Fetch google fonts over https 2015-06-16 12:09:45 -04:00
Quincy Larson 9bc4f0c25c Merge branch 'master' into staging 2015-06-16 06:08:25 -07:00
Quincy Larson ef9d6fc55b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 06:08:18 -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
terakilobyte 4fa1f25cc2 Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records. 2015-06-15 20:53:43 -04:00
terakilobyte 40ce1d8162 Refactor to use dashedName for challenges in lookup. 2015-06-15 08:01:43 -04: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 5e3edf5cda Merge branch 'master' into staging 2015-06-14 01:10:51 -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 b6fc2551d9 Merge branch 'interview' into staging 
Conflicts:
	app.js
	controllers/challenge.js
	seed/future-jquery-ajax-json.json
 2015-06-14 01:02:39 -07:00
Quincy Larson 173d46ae01 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	seed/field-guides.json
 2015-06-12 12:40:26 -07:00
terakilobyte 34c3fef7d4 Move api hooks to user.js 2015-06-11 19:11:07 -04:00
terakilobyte f7bb14803e Update field guides to display properly. Correct models on user object. 2015-06-11 16:19:44 -04:00
Quincy Larson 5fb89cb091 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:16:31 -07:00
Berkeley Martinez cd38a2d88e fix user local signin 2015-06-09 17:22:14 -07:00
Berkeley Martinez a8494b29da add user signup through loopback 2015-06-09 16:45:14 -07:00
terakilobyte 5ec532f3d9 Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names. 2015-06-09 16:57:23 -04: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
terakilobyte 21b9405f06 Update links for new api model in views for stories. 2015-06-05 14:58:42 -04:00
terakilobyte 8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -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