Commit Graph

3349 Commits

Author SHA1 Message Date
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
b8b5f3471f Merge branch 'master' into staging
Conflicts:
	seed_data/challenges/basic-html5-and-css.json
2015-06-01 17:40:09 -07:00
223c4499ba minor fixes so far 2015-06-01 17:22:09 -07:00
b5eef8a5e8 fix systemic typo in challenges 2015-06-01 17:11:24 -07:00
40bc945a20 remove old bower components 2015-06-01 17:11:23 -07:00
5f71407a84 remove cruft 2015-06-01 17:09:58 -07:00
24bca19616 fix order of routes 2015-06-01 17:09:15 -07:00
04de3ecf9b Merge branch 'master' into staging 2015-06-01 17:07:33 -07:00
7643f1cabe fix FCC running using router syntax 2015-06-01 17:01:54 -07:00
7bb11e9fbe fix linting errors in server/boot/utilities 2015-06-01 16:48:16 -07:00
d67f7c666d refactor challenge controller to router syntax 2015-06-01 16:45:21 -07:00
28f0320f18 refactor fieldGuide controller to router 2015-06-01 16:32:54 -07:00
7c2f171d31 fix all the linting errors in boot 2015-06-01 16:23:53 -07:00
16eb003c1f Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-01 16:17:19 -07:00
4f45867b6e move to freecodecamp.slack.com 2015-06-01 16:17:06 -07:00
207d95e026 normalize all instructions in bootstrap challenges 2015-06-01 16:10:28 -07:00
d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00
08fa91c6ed normalize all instructions in html5-and-css challenges 2015-06-01 15:07:03 -07:00
c1b560896f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-01 13:56:03 -07:00
0a471b7847 Merge branch 'master' into staging 2015-06-01 13:55:53 -07:00