Quincy Larson
|
10f53bdd49
|
Merge pull request #1161 from LumenTeun/grammar
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
|
2015-07-02 13:56:11 -07:00 |
Berkeley Martinez
|
580e2e3ebd
|
add redirect for https
|
2015-07-01 14:35:15 -07:00 |
LumenTeun
|
75948c4bc1
|
Quite a few spelling and grammar fixes
|
2015-06-30 04:28:43 +02:00 |
Quincy Larson
|
7e2d5c91e2
|
minor ui improvements
|
2015-06-26 01:28:02 -07:00 |
Quincy Larson
|
378f6da221
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
public/js/main_0.0.3.js
seed/challenges/get-set-for-free-code-camp.json
seed/field-guides.json
|
2015-06-26 01:08:40 -07:00 |
Berkeley Martinez
|
310bf7f6fb
|
fix navbar should point to /news not /stories
|
2015-06-25 23:43:02 -07:00 |
Quincy Larson
|
6700729658
|
update emails and refine sponsor view
|
2015-06-25 23:35:48 -07:00 |
Berkeley Martinez
|
82c96ec0ba
|
bump main.js version
|
2015-06-25 23:20:16 -07:00 |
Quincy Larson
|
ce0731df5f
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
server/boot/randomAPIs.js
server/views/coursewares/showBonfire.jade
server/views/partials/navbar.jade
|
2015-06-21 15:53:16 -07:00 |
Berkeley Martinez
|
8f445b58f2
|
fix chat links go to Gitter Room
|
2015-06-20 23:11:33 -07:00 |
Quincy Larson
|
a0f4f91ec1
|
remove slack completely and update help and pair actions
|
2015-06-20 18:40:43 -07:00 |
Quincy Larson
|
0621b8c62b
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-16 13:46:37 -07:00 |
Quincy Larson
|
2e1babb12d
|
finalize calculator for release
|
2015-06-16 13:46:24 -07:00 |
terakilobyte
|
b0b236821e
|
More inspectlet configuring
|
2015-06-16 12:30:49 -04:00 |
terakilobyte
|
308e539e1e
|
More protocol experimentation
|
2015-06-16 12:23:49 -04:00 |
terakilobyte
|
3546cf4765
|
Fetch google fonts over https
|
2015-06-16 12:09:45 -04: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 |
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
|
8b7bfb23ab
|
Update story api to use stories instead of news
|
2015-06-05 09:07:46 -04: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 |