Commit Graph

3368 Commits

Author SHA1 Message Date
c4b26214da Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-05 21:52:43 -07:00
1a27c133c5 Update user account fetching for profile view 2015-06-05 15:57:27 -04:00
6b6de50ad4 Update story query for loopback. 2015-06-05 15:00:54 -04:00
21b9405f06 Update links for new api model in views for stories. 2015-06-05 14:58:42 -04:00
4f9061bffb Sort out story model. 2015-06-05 14:53:12 -04:00
d782ac9520 Update find method in fieldGuide.js 2015-06-05 13:25:28 -04:00
a0b34c8e90 Redirect to home path on unsuccessful query rather than induce infinite redirect loop. 2015-06-05 09:41:53 -04:00
8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
875d09c29b add hpp to address express vulnerability 2015-06-04 19:30:27 -07:00
48dea7db24 bump lodash 2015-06-04 15:09:24 -07:00
208f4ea18f fix typo in require 2015-06-04 14:32:59 -07:00
b6a0edc964 fix nonprofit ids should be unique 2015-06-04 14:32:16 -07:00
0ac664c9ae Use mongodb sparse indexing for user emails 2015-06-04 14:21:01 -07:00
40e8b61fbf Set up datasources properly for production 2015-06-04 14:20:37 -07:00
cfb5f06cdf Use strings for challengeMap
fixes switch when numbers are strings
2015-06-04 13:28:35 -07:00
3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
a695daa03f add default empty array to user.completedChallenges 2015-06-04 13:09:22 -07:00
b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
db37482c59 Flatten user object 2015-06-04 12:47:31 -07:00
72fe9c2463 Add cookie secrets to env 2015-06-04 12:42:13 -07:00
02b195511e fix challengeSeeds should be arrays 2015-06-04 12:31:33 -07:00
618cedddb0 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-04 12:24:30 -07:00
300323d215 make all challenge seeds arrays 2015-06-04 12:24:16 -07:00
7a2bcc06f7 add passport stuff back
Because Berkeley really needs to wait for his coffee to kick in before
commiting anything...
2015-06-04 12:03:53 -07:00
bba0e0a9fe remove unused deps 2015-06-04 11:30:05 -07:00
4a696462d2 Add reactify branch react components 2015-06-04 10:53:01 -07:00
66eff31294 Adding passport config stuff 2015-06-04 10:52:12 -07:00
075d851374 refactor resources to utils 2015-06-03 17:14:45 -07:00
e349797a4b rename boot utility
remove subrouter use in server.js
2015-06-03 16:56:48 -07:00
75f9b06e90 fix incorrect model name 2015-06-03 16:48:17 -07:00
393f95082e bump gulp-nodemon 2015-06-03 16:47:59 -07:00
415d46b591 fix add models to model-config 2015-06-03 16:35:22 -07:00
bfd33d8b40 fix use app.use(router) to add sub router 2015-06-03 16:31:42 -07:00
8165105b29 refactor all boot to export func and use loopback 2015-06-03 16:19:23 -07:00
65cde59f0d use app instead of server in boot directories 2015-06-03 12:26:11 -07:00
79cbe13c62 fix seed paths 2015-06-03 12:23:37 -07:00
272d9b4ad5 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00
e7d01424e9 refactor challenge and challengeMap 2015-06-02 19:02:54 -07:00
956a2b915e initial move to loopback server 2015-06-02 17:27:02 -07:00
57893cf714 two more minor fixes 2015-06-02 16:58:12 -07:00
a6dc24521d update models to be loopback compliantgs 2015-06-02 16:57:57 -07:00
88a512d96c refactor bonfire to loopback json 2015-06-02 16:08:50 -07:00
279f953628 Move models to common/models
closes #795
2015-06-02 15:05:26 -07:00
e8a2060e60 add eslintignore 2015-06-02 13:52:13 -07:00
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
e87e132325 Further improvements to html5 tests 2015-06-02 13:30:45 -07:00
b42abe4ace QA up to the placeholder challenge on basic-html5 2015-06-01 23:52:44 -07:00
64a12c6691 add progress bars to challengeMap 2015-06-01 23:34:14 -07:00
2fa0f34eb8 add progress bars 2015-06-01 23:27:33 -07:00
52147821b6 add embedded google forms 2015-06-01 21:33:53 -07:00