Quincy Larson
|
c9ba210afa
|
factor bootcamp JSON into seperate file
|
2015-06-15 20:49:55 -07:00 |
|
Quincy Larson
|
6b909d8f59
|
start refactoring calculator logic
|
2015-06-15 18:00:13 -07:00 |
terakilobyte
|
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 |
|
terakilobyte
|
40ce1d8162
|
Refactor to use dashedName for challenges in lookup.
|
2015-06-15 08:01:43 -04:00 |
|
Quincy Larson
|
6c33d4bf78
|
calculator works
|
2015-06-14 21:17:48 -07:00 |
|
Quincy Larson
|
0ef39904a9
|
major improvements to calculator logic
|
2015-06-14 17:55:23 -07:00 |
|
Quincy Larson
|
2a98e5c851
|
fix calculator view file location
|
2015-06-14 01:39:22 -07:00 |
|
Quincy Larson
|
5e3edf5cda
|
Merge branch 'master' into staging
|
2015-06-14 01:10:51 -07:00 |
|
Quincy Larson
|
43f347bae0
|
Merge branch 'calculator' into staging
Conflicts:
app.js
controllers/resources.js
seed/field-guides.json
|
2015-06-14 01:10:48 -07:00 |
|
Quincy Larson
|
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 |
|
Quincy Larson
|
173d46ae01
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
seed/field-guides.json
|
2015-06-12 12:40:26 -07:00 |
|
terakilobyte
|
34c3fef7d4
|
Move api hooks to user.js
|
2015-06-11 19:11:07 -04:00 |
|
terakilobyte
|
f7bb14803e
|
Update field guides to display properly. Correct models on user object.
|
2015-06-11 16:19:44 -04:00 |
|
Quincy Larson
|
5fb89cb091
|
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-11 11:16:31 -07:00 |
Berkeley Martinez
|
cd38a2d88e
|
fix user local signin
|
2015-06-09 17:22:14 -07:00 |
|
Berkeley Martinez
|
a8494b29da
|
add user signup through loopback
|
2015-06-09 16:45:14 -07:00 |
|
terakilobyte
|
5ec532f3d9
|
Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names.
|
2015-06-09 16:57:23 -04:00 |
|
Quincy Larson
|
61486c2d7c
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
app.js
controllers/fieldGuide.js
controllers/story.js
seed/challenges/basic-html5-and-css.json
seed/challenges/bootstrap.json
seed/field-guides.json
server/views/partials/navbar.jade
views/resources/jobs-form.jade
views/resources/nonprofits-form.jade
views/resources/pmi-acp-agile-project-managers-form.jade
|
2015-06-09 13:48:29 -07:00 |
|
terakilobyte
|
21b9405f06
|
Update links for new api model in views for stories.
|
2015-06-05 14:58:42 -04:00 |
|
terakilobyte
|
8b7bfb23ab
|
Update story api to use stories instead of news
|
2015-06-05 09:07:46 -04:00 |
|
Quincy Larson
|
3654bb7e6f
|
change _id to id everywhere that seems relevant to loopback
|
2015-06-04 13:20:42 -07:00 |
|
Quincy Larson
|
b2aafd89e7
|
flatten user object references throughout controllers and views
|
2015-06-04 12:54:41 -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 |
|
terakilobyte
|
d9c3251f94
|
Begin shaping codebase for loopback migration.
|
2015-06-01 18:30:43 -04:00 |