aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml39
-rw-r--r--CHANGELOG.md37
-rw-r--r--app/config/wallabag.yml2
-rw-r--r--composer.json2
-rw-r--r--tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php5
5 files changed, 63 insertions, 22 deletions
diff --git a/.travis.yml b/.travis.yml
index eb409533..39306343 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,17 +1,14 @@
1language: php 1language: php
2 2
3services: 3services:
4 - rabbitmq 4 - rabbitmq
5 - redis 5 - redis
6
7# faster builds on docker-container setup
8sudo: false
9 6
10# used for HHVM 7# used for HHVM
11addons: 8addons:
12 apt: 9 apt:
13 packages: 10 packages:
14 - tidy 11 - tidy
15 12
16# cache vendor dirs 13# cache vendor dirs
17cache: 14cache:
@@ -51,6 +48,14 @@ branches:
51 except: 48 except:
52 - legacy 49 - legacy
53 50
51before_install:
52 - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
53
54install:
55 - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi;
56 - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi;
57 - if [[ $ASSETS = build ]]; then yarn install; fi;
58
54before_script: 59before_script:
55 - PHP=$TRAVIS_PHP_VERSION 60 - PHP=$TRAVIS_PHP_VERSION
56 - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; 61 - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
@@ -58,17 +63,17 @@ before_script:
58 - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi 63 - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
59 - composer self-update --no-progress 64 - composer self-update --no-progress
60 - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; 65 - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
61 66 # increase swap to avoid "proc_open(): fork failed - Cannot allocate memory"
62install: 67 # this should be removed when no more PHP 5 build will be defined
63 - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.10; fi; 68 - sudo swapon -s
64 - if [[ $ASSETS = build ]]; then npm install -g yarn@latest; fi; 69 - sudo fallocate -l 4G /swapfile
65 - if [[ $ASSETS = build ]]; then yarn install; fi; 70 - sudo chmod 600 /swapfile
66 71 - sudo mkswap /swapfile
67before_install: 72 - sudo swapon /swapfile
68 - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; 73 - sudo swapon -s
69 74
70script: 75script:
71 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist 76 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
72 - echo "travis_fold:start:prepare" 77 - echo "travis_fold:start:prepare"
73 - make prepare DB=$DB 78 - make prepare DB=$DB
74 - echo "travis_fold:end:prepare" 79 - echo "travis_fold:end:prepare"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73fe6798..eb2c3084 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,42 @@
1# Changelog 1# Changelog
2 2
3## [2.3.4](https://github.com/wallabag/wallabag/tree/2.3.4)
4 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.3...2.3.4)
5
6### Fixes
7
8- Fix image downloading on null image path [#3684](https://github.com/wallabag/wallabag/pull/3684)
9- Remove remaining deprecation notices [#3686](https://github.com/wallabag/wallabag/pull/3686)
10- Fix mobile viewport on big iframe and video elements [#3683](https://github.com/wallabag/wallabag/pull/3683)
11- Autofocus the username field on the login page [#3691](https://github.com/wallabag/wallabag/pull/3691)
12- Feature/svg logo [#3692](https://github.com/wallabag/wallabag/pull/3692)
13- Fixes a typo [#3702](https://github.com/wallabag/wallabag/pull/3702)
14- Update release script [#3705](https://github.com/wallabag/wallabag/pull/3705)
15- Removing failing test from Travis [#3707](https://github.com/wallabag/wallabag/pull/3707)
16- Replace SO url by lemonde.fr to avoid random failing test [#3685](https://github.com/wallabag/wallabag/pull/3685)
17- php-cs-fixer: native_function_invocation [#3716](https://github.com/wallabag/wallabag/pull/3716)
18- PHP 7.2 shouldn't fail [#3717](https://github.com/wallabag/wallabag/pull/3717)
19- Liberation goes https [#3726](https://github.com/wallabag/wallabag/pull/3726)
20- Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters. [#3725](https://github.com/wallabag/wallabag/pull/3725)
21- Fix dockerfile php72 [#3734](https://github.com/wallabag/wallabag/pull/3734)
22- Fix sort parameters [#3719](https://github.com/wallabag/wallabag/pull/3719)
23- Add note on GitHub PR template to auto-close issues [#3763](https://github.com/wallabag/wallabag/pull/3763)
24- Fix link to wallabag requirements in documentation [#3766](https://github.com/wallabag/wallabag/pull/3766)
25- Update translation when marking as read [#3772](https://github.com/wallabag/wallabag/pull/3772)
26- Makefile fixes for non GNU systems [#3706](https://github.com/wallabag/wallabag/pull/3706)
27- Card no preview replaced by wallabag logo [#3774](https://github.com/wallabag/wallabag/pull/3774)
28
29### Changes
30
31- Propose YunoHost badge for installing [#3678](https://github.com/wallabag/wallabag/pull/3678)
32- More robust srcset image attribute handling [#3690](https://github.com/wallabag/wallabag/pull/3690)
33- Rename getBuilderByUser and refactor query for untagged entries [#3712](https://github.com/wallabag/wallabag/pull/3712)
34- Show tags on non-image gallery preview card [#3743](https://github.com/wallabag/wallabag/pull/3743)
35- add manifest.json for android pwa [#3606](https://github.com/wallabag/wallabag/pull/3606)
36- Add placeholder image to card-based gallery entries page [#3745](https://github.com/wallabag/wallabag/pull/3745)
37- Abort running install and update script if root [#3733](https://github.com/wallabag/wallabag/pull/3733)
38- Swap entry url with origin url if graby provides an updated one [#3553](https://github.com/wallabag/wallabag/pull/3553)
39
3## [2.3.3](https://github.com/wallabag/wallabag/tree/2.3.3) 40## [2.3.3](https://github.com/wallabag/wallabag/tree/2.3.3)
4 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.2...2.3.3) 41 [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.2...2.3.3)
5 42
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index d2476959..6354b22f 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -1,5 +1,5 @@
1wallabag_core: 1wallabag_core:
2 version: 2.3.3 2 version: 2.3.4
3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" 3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
4 languages: 4 languages:
5 en: 'English' 5 en: 'English'
diff --git a/composer.json b/composer.json
index 9ed91f20..86241be0 100644
--- a/composer.json
+++ b/composer.json
@@ -91,7 +91,7 @@
91 "doctrine/doctrine-fixtures-bundle": "~2.2", 91 "doctrine/doctrine-fixtures-bundle": "~2.2",
92 "doctrine/data-fixtures": "~1.1", 92 "doctrine/data-fixtures": "~1.1",
93 "sensio/generator-bundle": "^3.0", 93 "sensio/generator-bundle": "^3.0",
94 "symfony/phpunit-bridge": "^3.3", 94 "symfony/phpunit-bridge": "3.4.x-dev",
95 "friendsofphp/php-cs-fixer": "~2.0", 95 "friendsofphp/php-cs-fixer": "~2.0",
96 "m6web/redis-mock": "^2.0", 96 "m6web/redis-mock": "^2.0",
97 "dama/doctrine-test-bundle": "^4.0" 97 "dama/doctrine-test-bundle": "^4.0"
diff --git a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
index bf0068b4..479e0700 100644
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@@ -166,9 +166,8 @@ class EntryControllerTest extends WallabagCoreTestCase
166 $this->assertSame($this->url, $content->getUrl()); 166 $this->assertSame($this->url, $content->getUrl());
167 $this->assertContains('Google', $content->getTitle()); 167 $this->assertContains('Google', $content->getTitle());
168 $this->assertSame('fr', $content->getLanguage()); 168 $this->assertSame('fr', $content->getLanguage());
169 $this->assertSame('2015-03-28 11:43:19', $content->getPublishedAt()->format('Y-m-d H:i:s')); 169 $this->assertSame('2016-04-07 19:01:35', $content->getPublishedAt()->format('Y-m-d H:i:s'));
170 $this->assertSame('Morgane Tual', $author[0]); 170 $this->assertArrayHasKey('x-frame-options', $content->getHeaders());
171 $this->assertArrayHasKey('x-varnish1', $content->getHeaders());
172 $client->getContainer()->get('craue_config')->set('store_article_headers', 0); 171 $client->getContainer()->get('craue_config')->set('store_article_headers', 0);
173 } 172 }
174 173