Commit Graph

3561 Commits

Author SHA1 Message Date
2e1babb12d finalize calculator for release 2015-06-16 13:46:24 -07:00
40b5b05ea4 factor JavaScript and JSON into separate files 2015-06-16 13:03:13 -07:00
2cb0a3d717 futher improve calculator ux 2015-06-16 12:32:12 -07:00
9bc4f0c25c Merge branch 'master' into staging 2015-06-16 06:08:25 -07:00
ef9d6fc55b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 06:08:18 -07:00
e319652373 Fix wikipedia viewer zipline naming 2015-06-16 08:36:54 -04:00
23eb74c762 improve ux on calculator clicking 2015-06-15 21:44:19 -07:00
e08f895769 Handle invalid login 2015-06-16 00:29:32 -04:00
070c248132 Handle invalid login 2015-06-16 00:27:32 -04:00
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
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
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
3d8b8e4c73 rename flattenUser to loopbackMigration
add stories migration to script
2015-06-15 16:47:50 -07:00
d6ddd632d0 Remove excess debug statements from flattenUser.js 2015-06-15 19:12:48 -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
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
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
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
2b7177e856 add dashedName attributes to JSON 2015-06-14 00:55:27 -07:00
2c8a134e80 first challenge json file updated with dashedname 2015-06-13 23:50:36 -07:00
bc37c9bbfb Update README
Put it note about switching to loopback.
2015-06-13 23:26:58 -04:00
cb0485cb15 update meta 2015-06-13 13:42:59 -07:00
320d84c3c1 Make bower automatic, add gulp build task to build less file into css 2015-06-12 23:31:42 -04:00
cf47e5374f Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 21:10:18 -04:00
af75452db5 Remove forcedomain so we can test beta website 2015-06-12 21:09:12 -04:00
f6fbe6e9c7 make username unique and make username required 2015-06-12 16:40:49 -07:00
5b2b7e23ae Take id property of username, remove wasteful save on profile lookup. 2015-06-12 19:16:10 -04:00
d07e5351ea Comment out blacklist 2015-06-12 18:55:47 -04:00
071331de83 Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-06-12 18:32:31 -04:00
90b2f99a70 add create identities on flatten users 2015-06-12 15:27:51 -07:00
e29a340afb add blacklisted usernames to loopback user validations 2015-06-12 13:54:38 -07:00