Merge remote-tracking branch 'upstream/master'

Conflicts: package.json
2014-02-27 16:16:13 +00:00
parent 675156629d 31e4954890
commit c78085b73e
32 changed files with 2051 additions and 1297 deletions
--- a/controllers/api.js
+++ b/controllers/api.js
@ -124,7 +124,7 @@ exports.getScraping = function(req, res, next) {
    if (err) return next(err);
    var $ = cheerio.load(body);
    var links = [];
-    $('.title a').each(function() {
+    $(".title a[href^='http'], a[href^='https']").each(function() {
      links.push($(this));
    });
    res.render('api/scraping', {