Commit Graph

487 Commits

Author SHA1 Message Date
Quincy Larson
23eb74c762 improve ux on calculator clicking 2015-06-15 21:44:19 -07:00
terakilobyte
cb76aa1ea0 whitelist nginx server in helmet 2015-06-16 00:14:33 -04:00
Quincy Larson
c9ba210afa factor bootcamp JSON into seperate file 2015-06-15 20:49:55 -07:00
terakilobyte
1cd85eeb8f Debug statement for fieldguide ID 2015-06-15 23:35:29 -04: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
42aae365f6 Update current challenge logic 2015-06-15 18:57:45 -04:00
terakilobyte
4092dcecf7 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-15 18:50:31 -04:00
terakilobyte
c136895064 Rewrite challenge controller to use dashed names, update index.js to include new utility function getDashedNames 2015-06-15 18:50:18 -04:00
Berkeley Martinez
b0dc4ffa12 get account should redirect to '/' when no user is logged in 2015-06-15 15:47:56 -07:00
Berkeley Martinez
c4d229e62d remove email verification step.
users are marked for future uses
2015-06-15 15:43:12 -07:00
terakilobyte
a334b9870c Set up production variables 2015-06-15 18:24:26 -04:00
terakilobyte
a82a8fb044 move to dashedName lookup 2015-06-15 14:50:54 -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
terakilobyte
af75452db5 Remove forcedomain so we can test beta website 2015-06-12 21:09:12 -04:00
terakilobyte
5b2b7e23ae Take id property of username, remove wasteful save on profile lookup. 2015-06-12 19:16:10 -04:00
Berkeley Martinez
63937c3a56 fix make usernames required 2015-06-12 13:14:07 -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
Berkeley Martinez
0f5f92b937 fix user deletion of credentials
should use a where clause with destroyAll
2015-06-12 11:58:31 -07:00
Berkeley Martinez
c2f408fb56 add blacklist to usernames 2015-06-11 17:04:48 -07:00
Berkeley Martinez
5be6ce7193 add delete user idenity and credentials after profile deletion 2015-06-11 16:57:06 -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
terakilobyte
0aa83f1bb9 Remove mongoose style lookup from fieldguide.js. Update user model. 2015-06-11 15:33:38 -04:00
terakilobyte
0b1c23207d Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-11 15:18:45 -04:00
terakilobyte
3115ba6404 update tests 2015-06-11 15:18:37 -04:00
Quincy Larson
b3fb1d492d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:39:20 -07:00
Berkeley Martinez
fe5cbec117 add pull in user image on signup when available 2015-06-11 11:38:08 -07:00
Quincy Larson
5fb89cb091 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:16:31 -07:00
Berkeley Martinez
af902799b1 add acl controls to models 2015-06-10 23:59:42 -07:00
Berkeley Martinez
84f2168769 fix remove stray profile reference
fix findOne queries should have where filter
2015-06-10 17:12:21 -07:00
Berkeley Martinez
9f5ace03dc fix acls access for user exists remote method 2015-06-10 17:11:32 -07:00
Berkeley Martinez
bdb7d40548 fix usernames should be saved lowercased 2015-06-10 15:22:57 -07:00
Berkeley Martinez
996c3e7816 fix make email optional 2015-06-10 15:12:48 -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
Berkeley Martinez
2e5f250ba8 remove hpp
loopback is protected against hpp attack by default
2015-06-09 16:45:14 -07:00
Berkeley Martinez
b34646dd6b remove passport file
remove unneeded comments
2015-06-09 16:45:14 -07:00
Berkeley Martinez
68da1f1c68 optionally add email field if available 2015-06-09 16:43:32 -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
Berkeley Martinez
78dac937f7 remove email verification. 2015-06-07 22:07:38 -07:00
terakilobyte
1a27c133c5 Update user account fetching for profile view 2015-06-05 15:57:27 -04:00
terakilobyte
6b6de50ad4 Update story query for loopback. 2015-06-05 15:00:54 -04:00