diff --git a/.travis.yml b/.travis.yml index 00de76635..d574191c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ addons: - ubuntu-toolchain-r-test packages: - g++-4.8 -script: "npm test && sudo $(which npm) run test-root" +script: "npm test && sudo $(which npm) run test-root && npm run test:install" before_script: - "./test/hosts.sh" before_install: diff --git a/CHANGELOG.md b/CHANGELOG.md index bb53d9b7e..f9433c033 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,17 @@ pump.io follows [Semantic Versioning][semver]. +## 3.0.0 beta 1 - 2017-02-15 + +### Improved + +* Improve performance of front-page image + +### Fixed + +* Fix the web UI repeating YouTube videos (again) +* Fix direct visits to /following URLs not rendering layout (#1279) + ## 3.0.0 beta 0 - 2017-02-01 ### Improved diff --git a/package.json b/package.json index b5fbd276d..bbc0a30df 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "postinstall": "npm run build", "test": "npm run lint && vows -v test/*-test.js", "test-root": "vows -v test/*-test-as-root.js", + "test:install": "sudo $(which npm) install -g .", "lint": "npm run lint:jshint && npm run lint:jscs && npm run lint:jade", "lint:jshint": "jshint --exclude 'public/javascript/libs' bin/* routes", "lint:jscs": "jscs bin/* lib public/javascript/pump* routes test", diff --git a/public/images/somefriends.jpg b/public/images/somefriends.jpg index 038169367..43d56e38d 100644 Binary files a/public/images/somefriends.jpg and b/public/images/somefriends.jpg differ diff --git a/public/javascript/pump/view.js b/public/javascript/pump/view.js index dda3ab3e9..40ea82bdd 100644 --- a/public/javascript/pump/view.js +++ b/public/javascript/pump/view.js @@ -198,6 +198,7 @@ "error", "favorites", "followers", + "following", "inbox", "javascript-disabled", "list", diff --git a/public/template/following-client.jade b/public/template/following-client.jade new file mode 100644 index 000000000..b12453d41 --- /dev/null +++ b/public/template/following-client.jade @@ -0,0 +1,12 @@ +.user.user-following + .row + .span12 + include ./profile-block.jade + + .row + .span12 + include ./profile-nav.jade + + .row + .span12#user-content + include ./user-content-following.jade diff --git a/public/template/following.jade b/public/template/following.jade index b12453d41..3c60214f5 100644 --- a/public/template/following.jade +++ b/public/template/following.jade @@ -1,12 +1,5 @@ -.user.user-following - .row - .span12 - include ./profile-block.jade +extends ./layout.jade - .row - .span12 - include ./profile-nav.jade +block body - .row - .span12#user-content - include ./user-content-following.jade + include following-client.jade diff --git a/public/template/major-activity.jade b/public/template/major-activity.jade index cf1c91aad..8a5ddb5d5 100644 --- a/public/template/major-activity.jade +++ b/public/template/major-activity.jade @@ -51,7 +51,7 @@ unless object.deleted - var yt = String(object.content.match(/www\.youtube\.com\/watch\?v=[a-zA-Z0-9_-]*/)) if yt iframe(width="420", height="315", frameborder="0", src="//www.youtube.com/embed/" + yt.substring(yt.indexOf('?v=')+3, yt.length), allowfullscreen) - - delete yt + - yt = ''; if principal - var obj = object;