Commit Graph

26356 Commits

Author SHA1 Message Date
cb76aa1ea0 whitelist nginx server in helmet 2015-06-16 00:14:33 -04:00
c9ba210afa factor bootcamp JSON into seperate file 2015-06-15 20:49:55 -07:00
76a800f575 Merge pull request #922 from kurzninja/patch-2
Added missing MDN Link
2015-06-15 20:37:01 -07:00
0237c71a58 Merge pull request #920 from kurzninja/patch-1
Fixed a word
2015-06-15 20:35:46 -07:00
1cd85eeb8f Debug statement for fieldguide ID 2015-06-15 23:35:29 -04:00
6b909d8f59 start refactoring calculator logic 2015-06-15 18:00:13 -07:00
092f8254ed 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
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
93dd65176c rename flattenUser to loopbackMigration
add stories migration to script
2015-06-15 16:47:50 -07:00
3d8b8e4c73 rename flattenUser to loopbackMigration
add stories migration to script
2015-06-15 16:47:50 -07:00
d87dcd6ada Remove excess debug statements from flattenUser.js 2015-06-15 19:12:48 -04:00
d6ddd632d0 Remove excess debug statements from flattenUser.js 2015-06-15 19:12:48 -04:00
643aa30cea Fix json typo 2015-06-15 18:59:56 -04:00
76811b9215 Fix json typo 2015-06-15 18:59:56 -04:00
42aae365f6 Update current challenge logic 2015-06-15 18:57:45 -04:00
4092dcecf7 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-15 18:50:31 -04:00
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
b0dc4ffa12 get account should redirect to '/' when no user is logged in 2015-06-15 15:47:56 -07:00
c4d229e62d remove email verification step.
users are marked for future uses
2015-06-15 15:43:12 -07:00
a334b9870c Set up production variables 2015-06-15 18:24:26 -04:00
472834e39b Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-15 18:11:06 -04:00
faeff7b1ed Ensure build process is part of npm install 2015-06-15 18:10:48 -04:00
988242df03 Ensure build process is part of npm install 2015-06-15 18:10:48 -04:00
ef55a4128b remove coverage from tracking.
closes #900
2015-06-15 15:06:15 -07:00
ac282697ea Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-15 11:56:37 -07:00
a82a8fb044 move to dashedName lookup 2015-06-15 14:50:54 -04:00
bd7494c909 Update directory.jade 2015-06-15 11:42:33 -07:00
e5a4c2f8f5 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-15 18:54:20 +02:00
845c0ccc74 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-15 18:54:20 +02:00
4b349ff761 Check fix in 'Bootstrap Grid'. #907 2015-06-15 18:26:44 +02:00
663492c582 Check fix in 'Bootstrap Grid'. #907 2015-06-15 18:26:44 +02:00
667a37cac7 Test for almost palindromes. #911 2015-06-15 18:14:55 +02:00
480c5dec0a Test for almost palindromes. #911 2015-06-15 18:14:55 +02:00
8ae797d582 Improves check for catphotoapp.com. Fixes #914 2015-06-15 18:06:09 +02:00
0038c48875 Improves check for catphotoapp.com. Fixes #914 2015-06-15 18:06:09 +02:00
466395eb74 Fixed Zipline jQuery.getJSON() links. Fixes #918 #919 2015-06-15 17:43:52 +02:00
00c1cdef5b Fixed Zipline jQuery.getJSON() links. Fixes #918 #919 2015-06-15 17:43:52 +02:00
2911562888 More 'Convert HTML Entities' test cases. Fixes #924 2015-06-15 17:26:37 +02:00
f50cee119c More 'Convert HTML Entities' test cases. Fixes #924 2015-06-15 17:26:37 +02:00
40ce1d8162 Refactor to use dashedName for challenges in lookup. 2015-06-15 08:01:43 -04:00
6c33d4bf78 calculator works 2015-06-14 21:17:48 -07:00
0ef39904a9 major improvements to calculator logic 2015-06-14 17:55:23 -07:00
2a98e5c851 fix calculator view file location 2015-06-14 01:39:22 -07:00
5e3edf5cda Merge branch 'master' into staging 2015-06-14 01:10:51 -07:00
43f347bae0 Merge branch 'calculator' into staging
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
2015-06-14 01:10:48 -07:00
d5b5973326 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
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
b411426874 add dashedName attribute to challenge 2015-06-14 00:56:47 -07:00
9589b6abeb add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
2b7177e856 add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00