Compare commits

..

1 Commits
2.0.8 ... 2.0.7

Author SHA1 Message Date
76ee8a9ea5 Release wallabag 2.0.7 2016-08-22 11:15:28 +02:00
26 changed files with 115 additions and 368 deletions

View File

@ -54,7 +54,6 @@ matrix:
env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
allow_failures:
- php: hhvm-3.12
- php: 7.1
- php: nightly
# exclude v1 branches

View File

@ -2,24 +2,6 @@
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
## [2.0.8] - 2016-09-07
### Added
- [#2262](https://github.com/wallabag/wallabag/pull/2262) Added a check for the database connection during installation (Jeremy Benoist)
- [#2235](https://github.com/wallabag/wallabag/pull/2235) Added configuration for german documentation website, [available here](http://doc.wallabag.org/de/latest/) (Nicolas Lœuillet)
### Changed
- [graby](https://github.com/j0k3r/graby/releases/tag/1.4.3) Update Graby version, which now handles ZIP files (Jeremy Benoist)
- [#2230](https://github.com/wallabag/wallabag/pull/2230) Changed title display in card view (Danilow Alexandr)
### Fixed
- [#2234](https://github.com/wallabag/wallabag/pull/2234) Fixed mailto link in documentation (Christian Studer)
- [#2241](https://github.com/wallabag/wallabag/pull/2241) Fixed the height of the "Add new article" field in Chrome (Danilow Alexandr)
- [#2238](https://github.com/wallabag/wallabag/pull/2238) Fixed login page in Qupzilla (Danilow Alexandr)
## [2.0.7] - 2016-08-22
### Added

View File

@ -16,7 +16,7 @@ Then you can install wallabag by executing the following commands:
```
git clone https://github.com/wallabag/wallabag.git
cd wallabag
git checkout 2.0.8
git checkout 2.0.7
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=prod
php bin/console server:run --env=prod

View File

@ -30,7 +30,7 @@ framework:
assets: ~
wallabag_core:
version: 2.0.8
version: 2.0.7
paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
languages:
en: 'English'

187
composer.lock generated
View File

@ -626,27 +626,24 @@
},
{
"name": "doctrine/doctrine-migrations-bundle",
"version": "v1.2.0",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineMigrationsBundle.git",
"reference": "0b89ee55bceb53c60bc4ba32924ac5053e377abb"
"reference": "303a576e2124efb07ec215e34ea2480b841cf5e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/0b89ee55bceb53c60bc4ba32924ac5053e377abb",
"reference": "0b89ee55bceb53c60bc4ba32924ac5053e377abb",
"url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/303a576e2124efb07ec215e34ea2480b841cf5e4",
"reference": "303a576e2124efb07ec215e34ea2480b841cf5e4",
"shasum": ""
},
"require": {
"doctrine/doctrine-bundle": "~1.0",
"doctrine/migrations": "^1.1",
"php": ">=5.4.0",
"doctrine/migrations": "~1.0",
"php": ">=5.3.2",
"symfony/framework-bundle": "~2.3|~3.0"
},
"require-dev": {
"phpunit/phpunit": "~4.8"
},
"type": "symfony-bundle",
"extra": {
"branch-alias": {
@ -683,7 +680,7 @@
"migrations",
"schema"
],
"time": "2016-06-30 19:26:35"
"time": "2015-11-04 13:45:30"
},
{
"name": "doctrine/inflector",
@ -1227,12 +1224,12 @@
"source": {
"type": "git",
"url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git",
"reference": "af6bc6bf4ec303be3a82e1f64b0e6ac9e8ff00c7"
"reference": "07ec96d93f03650e7480e0637fcd51eee6575c12"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/af6bc6bf4ec303be3a82e1f64b0e6ac9e8ff00c7",
"reference": "af6bc6bf4ec303be3a82e1f64b0e6ac9e8ff00c7",
"url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/07ec96d93f03650e7480e0637fcd51eee6575c12",
"reference": "07ec96d93f03650e7480e0637fcd51eee6575c12",
"shasum": ""
},
"require": {
@ -1291,20 +1288,20 @@
"keywords": [
"User management"
],
"time": "2016-09-07 09:22:55"
"time": "2016-08-04 10:13:39"
},
{
"name": "gedmo/doctrine-extensions",
"version": "v2.4.22",
"version": "v2.4.21",
"source": {
"type": "git",
"url": "https://github.com/Atlantic18/DoctrineExtensions.git",
"reference": "b8188801bafc420b86908ee5229a5e92143ce514"
"reference": "dcaab46a25e1baeb5142c3e25d5b6fd495ced504"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/b8188801bafc420b86908ee5229a5e92143ce514",
"reference": "b8188801bafc420b86908ee5229a5e92143ce514",
"url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/dcaab46a25e1baeb5142c3e25d5b6fd495ced504",
"reference": "dcaab46a25e1baeb5142c3e25d5b6fd495ced504",
"shasum": ""
},
"require": {
@ -1370,7 +1367,7 @@
"tree",
"uploadable"
],
"time": "2016-08-30 18:42:36"
"time": "2016-08-17 16:52:00"
},
{
"name": "grandt/binstring",
@ -2136,16 +2133,16 @@
},
{
"name": "hoa/math",
"version": "1.16.08.29",
"version": "1.16.05.22",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Math.git",
"reference": "8be67cc378b043ccdd5896a3f1bb276af032f258"
"reference": "f3bcd84f4c6e3ba1c994969bd5163336500f20c8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/hoaproject/Math/zipball/8be67cc378b043ccdd5896a3f1bb276af032f258",
"reference": "8be67cc378b043ccdd5896a3f1bb276af032f258",
"url": "https://api.github.com/repos/hoaproject/Math/zipball/f3bcd84f4c6e3ba1c994969bd5163336500f20c8",
"reference": "f3bcd84f4c6e3ba1c994969bd5163336500f20c8",
"shasum": ""
},
"require": {
@ -2197,7 +2194,7 @@
"sampler",
"set"
],
"time": "2016-08-29 13:29:51"
"time": "2016-05-22 14:07:26"
},
{
"name": "hoa/protocol",
@ -2261,16 +2258,16 @@
},
{
"name": "hoa/regex",
"version": "1.16.09.06",
"version": "1.16.01.15",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Regex.git",
"reference": "2a787a49cc53a9ea009a1997085da9aff091e918"
"reference": "e7fb36fdea23ea9fc814a1a68bd0144df1891463"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/hoaproject/Regex/zipball/2a787a49cc53a9ea009a1997085da9aff091e918",
"reference": "2a787a49cc53a9ea009a1997085da9aff091e918",
"url": "https://api.github.com/repos/hoaproject/Regex/zipball/e7fb36fdea23ea9fc814a1a68bd0144df1891463",
"reference": "e7fb36fdea23ea9fc814a1a68bd0144df1891463",
"shasum": ""
},
"require": {
@ -2313,7 +2310,7 @@
"library",
"regex"
],
"time": "2016-09-06 11:08:23"
"time": "2016-01-14 21:10:33"
},
{
"name": "hoa/ruler",
@ -2375,16 +2372,16 @@
},
{
"name": "hoa/stream",
"version": "1.16.09.06",
"version": "1.16.01.14",
"source": {
"type": "git",
"url": "https://github.com/hoaproject/Stream.git",
"reference": "f8dec80b6ff3b7898a5604d304ecb73f53d04901"
"reference": "c00b35078ef8c0881b7d2ed533de19fe0aaf9896"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/hoaproject/Stream/zipball/f8dec80b6ff3b7898a5604d304ecb73f53d04901",
"reference": "f8dec80b6ff3b7898a5604d304ecb73f53d04901",
"url": "https://api.github.com/repos/hoaproject/Stream/zipball/c00b35078ef8c0881b7d2ed533de19fe0aaf9896",
"reference": "c00b35078ef8c0881b7d2ed533de19fe0aaf9896",
"shasum": ""
},
"require": {
@ -2432,7 +2429,7 @@
"stream",
"wrapper"
],
"time": "2016-09-06 11:14:23"
"time": "2016-01-14 20:11:37"
},
{
"name": "hoa/ustring",
@ -2603,16 +2600,16 @@
},
{
"name": "htmlawed/htmlawed",
"version": "1.1.22",
"version": "1.1.19",
"source": {
"type": "git",
"url": "https://github.com/kesar/HTMLawed.git",
"reference": "b270453ba016ee4c6dae585f047d1e4f3cc456a1"
"reference": "620c38edd57e680260ebd8dd0e98167d97e9a7bf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/kesar/HTMLawed/zipball/b270453ba016ee4c6dae585f047d1e4f3cc456a1",
"reference": "b270453ba016ee4c6dae585f047d1e4f3cc456a1",
"url": "https://api.github.com/repos/kesar/HTMLawed/zipball/620c38edd57e680260ebd8dd0e98167d97e9a7bf",
"reference": "620c38edd57e680260ebd8dd0e98167d97e9a7bf",
"shasum": ""
},
"require": {
@ -2636,7 +2633,7 @@
"role": "Developer"
}
],
"description": "htmLawed - Process text with HTML markup to make it more compliant with HTML standards and administrative policies",
"description": "htmLawed - Process text with HTML markup to make it more compliant with HTML standards and administrative policies",
"homepage": "http://www.bioinformatics.org/phplabware/internal_utilities/htmLawed/",
"keywords": [
"HTMLtidy",
@ -2645,7 +2642,7 @@
"strip",
"tags"
],
"time": "2016-08-27 18:53:27"
"time": "2015-04-05 17:23:05"
},
{
"name": "incenteev/composer-parameter-handler",
@ -2700,16 +2697,16 @@
},
{
"name": "j0k3r/graby",
"version": "1.4.3",
"version": "1.4.2",
"source": {
"type": "git",
"url": "https://github.com/j0k3r/graby.git",
"reference": "8dbc799fac49d9c949a10c61e16cfec120c8dba9"
"reference": "f8ff3e4449fbee1681461550c48dc41efff833c0"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/j0k3r/graby/zipball/8dbc799fac49d9c949a10c61e16cfec120c8dba9",
"reference": "8dbc799fac49d9c949a10c61e16cfec120c8dba9",
"url": "https://api.github.com/repos/j0k3r/graby/zipball/f8ff3e4449fbee1681461550c48dc41efff833c0",
"reference": "f8ff3e4449fbee1681461550c48dc41efff833c0",
"shasum": ""
},
"require": {
@ -2753,20 +2750,20 @@
}
],
"description": "Graby helps you extract article content from web pages",
"time": "2016-09-07 09:28:22"
"time": "2016-07-25 05:12:39"
},
{
"name": "j0k3r/graby-site-config",
"version": "1.0.23",
"version": "1.0.21",
"source": {
"type": "git",
"url": "https://github.com/j0k3r/graby-site-config.git",
"reference": "5db870f5dd880d19bc9330388d97ce43c8ed18fc"
"reference": "7db8e98e7e6dd80bf286100e1e5121dd64674805"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/5db870f5dd880d19bc9330388d97ce43c8ed18fc",
"reference": "5db870f5dd880d19bc9330388d97ce43c8ed18fc",
"url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/7db8e98e7e6dd80bf286100e1e5121dd64674805",
"reference": "7db8e98e7e6dd80bf286100e1e5121dd64674805",
"shasum": ""
},
"require": {
@ -2789,7 +2786,7 @@
}
],
"description": "Graby site config files",
"time": "2016-09-07 10:00:08"
"time": "2016-08-01 09:26:59"
},
{
"name": "j0k3r/php-readability",
@ -3048,16 +3045,16 @@
},
{
"name": "jms/serializer",
"version": "1.3.1",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/schmittjoh/serializer.git",
"reference": "705d0b4633b9c44e6253aa18306b3972282cd3a3"
"reference": "03dd41f40c7d9dd1eaf0d59c8e31a18f73c3c684"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/schmittjoh/serializer/zipball/705d0b4633b9c44e6253aa18306b3972282cd3a3",
"reference": "705d0b4633b9c44e6253aa18306b3972282cd3a3",
"url": "https://api.github.com/repos/schmittjoh/serializer/zipball/03dd41f40c7d9dd1eaf0d59c8e31a18f73c3c684",
"reference": "03dd41f40c7d9dd1eaf0d59c8e31a18f73c3c684",
"shasum": ""
},
"require": {
@ -3091,7 +3088,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3-dev"
"dev-master": "1.2-dev"
}
},
"autoload": {
@ -3118,7 +3115,7 @@
"serialization",
"xml"
],
"time": "2016-08-23 17:20:24"
"time": "2016-08-17 17:28:49"
},
{
"name": "jms/serializer-bundle",
@ -4416,16 +4413,16 @@
},
{
"name": "scheb/two-factor-bundle",
"version": "v2.8.0",
"version": "v2.6.2",
"source": {
"type": "git",
"url": "https://github.com/scheb/two-factor-bundle.git",
"reference": "db77c00349d3679eac024a5295c3faa4a7605c55"
"reference": "bc768b49a411aee2a4bbaf84cf796d2916c56537"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/db77c00349d3679eac024a5295c3faa4a7605c55",
"reference": "db77c00349d3679eac024a5295c3faa4a7605c55",
"url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/bc768b49a411aee2a4bbaf84cf796d2916c56537",
"reference": "bc768b49a411aee2a4bbaf84cf796d2916c56537",
"shasum": ""
},
"require": {
@ -4466,20 +4463,20 @@
"two-factor",
"two-step"
],
"time": "2016-09-05 19:03:16"
"time": "2016-08-17 19:30:36"
},
{
"name": "sensio/distribution-bundle",
"version": "v5.0.9",
"version": "v5.0.8",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
"reference": "e5e0d8d06b07864b2752bd865537b0817edf4c5a"
"reference": "f8ace5c71ee309492b027ef71215577f5a52b4ea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/e5e0d8d06b07864b2752bd865537b0817edf4c5a",
"reference": "e5e0d8d06b07864b2752bd865537b0817edf4c5a",
"url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/f8ace5c71ee309492b027ef71215577f5a52b4ea",
"reference": "f8ace5c71ee309492b027ef71215577f5a52b4ea",
"shasum": ""
},
"require": {
@ -4518,7 +4515,7 @@
"configuration",
"distribution"
],
"time": "2016-09-06 01:05:01"
"time": "2016-08-17 18:16:49"
},
{
"name": "sensio/framework-extra-bundle",
@ -5360,16 +5357,16 @@
},
{
"name": "symfony/symfony",
"version": "v3.1.4",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
"reference": "65ca9e4fbdb34f6d463ef77898ca583b101a4162"
"reference": "4478f047409028dc6e3ab320590f1247fec7a850"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/symfony/zipball/65ca9e4fbdb34f6d463ef77898ca583b101a4162",
"reference": "65ca9e4fbdb34f6d463ef77898ca583b101a4162",
"url": "https://api.github.com/repos/symfony/symfony/zipball/4478f047409028dc6e3ab320590f1247fec7a850",
"reference": "4478f047409028dc6e3ab320590f1247fec7a850",
"shasum": ""
},
"require": {
@ -5388,9 +5385,6 @@
"phpdocumentor/reflection-docblock": "<3.0",
"phpdocumentor/type-resolver": "<0.2.0"
},
"provide": {
"psr/cache-implementation": "1.0"
},
"replace": {
"symfony/asset": "self.version",
"symfony/browser-kit": "self.version",
@ -5412,7 +5406,6 @@
"symfony/framework-bundle": "self.version",
"symfony/http-foundation": "self.version",
"symfony/http-kernel": "self.version",
"symfony/inflector": "self.version",
"symfony/intl": "self.version",
"symfony/ldap": "self.version",
"symfony/monolog-bridge": "self.version",
@ -5496,7 +5489,7 @@
"keywords": [
"framework"
],
"time": "2016-09-03 15:28:43"
"time": "2016-07-30 09:31:00"
},
{
"name": "tecnickcom/tcpdf",
@ -5661,16 +5654,16 @@
},
{
"name": "twig/twig",
"version": "v1.24.2",
"version": "v1.24.1",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7"
"reference": "3566d311a92aae4deec6e48682dc5a4528c4a512"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/33093f6e310e6976baeac7b14f3a6ec02f2d79b7",
"reference": "33093f6e310e6976baeac7b14f3a6ec02f2d79b7",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512",
"reference": "3566d311a92aae4deec6e48682dc5a4528c4a512",
"shasum": ""
},
"require": {
@ -5718,7 +5711,7 @@
"keywords": [
"templating"
],
"time": "2016-09-01 17:50:53"
"time": "2016-05-30 09:11:59"
},
{
"name": "wallabag/php-mobi",
@ -5875,7 +5868,7 @@
"email": "adrien.brault@gmail.com"
},
{
"name": "William DURAND",
"name": "William Durand",
"email": "william.durand1@gmail.com"
}
],
@ -5925,7 +5918,7 @@
],
"authors": [
{
"name": "William DURAND",
"name": "William Durand",
"email": "william.durand1@gmail.com"
}
],
@ -6249,16 +6242,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
"version": "v1.12.1",
"version": "v1.12.0",
"source": {
"type": "git",
"url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
"reference": "d33ee60f3d3e6152888b7f3a385f49e5c43bf1bf"
"reference": "ddac737e1c06a310a0bb4b3da755a094a31a916a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/d33ee60f3d3e6152888b7f3a385f49e5c43bf1bf",
"reference": "d33ee60f3d3e6152888b7f3a385f49e5c43bf1bf",
"url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/ddac737e1c06a310a0bb4b3da755a094a31a916a",
"reference": "ddac737e1c06a310a0bb4b3da755a094a31a916a",
"shasum": ""
},
"require": {
@ -6303,7 +6296,7 @@
}
],
"description": "A tool to automatically fix PHP code style",
"time": "2016-09-07 06:48:24"
"time": "2016-08-17 00:17:27"
},
{
"name": "phpdocumentor/reflection-common",
@ -7258,16 +7251,16 @@
},
{
"name": "sensio/generator-bundle",
"version": "v3.0.8",
"version": "v3.0.7",
"source": {
"type": "git",
"url": "https://github.com/sensiolabs/SensioGeneratorBundle.git",
"reference": "3c20d16512f37d2be159eca0411b99a141b90fa4"
"reference": "d1be460925376703a470a3ac6ec034eb7eab3892"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/3c20d16512f37d2be159eca0411b99a141b90fa4",
"reference": "3c20d16512f37d2be159eca0411b99a141b90fa4",
"url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/d1be460925376703a470a3ac6ec034eb7eab3892",
"reference": "d1be460925376703a470a3ac6ec034eb7eab3892",
"shasum": ""
},
"require": {
@ -7306,20 +7299,20 @@
}
],
"description": "This bundle generates code for you",
"time": "2016-09-06 01:30:19"
"time": "2016-06-20 05:58:05"
},
{
"name": "symfony/phpunit-bridge",
"version": "v3.1.4",
"version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9"
"reference": "eeb3bf9a195df7552fdda46f4724a9442d157413"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/1f4e2059cf4ecae1053b9c3027b3fc548fd077b9",
"reference": "1f4e2059cf4ecae1053b9c3027b3fc548fd077b9",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/eeb3bf9a195df7552fdda46f4724a9442d157413",
"reference": "eeb3bf9a195df7552fdda46f4724a9442d157413",
"shasum": ""
},
"require": {
@ -7361,7 +7354,7 @@
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
"time": "2016-08-19 06:48:39"
"time": "2016-06-29 05:42:25"
},
{
"name": "webmozart/assert",

View File

@ -1,55 +0,0 @@
# -*- coding: utf-8 -*-
#
# wallabag documentation build configuration file, created by
# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
import sys
import os
extensions = []
templates_path = ['_templates']
source_suffix = '.rst'
master_doc = 'index'
project = u'wallabag-fr'
copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
version = '2.0.0'
release = version
exclude_patterns = ['_build']
pygments_style = 'sphinx'
html_theme = 'default'
html_static_path = ['_static']
htmlhelp_basename = 'wallabagdedoc'
latex_elements = {
}
latex_documents = [
('index', 'wallabag-de.tex', u'wallabag Documentation',
u'Nicolas Lœuillet', 'manual'),
]
man_pages = [
('index', 'wallabagde', u'wallabag Documentation',
[u'Nicolas Lœuillet'], 1)
]
texinfo_documents = [
('index', 'wallabag', u'wallabag Documentation',
u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
'Miscellaneous'),
]
##### Guzzle sphinx theme
import guzzle_sphinx_theme
html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
html_theme_path = guzzle_sphinx_theme.html_theme_path()
html_theme = 'guzzle_sphinx_theme'
# Custom sidebar templates, maps document names to template names.
html_sidebars = {
'**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
}
# Register the theme as an extension to generate a sitemap.xml
extensions.append("guzzle_sphinx_theme")

View File

@ -1,2 +0,0 @@
Sphinx>=1.3.0,<1.4.0
guzzle_sphinx_theme>=0.7.0,<0.8.0

View File

@ -12,7 +12,7 @@ Das kann verschiedene Ursachen haben:
Wie kann ich helfen das zu beheben?
-----------------------------------
- `indem du uns eine Mail mit der URL des Artikels sendest <mailto:hello@wallabag.org>`_
- `indem du uns eine Mail mit der URL des Artikels sendest <mailto:hello\@wallabag.org>`_
- indem du versuchst das Laden des Artikels durch Erstellen einer Datei für den Artikel
selbst zu beheben
Du kannst `dieses Tool <http://siteconfig.fivefilters.org/>`__ nutzen.

View File

@ -54,7 +54,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen:
git clone https://github.com/wallabag/wallabag.git
cd wallabag
git checkout 2.0.8
git checkout 2.0.7
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=prod
@ -86,8 +86,6 @@ Führe dieses Kommando aus, um das neueste Paket herunterzuladen und zu entpacke
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
(md5 hash: ``18aadd1003a08eb11f5341b9755029f8``)
Jetzt lese die Dokumentation, um einen Virtualhost zu erstellen, dann greife auf dein wallabag zu.
Wenn du die Datenbankkonfiguration eingestellt hast, MySQL oder PostgreSQL zu nutzen, musst du einen Nutzer über das folgende Kommando erstellen ``php bin/console wallabag:install --env=prod``.

View File

@ -4,13 +4,13 @@ Wallabag updaten
Update auf einem dedizierten Webserver
--------------------------------------
Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.0.8`` mit der neuesten Releasenummer):
Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.0.3`` mit der neuesten Releasenummer):
::
git fetch origin
git fetch --tags
git checkout 2.0.8
git checkout 2.0.3
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console cache:clear --env=prod
@ -25,8 +25,6 @@ Lade das neueste Release von wallabag herunter:
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
(md5 hash: ``18aadd1003a08eb11f5341b9755029f8``)
Entpacke das Archiv in deinen wallabag Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei.
Wenn du SQLite nutzt, musst auch das ``data/`` Verzeichnis in die neue Installation kopieren.

View File

@ -12,7 +12,7 @@ There may be several reasons:
How can I help to fix that?
---------------------------
- `by sending us an email with the article's URL <mailto:hello@wallabag.org>`_
- `by sending us an email with the article's URL <mailto:hello\@wallabag.org>`_
- by trying to fix this article by yourself :) by creating a file for the article.
You can use `this tool <http://siteconfig.fivefilters.org/>`__.

View File

@ -53,7 +53,7 @@ To install wallabag itself, you must run the following commands:
git clone https://github.com/wallabag/wallabag.git
cd wallabag
git checkout 2.0.8
git checkout 2.0.7
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=prod
@ -85,8 +85,6 @@ Execute this command to download and extract the latest package:
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
(md5 hash of the package: ``18aadd1003a08eb11f5341b9755029f8``)
Now, read the following documentation to create your virtual host, then access your wallabag.
If you changed the database configuration to use MySQL or PostgreSQL, you need to create a user via this command ``php bin/console wallabag:install --env=prod``.

View File

@ -4,29 +4,27 @@ Upgrade wallabag
Upgrade on a dedicated web server
---------------------------------
The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.0.8`` by the last release number):
The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.0.3`` by the last release number):
::
git fetch origin
git fetch --tags
git checkout 2.0.8
git checkout 2.0.3
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console cache:clear --env=prod
Upgrade on a shared hosting
Upgrade on a shared hosting
---------------------------
Backup your ``app/config/parameters.yml`` file.
Download the last release of wallabag:
Download the last release of wallabag:
.. code-block:: bash
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
(md5 hash of the package: ``18aadd1003a08eb11f5341b9755029f8``)
Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours.
If you use SQLite, you must also copy your ``data/`` folder inside the new installation.

View File

@ -12,7 +12,7 @@ Il peut y avoir plusieurs raisons :
Comment puis-je aider pour réparer ça ?
---------------------------------------
- `en nous envoyant un email avec l'URL de l'article <mailto:hello@wallabag.org>`_
- `en nous envoyant un email avec l'URL de l'article <mailto:hello\@wallabag.org>`_
- en essayant de réparer cet article par vous-même :) en créant un fichier pour l'article.
Vous pouvez utiliser `cet outil <http://siteconfig.fivefilters.org/>`__.

View File

@ -51,7 +51,7 @@ Pour installer wallabag, vous devez exécuter ces deux commandes :
git clone https://github.com/wallabag/wallabag.git
cd wallabag
git checkout 2.0.8
git checkout 2.0.7
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=prod
@ -82,8 +82,6 @@ Exécutez cette commande pour télécharger et décompresser l'archive :
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
(hash md5 de l'archive : ``18aadd1003a08eb11f5341b9755029f8``)
Maintenant, lisez la documentation ci-dessous pour crééer un virtual host. Accédez ensuite à votre installation de wallabag.
Si vous avez changé la configuration pour modifier le type de stockage (MySQL ou PostgreSQL), vous devrez vous créer un utilisateur via la commande ``php bin/console wallabag:install --env=prod``.

View File

@ -4,13 +4,13 @@ Mettre à jour wallabag
Mise à jour sur un serveur dédié
--------------------------------
La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.0.8`` par le numéro de la dernière version) :
La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.0.3`` par le numéro de la dernière version) :
::
git fetch origin
git fetch --tags
git checkout 2.0.8
git checkout 2.0.3
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console cache:clear --env=prod
@ -19,14 +19,12 @@ Mise à jour sur un hébergement mutualisé
Effectuez une sauvegarde du fichier ``app/config/parameters.yml``.
Téléchargez la dernière version de wallabag :
Téléchargez la dernière version de wallabag :
.. code-block:: bash
wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package
(hash md5 de l'archive : ``18aadd1003a08eb11f5341b9755029f8``)
Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre.
Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``.

View File

@ -72,10 +72,8 @@ class InstallCommand extends ContainerAwareCommand
{
$this->defaultOutput->writeln('<info><comment>Step 1 of 5.</comment> Checking system requirements.</info>');
$rows = [];
// testing if database driver exists
$fulfilled = true;
$label = '<comment>PDO Driver</comment>';
$status = '<info>OK!</info>';
$help = '';
@ -86,23 +84,7 @@ class InstallCommand extends ContainerAwareCommand
$help = 'Database driver "'.$this->getContainer()->getParameter('database_driver').'" is not installed.';
}
$rows[] = [$label, $status, $help];
// testing if connection to the database can be etablished
$label = '<comment>Database connection</comment>';
$status = '<info>OK!</info>';
$help = '';
try {
$this->getContainer()->get('doctrine')->getManager()->getConnection()->connect();
} catch (\Exception $e) {
if (false === strpos($e->getMessage(), 'Unknown database')) {
$fulfilled = false;
$status = '<error>ERROR!</error>';
$help = 'Can\'t connect to the database: '.$e->getMessage();
}
}
$rows = [];
$rows[] = [$label, $status, $help];
foreach ($this->functionExists as $functionRequired) {
@ -474,7 +456,7 @@ class InstallCommand extends ContainerAwareCommand
}
// custom verification for sqlite, since `getListDatabasesSQL` doesn't work for sqlite
if ('sqlite' === $schemaManager->getDatabasePlatform()->getName()) {
if ('sqlite' == $schemaManager->getDatabasePlatform()->getName()) {
$params = $this->getContainer()->get('doctrine.dbal.default_connection')->getParams();
if (isset($params['path']) && file_exists($params['path'])) {

View File

@ -52,7 +52,6 @@ body {
body.login main {
padding: 0;
min-height: 100vh;
}
.border-bottom {
@ -207,10 +206,6 @@ nav input {
display: none;
}
.input-field.nav-panel-add, .input-field.nav-panel-add form {
height: 100%;
}
/* ==========================================================================
2 = Side-nav
========================================================================== */
@ -290,12 +285,6 @@ main ul.row {
.card .card-content .card-title {
line-height: 32px;
max-height: 64px;
display: block;
}
.card .card-content i.right, .card .card-reveal i.right {
margin-left: 0;
}
.card .card-content .estimatedTime {

View File

@ -1,103 +0,0 @@
/*
* jQuery tinydot 0.2.0
*
* Copyright (c) Alexander Danilov
* modos189.ru
*
* Plugin website:
* tinydot.modos189.ru
*
* Licensed under the MIT license.
* http://en.wikipedia.org/wiki/MIT_License
*/
(function( $, undef )
{
if ( $.fn.tinydot )
{
return;
}
$.fn.tinydot = function( o ) {
var $dot = this;
$dot.child = getChildOrDie($dot);
$dot.orgContent = $($dot.child).html();
ellipsis( $dot );
$dot.watch = function()
{
$(window).on('resize', function(){
if ( watchInt )
{
clearInterval( watchInt );
}
watchInt = setTimeout(
function()
{
reinitialize($dot);
}, 100
);
});
return $dot;
};
var opts = $.extend( true, {}, $.fn.tinydot.defaults, o ),
watchInt = null;
if ( opts.watch )
{
$dot.watch();
}
}
// public
$.fn.tinydot.defaults = {
'watch' : false
};
function getChildOrDie( $elem )
{
var childrens = $elem.children();
if (childrens.length == 0) {
// create children
var data = $($elem).html();
$elem.html('');
$elem.append('<span />');
return $elem.children('span').html(data);
} else {
return childrens[0];
}
}
function reinitialize( $elem )
{
$($elem.child).html($elem.orgContent);
ellipsis( $elem );
}
function ellipsis( $elem ) {
var divh=$($elem).height();
while ($($elem.child).outerHeight()>divh) {
$($elem.child).html(function (index, html) {
return html.replace(/\W*\s(\S)*$/, '...');
});
}
}
})( jQuery );
jQuery(document).ready(function($) {
//We only invoke jQuery.tinydot on elements that have dot-ellipsis class
$(".dot-ellipsis").each(function(){
//Checking if update on window resize required
var watch_window=$(this).hasClass("dot-resize-update");
//Invoking jQuery.tinydot
var x = new Object();
if (watch_window)
x.watch='window';
$(this).tinydot(x);
});
});

View File

@ -1 +0,0 @@
!function(a,b){function c(b){var c=b.children();if(0==c.length){var d=a(b).html();return b.html(""),b.append("<span />"),b.children("span").html(d)}return c[0]}function d(b){a(b.child).html(b.orgContent),e(b)}function e(b){for(var c=a(b).height();a(b.child).outerHeight()>c;)a(b.child).html(function(a,b){return b.replace(/\W*\s(\S)*$/,"...")})}a.fn.tinydot||(a.fn.tinydot=function(b){var f=this;f.child=c(f),f.orgContent=a(f.child).html(),e(f),f.watch=function(){return a(window).on("resize",function(){h&&clearInterval(h),h=setTimeout(function(){d(f)},100)}),f};var g=a.extend(!0,{},a.fn.tinydot.defaults,b),h=null;g.watch&&f.watch()},a.fn.tinydot.defaults={watch:!1})}(jQuery),jQuery(document).ready(function(a){a(".dot-ellipsis").each(function(){var b=a(this).hasClass("dot-resize-update"),c=new Object;b&&(c.watch="window"),a(this).tinydot(c)})});

View File

@ -35,7 +35,7 @@
<i class="card-title grey-text text-darken-4 activator mdi-navigation-more-horiz right"></i>
{% endif %}
<span class="card-title dot-ellipsis dot-resize-update"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|raw }}</a></span>
<span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|slice(0, 42)|raw }}</a></span>
<div class="estimatedTime grey-text">
<span class="tool reading-time">

View File

@ -11,7 +11,6 @@
{% block scripts %}
{{ parent() }}
<script src="{{ asset('bundles/wallabagcore/themes/material/js/jquery.tinydot.min.js') }}"></script>
<script src="{{ asset('bundles/wallabagcore/themes/material/js/materialize.min.js') }}"></script>
<script src="{{ asset('bundles/wallabagcore/themes/material/js/init.js') }}"></script>
{% endblock %}

View File

@ -1,11 +0,0 @@
# Two factor mail
auth_code:
on: 'sus'
mailer:
subject: "Còdi d'autentificacion wallabag"
body:
hello: "Bonjorn %user%,"
first_para: "Estant qu'avètz activat la dobla autentificacion sus vòtre compte wallabag e que venètz de vos conectar dempuèi un novèl aparelh (ordinador, mobil, etc.) vos mandem un còdi per validar la connexion."
second_para: "Vaquí lo còdi a dintrar :"
support: "S'avètz un problèma de connexion, dobtetz pas a contacter l'assisténcia : "
signature: "La còla de wallabag"

View File

@ -39,7 +39,7 @@
<i class="mdi-content-send right"></i>
</button>
</div>
<div class="row center">
<div class="center">
<a href="{{ path('fos_user_resetting_request') }}">{{ 'security.login.forgot_password'|trans }}</a>
</div>
</form>

View File

@ -127,12 +127,6 @@ class InstallCommandTest extends WallabagCoreTestCase
public function testRunInstallCommandWithDatabaseRemoved()
{
// skipped SQLite check when database is removed because while testing for the connection,
// the driver will create the file (so the database) before testing if database exist
if ($this->getClient()->getContainer()->get('doctrine')->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
$this->markTestSkipped('SQLite spotted: can\'t test with database removed.');
}
$application = new Application($this->getClient()->getKernel());
$application->add(new DropDatabaseDoctrineCommand());

View File

@ -681,17 +681,10 @@ class SymfonyRequirements extends RequirementCollection
if (class_exists('Symfony\Component\Intl\Intl')) {
$this->addRecommendation(
\Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion(),
sprintf('intl ICU version installed on your system is outdated (%s) and does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
'To get the latest internationalization data upgrade the ICU system package and the intl PHP extension.'
\Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(),
sprintf('intl ICU version installed on your system (%s) should match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
'In most cases you should be fine, but please verify there is no inconsistencies between data provided by Symfony and the intl extension. See https://github.com/symfony/symfony/issues/15007 for an example of inconsistencies you might run into.'
);
if (\Symfony\Component\Intl\Intl::getIcuDataVersion() <= \Symfony\Component\Intl\Intl::getIcuVersion()) {
$this->addRecommendation(
\Symfony\Component\Intl\Intl::getIcuDataVersion() === \Symfony\Component\Intl\Intl::getIcuVersion(),
sprintf('intl ICU version installed on your system (%s) does not match the ICU data bundled with Symfony (%s)', \Symfony\Component\Intl\Intl::getIcuVersion(), \Symfony\Component\Intl\Intl::getIcuDataVersion()),
'To avoid internationalization data incosistencies upgrade the symfony/intl component.'
);
}
}
$this->addPhpIniRecommendation(