Michael Q Larson
|
2dbd59b7f1
|
Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
controllers/resources.js
views/account/show.jade
views/coursewares/showHTML.jade
views/coursewares/showJS.jade
views/partials/bonfires.jade
|
2015-03-21 16:36:35 -07:00 |
Michael Q Larson
|
88e261ccf6
|
Merge branch 'master' into ux-improvements
Conflicts:
controllers/resources.js
controllers/user.js
seed_data/challenges.json
views/account/show.jade
views/coursewares/showHTML.jade
views/coursewares/showJS.jade
views/partials/bonfires.jade
|
2015-03-21 16:25:39 -07:00 |
Nathan Leniz
|
6ad7c22313
|
Working on codemirror display issue in html coursewares
|
2015-03-21 16:34:06 +09:00 |
Nathan Leniz
|
5e095e8832
|
Merge remote-tracking branch 'upstream/master' into ux-improvements
|
2015-03-21 13:42:08 +09:00 |
Nathan Leniz
|
b35f5ca59c
|
Working on unifying coursewares view and logic
|
2015-03-21 13:42:02 +09:00 |
Nathan Leniz
|
d48da59aa7
|
resolve merge conflicts
|
2015-03-21 12:03:16 +09:00 |
Michael Q Larson
|
56d7301d25
|
refactor announcement modal and add nodeschool-challenges
|
2015-03-19 22:34:36 -07:00 |
Berkeley Martinez
|
3b913be893
|
handle async flow/errors of profile update
|
2015-03-17 21:09:54 -07:00 |
Berkeley Martinez
|
ab14b32d19
|
middleware using next should specify it in arguments
|
2015-03-17 20:42:09 -07:00 |
Berkeley Martinez
|
7b449e7a5b
|
Add returns to error handlers
add missing next to arguments for middleware
|
2015-03-17 20:39:27 -07:00 |
jameskopacz
|
09a1463744
|
Dev crash err handling
|
2015-03-14 19:25:56 -05:00 |
jameskopacz
|
cf4c680874
|
Dev server crash fix
|
2015-03-14 18:13:08 -05:00 |
Michael Q Larson
|
8e8711d947
|
add @rybar's new placeholder camper image and fix the broken logic that was supposed to update it for existing users
|
2015-03-11 23:58:16 -07:00 |
Michael Q Larson
|
526d874d1b
|
add logic to truncate long headlines fetched from websites
|
2015-03-10 10:05:29 -07:00 |
Quincy Larson
|
c0702b9d04
|
Merge pull request #180 from terakilobyte/master
MOre news updates
|
2015-03-09 16:39:04 -07:00 |
Michael Q Larson
|
09e42df355
|
update sitemap
|
2015-03-09 07:18:31 -07:00 |
Nathan Leniz
|
55b047aa32
|
Refactor resources.js to include meta description.
|
2015-03-09 18:21:41 +09:00 |
Nathan Leniz
|
eb991c4f15
|
Add image fetching for articles that support the og:image meta tag
|
2015-03-09 13:08:39 +09:00 |
Nathan Leniz
|
3b3de541b3
|
Update username for stories and comments on username change in profile
|
2015-03-09 11:59:50 +09:00 |
Nathan Leniz
|
bc06c69a7b
|
update user pictures on page fetch for learn-to-code
|
2015-03-09 07:59:18 +09:00 |
Michael Q Larson
|
8d2552fe57
|
give users without images a default image and retroactively give that to all their stories and comments and also make some UI changes to stories.
|
2015-03-08 15:39:36 -07:00 |
Michael Q Larson
|
4529558ce4
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
|
2015-03-08 15:16:50 -07:00 |
Michael Q Larson
|
37c98a95ed
|
add check for missing image
|
2015-03-08 15:16:44 -07:00 |
Nathan Leniz
|
7a56d4fcb2
|
Remove debug/console.log statements
|
2015-03-09 06:58:08 +09:00 |
Nathan Leniz
|
6283ec1174
|
resolve show.jade merge conflict
|
2015-03-08 18:50:28 +09:00 |
Michael Q Larson
|
aacb0070b3
|
add the nonprofit projects guide view and change all our nonbreaking spaces to smaller, more natural looking spaces
|
2015-03-08 01:36:09 -08:00 |
Nathan Leniz
|
f367a0310e
|
Finalizing display issues for news release
|
2015-03-08 16:50:51 +09:00 |
Michael Q Larson
|
49886ca097
|
remove node-rest-client and use request
|
2015-03-07 15:57:30 -08:00 |
Nathan Leniz
|
b776be58e5
|
Finish full functionality for intial release of camper news
|
2015-03-07 20:51:20 +09:00 |
Nathan Leniz
|
9bea52d42f
|
Refactor post flow, get url info back from server, redirect to final submission form
|
2015-03-07 17:42:22 +09:00 |
Nathan Leniz
|
b655cb7532
|
Title scraping in resource.js getURLTitle function
|
2015-03-07 16:08:15 +09:00 |
Nathan Leniz
|
39d66ea0da
|
Merge branch 'master' into news
|
2015-03-07 15:23:56 +09:00 |
Nathan Leniz
|
aad15b88ba
|
fudging around with interpreting opengraph info in resources.js
|
2015-03-06 17:25:28 +09:00 |
Michael Q Larson
|
c8c396981a
|
update sitemap
|
2015-03-06 00:13:58 -08:00 |
Michael Q Larson
|
a524ffdde0
|
beautify learn-to-code
|
2015-02-26 14:38:22 -08:00 |
Michael Q Larson
|
fc1d560a89
|
start refactoring points into progressTimestamps which is essentially points with timestamps
|
2015-02-22 18:16:26 -08:00 |
Nathan Leniz
|
3e65298e35
|
All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware
|
2015-02-22 18:23:50 +09:00 |
Nathan Leniz
|
b5a449cb1c
|
Cross off completed bonfires in list of all bonfires in modal
|
2015-02-22 17:36:43 +09:00 |
Michael Q Larson
|
85f6c6eb4d
|
make both score and picture redirect to portfolio, make chat and forum links redirect universally regardless of completion of challenges, simplify accounts page
|
2015-02-19 16:33:08 -08:00 |
Michael Q Larson
|
749954542f
|
refactor learn-to-code view to look more visual and have fewer components
|
2015-02-18 22:58:10 -08:00 |
Michael Q Larson
|
4ef8e7eda4
|
reverse the attempts to allow cross site scripts and just use relative paths for now
|
2015-02-17 15:35:16 -08:00 |
Michael Q Larson
|
5d9e82f9cb
|
update format of AJAX call to json
|
2015-02-17 15:08:57 -08:00 |
Michael Q Larson
|
312debdb95
|
send json
|
2015-02-17 14:57:11 -08:00 |
Michael Q Larson
|
09e9dcefe0
|
attempt to configure mimetype for ajax calls
|
2015-02-17 14:52:46 -08:00 |
Michael Q Larson
|
0d3ee3c2b4
|
add screen hero installation view
|
2015-02-17 14:10:15 -08:00 |
Michael Q Larson
|
449589827c
|
add ajax for github calls
|
2015-02-17 13:31:59 -08:00 |
Michael Q Larson
|
8e209d6bca
|
start refactoring the learn-to-code view to use ajax
|
2015-02-16 23:35:02 -08:00 |
Michael Q Larson
|
03f8ddf6c0
|
slight changes to announcements and remove errant debug statement.
|
2015-02-16 17:56:01 -08:00 |
Michael Q Larson
|
d279ac6d1b
|
add announcements and make the github api calls more robust
|
2015-02-16 17:48:42 -08:00 |
Michael Q Larson
|
762ee8aa26
|
fix about view to render data from github
|
2015-02-16 01:21:40 -08:00 |