From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 8 Mar 2016 17:02:34 +0100 Subject: manage assets through npm first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. Change ManyToMany between entry & tag Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed Prepare wallabag 2.0.5 enforce older materialize version --- composer.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index a430c59e..253211a3 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,6 @@ "doctrine/doctrine-bundle": "^1.6", "doctrine/doctrine-cache-bundle": "^1.2", "twig/extensions": "~1.0", - "symfony/assetic-bundle": "~2.3", "symfony/swiftmailer-bundle": "^2.3", "symfony/monolog-bundle": "^2.8", "sensio/distribution-bundle": "^5.0", @@ -81,7 +80,8 @@ "mnapoli/piwik-twig-extension": "^1.0", "lexik/maintenance-bundle": "~2.1", "ocramius/proxy-manager": "1.*", - "white-october/pagerfanta-bundle": "^1.0" + "white-october/pagerfanta-bundle": "^1.0", + "mouf/nodejs-installer": "~1.0" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2", @@ -95,7 +95,6 @@ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" ], @@ -112,7 +111,6 @@ "symfony-var-dir": "var", "symfony-web-dir": "web", "symfony-tests-dir": "tests", - "symfony-assets-install": "relative", "incenteev-parameters": { "file": "app/config/parameters.yml" } -- cgit v1.2.3 From 11493858a74af2f9b3f9e1fbbddbfffba5813813 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 17 Jun 2016 22:03:29 +0200 Subject: Use friendsofphp instead of fabpot The fabpot's one is now depreacted --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index a430c59e..c4edd3c2 100644 --- a/composer.json +++ b/composer.json @@ -88,7 +88,7 @@ "sensio/generator-bundle": "^3.0", "phpunit/phpunit": "~4.4", "symfony/phpunit-bridge": "^2.7", - "fabpot/php-cs-fixer": "~1.9" + "friendsofphp/php-cs-fixer": "~1.9" }, "scripts": { "post-cmd": [ -- cgit v1.2.3 From db4d63fc1ae513335b751beb8f89e1eed61871c2 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 24 Jul 2016 11:15:51 +0200 Subject: Upgrade PHPUnit to version 5 - Fix deprecated getMock - Use PHPUnit 4 for PHP 5.5 build Manually cherry-picked from PR https://github.com/wallabag/wallabag/pull/2201 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 38ccec81..bdaad601 100644 --- a/composer.json +++ b/composer.json @@ -87,7 +87,7 @@ "doctrine/doctrine-fixtures-bundle": "~2.2", "doctrine/data-fixtures": "~1.1.1", "sensio/generator-bundle": "^3.0", - "phpunit/phpunit": "~4.4", + "phpunit/phpunit": "~5.0", "symfony/phpunit-bridge": "^3.0", "friendsofphp/php-cs-fixer": "~1.9" }, -- cgit v1.2.3 From 56c778b4152a1b886353933276ee3626e4e8c004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 15 Jan 2016 08:24:32 +0100 Subject: 1st draft for rabbitMQ --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index bdaad601..121a3fd3 100644 --- a/composer.json +++ b/composer.json @@ -81,7 +81,8 @@ "lexik/maintenance-bundle": "~2.1", "ocramius/proxy-manager": "1.*", "white-october/pagerfanta-bundle": "^1.0", - "mouf/nodejs-installer": "~1.0" + "mouf/nodejs-installer": "~1.0", + "php-amqplib/rabbitmq-bundle": "^1.8" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2", -- cgit v1.2.3 From b3437d58ae224121375c99e9288d8b808524e624 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 9 Sep 2016 21:02:03 +0200 Subject: Enable Redis async import - using javibravo/simpleue - internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear - if both option are enable rabbit will be choosen - services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml` - --- composer.json | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 121a3fd3..8220ed45 100644 --- a/composer.json +++ b/composer.json @@ -82,7 +82,9 @@ "ocramius/proxy-manager": "1.*", "white-october/pagerfanta-bundle": "^1.0", "mouf/nodejs-installer": "~1.0", - "php-amqplib/rabbitmq-bundle": "^1.8" + "php-amqplib/rabbitmq-bundle": "^1.8", + "predis/predis": "^1.0", + "javibravo/simpleue": "^1.0" }, "require-dev": { "doctrine/doctrine-fixtures-bundle": "~2.2", @@ -90,7 +92,8 @@ "sensio/generator-bundle": "^3.0", "phpunit/phpunit": "~5.0", "symfony/phpunit-bridge": "^3.0", - "friendsofphp/php-cs-fixer": "~1.9" + "friendsofphp/php-cs-fixer": "~1.9", + "m6web/redis-mock": "^2.0" }, "scripts": { "post-cmd": [ -- cgit v1.2.3 From 1b1cb553be7f324a5adea0025e64be9dc57427b2 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 4 Oct 2016 21:44:58 +0200 Subject: Remove mouf/nodejs-installer from composer --- composer.json | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 8220ed45..4f56162e 100644 --- a/composer.json +++ b/composer.json @@ -63,7 +63,6 @@ "willdurand/hateoas-bundle": "~1.0", "htmlawed/htmlawed": "~1.1.19", "liip/theme-bundle": "~1.1", - "pagerfanta/pagerfanta": "~1.0.3", "lexik/form-filter-bundle": "~5.0", "j0k3r/graby": "~1.0", "friendsofsymfony/user-bundle": "~2.0@dev", @@ -81,7 +80,6 @@ "lexik/maintenance-bundle": "~2.1", "ocramius/proxy-manager": "1.*", "white-october/pagerfanta-bundle": "^1.0", - "mouf/nodejs-installer": "~1.0", "php-amqplib/rabbitmq-bundle": "^1.8", "predis/predis": "^1.0", "javibravo/simpleue": "^1.0" @@ -100,8 +98,7 @@ "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", - "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" + "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" ], "post-install-cmd": [ "@post-cmd" -- cgit v1.2.3 From a0a4ce3135565d5d0e362da044e17ce8052bb272 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 11 Oct 2016 18:59:08 +0200 Subject: Lock deps for FOSUser MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We’ll wait until the final release will be out and other related project will be update to support it. Meanwhile we can safely lock to a previous version. --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'composer.json') diff --git a/composer.json b/composer.json index 4f56162e..79de337b 100644 --- a/composer.json +++ b/composer.json @@ -65,9 +65,9 @@ "liip/theme-bundle": "~1.1", "lexik/form-filter-bundle": "~5.0", "j0k3r/graby": "~1.0", - "friendsofsymfony/user-bundle": "~2.0@dev", + "friendsofsymfony/user-bundle": "dev-master#e168ed64629d034cb9cbbffb9d4350f62ef04fab as 2.0.x-dev", "friendsofsymfony/oauth-server-bundle": "^1.5", - "stof/doctrine-extensions-bundle": "^1.2@dev", + "stof/doctrine-extensions-bundle": "^1.2", "scheb/two-factor-bundle": "~2.0", "grandt/phpepub": "~4.0", "wallabag/php-mobi": "~1.0.0", -- cgit v1.2.3