Commit Graph

3562 Commits (53f5f36768b184af8c34ecb2b3124bb105adcbd9)

Author SHA1 Message Date
Berkeley Martinez 4a696462d2 Add reactify branch react components 2015-06-04 10:53:01 -07:00
Berkeley Martinez 66eff31294 Adding passport config stuff 2015-06-04 10:52:12 -07:00
Quincy Larson 79e90c82a8 close issues by updating json files 2015-06-04 01:01:48 -07:00
Quincy Larson ee1f336475 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	public/css/main.less
2015-06-04 00:22:16 -07:00
Quincy Larson aa44bb2e3f Merge pull request #831 from treece/treece-830
Changed z-index of iframe-scroll class to 1
2015-06-04 00:17:56 -07:00
Charles Treece d6f1565e19 changed z-index of iframe-croll class to 1 2015-06-03 23:04:43 -04:00
Berkeley Martinez 075d851374 refactor resources to utils 2015-06-03 17:14:45 -07:00
Berkeley Martinez e349797a4b rename boot utility
remove subrouter use in server.js
2015-06-03 16:56:48 -07:00
Berkeley Martinez 75f9b06e90 fix incorrect model name 2015-06-03 16:48:17 -07:00
Berkeley Martinez 393f95082e bump gulp-nodemon 2015-06-03 16:47:59 -07:00
Berkeley Martinez 415d46b591 fix add models to model-config 2015-06-03 16:35:22 -07:00
Berkeley Martinez bfd33d8b40 fix use app.use(router) to add sub router 2015-06-03 16:31:42 -07:00
Berkeley Martinez 8165105b29 refactor all boot to export func and use loopback 2015-06-03 16:19:23 -07:00
Quincy Larson d6e09ad1e5 fix the html mobile view to have taller iframe 2015-06-03 15:50:28 -07:00
Berkeley Martinez 65cde59f0d use app instead of server in boot directories 2015-06-03 12:26:11 -07:00
Berkeley Martinez 79cbe13c62 fix seed paths 2015-06-03 12:23:37 -07:00
Quincy Larson aa0ba45bf2 fix checkbox challenge issue 2015-06-03 08:02:08 -07:00
Quincy Larson 5d651bce18 closes 824 2015-06-03 07:53:52 -07:00
Quincy Larson 217ad9c85c finish QAing bootstrap challenges 2015-06-03 00:27:25 -07:00
Quincy Larson af706fb84d fix bootstrap more issues 2015-06-03 00:07:39 -07:00
Quincy Larson 8682a0ea25 fix bootstrap issues 2015-06-02 23:39:40 -07:00
terakilobyte 8008997fbb Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-03 01:12:25 -04:00
Berkeley Martinez 272d9b4ad5 Update seed directory to use loopback 2015-06-02 20:32:10 -07:00
Quincy Larson 1ab84010f6 fix production issue 2015-06-02 20:30:22 -07:00
Berkeley Martinez 3a3d296847 Fix typo in Kitty Ipsum challenge 2015-06-02 19:59:29 -07:00
Quincy Larson c5b20185e5 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-02 19:54:56 -07:00
Quincy Larson 10cbd8f3ec fix wording on HTML challenge 2015-06-02 19:48:59 -07:00
Quincy Larson 51bfa12c33 make iphone stand out over footer 2015-06-02 19:45:58 -07:00
Berkeley Martinez d0fc96c133 fix typo in field-guide style-guide
closes #794
2015-06-02 19:27:40 -07:00
Berkeley Martinez e7d01424e9 refactor challenge and challengeMap 2015-06-02 19:02:54 -07:00
Berkeley Martinez 956a2b915e initial move to loopback server 2015-06-02 17:27:02 -07:00
Quincy Larson 57893cf714 two more minor fixes 2015-06-02 16:58:12 -07:00
Quincy Larson a6dc24521d update models to be loopback compliantgs 2015-06-02 16:57:57 -07:00
Berkeley Martinez 88a512d96c refactor bonfire to loopback json 2015-06-02 16:08:50 -07:00
Quincy Larson f7601946aa update bootstrap and html5 waypoints 2015-06-02 15:55:26 -07:00
Berkeley Martinez 279f953628 Move models to common/models
closes #795
2015-06-02 15:05:26 -07:00
Quincy Larson 95cfb70026 finish qa-ing html5 challenges 2015-06-02 14:14:20 -07:00
Berkeley Martinez e8a2060e60 add eslintignore 2015-06-02 13:52:13 -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
Quincy Larson e87e132325 Further improvements to html5 tests 2015-06-02 13:30:45 -07:00
Quincy Larson b42abe4ace QA up to the placeholder challenge on basic-html5 2015-06-01 23:52:44 -07:00
Quincy Larson 64a12c6691 add progress bars to challengeMap 2015-06-01 23:34:14 -07:00
Quincy Larson 2fa0f34eb8 add progress bars 2015-06-01 23:27:33 -07:00
Quincy Larson 52147821b6 add embedded google forms 2015-06-01 21:33:53 -07:00
Quincy Larson b8b5f3471f Merge branch 'master' into staging
Conflicts:
	seed_data/challenges/basic-html5-and-css.json
2015-06-01 17:40:09 -07:00
Quincy Larson 223c4499ba minor fixes so far 2015-06-01 17:22:09 -07:00
Quincy Larson b5eef8a5e8 fix systemic typo in challenges 2015-06-01 17:11:24 -07:00
Berkeley Martinez 40bc945a20 remove old bower components 2015-06-01 17:11:23 -07:00
Quincy Larson 5f71407a84 remove cruft 2015-06-01 17:09:58 -07:00
Berkeley Martinez 24bca19616 fix order of routes 2015-06-01 17:09:15 -07:00