Commit Graph

3593 Commits (bb6f1538588af279fddb608b0882aa09c50441da)

Author SHA1 Message Date
Quincy Larson 169de8e576 update map modal and make t-rex rarer and more intense 2015-06-04 23:50:59 -07:00
Charles Treece 04ed850ef9 Escaped dot in RegExp for the Waypoint: Override Styles with Important 2015-06-05 01:33:10 -04:00
Quincy Larson d86c405ef1 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-04 20:40:49 -07:00
Quincy Larson d00db04211 fix broken link and add city 2015-06-04 20:40:26 -07:00
terakilobyte 14d7b5f92f Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-04 23:39:58 -04:00
terakilobyte 72ed16f6cf Add hpp for express vulnerability fix 2015-06-04 23:39:51 -04:00
Quincy Larson 6256bfec0e Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-04 19:41:05 -07:00
terakilobyte 53a31509e6 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-04 22:36:08 -04:00
terakilobyte f002e7c3f7 Always output tests in the order ran ignoring success or failure. Bump version numbers of framework files to force fresh browser fetches. 2015-06-04 22:35:42 -04:00
Quincy Larson 875d09c29b add hpp to address express vulnerability 2015-06-04 19:30:27 -07:00
Quincy Larson f808587827 add get emails script 2015-06-04 18:07:00 -07:00
Berkeley Martinez 48dea7db24 bump lodash 2015-06-04 15:09:24 -07:00
Berkeley Martinez 208f4ea18f fix typo in require 2015-06-04 14:32:59 -07:00
Berkeley Martinez b6a0edc964 fix nonprofit ids should be unique 2015-06-04 14:32:16 -07:00
Berkeley Martinez 0ac664c9ae Use mongodb sparse indexing for user emails 2015-06-04 14:21:01 -07:00
Berkeley Martinez 40e8b61fbf Set up datasources properly for production 2015-06-04 14:20:37 -07:00
Quincy Larson b6ddb0fa4b fix 839 2015-06-04 14:20:00 -07:00
Quincy Larson 8900f8f8a1 fix 840 2015-06-04 14:18:47 -07:00
Berkeley Martinez cfb5f06cdf Use strings for challengeMap
fixes switch when numbers are strings
2015-06-04 13:28:35 -07:00
Quincy Larson 3654bb7e6f change _id to id everywhere that seems relevant to loopback 2015-06-04 13:20:42 -07:00
Berkeley Martinez a695daa03f add default empty array to user.completedChallenges 2015-06-04 13:09:22 -07:00
Quincy Larson b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Quincy Larson 1515462fcf fix #819 2015-06-04 12:50:42 -07:00
Berkeley Martinez db37482c59 Flatten user object 2015-06-04 12:47:31 -07:00
Berkeley Martinez 72fe9c2463 Add cookie secrets to env 2015-06-04 12:42:13 -07:00
Quincy Larson c7cbdd7e69 update forms 2015-06-04 12:32:19 -07:00
Berkeley Martinez 02b195511e fix challengeSeeds should be arrays 2015-06-04 12:31:33 -07:00
Quincy Larson 618cedddb0 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-04 12:24:30 -07:00
Quincy Larson 300323d215 make all challenge seeds arrays 2015-06-04 12:24:16 -07:00
Berkeley Martinez 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
Berkeley Martinez bba0e0a9fe remove unused deps 2015-06-04 11:30:05 -07:00
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