diff options
-rw-r--r-- | .travis.yml | 2 | ||||
-rw-r--r-- | composer.json | 5 | ||||
-rw-r--r-- | docs/de/user/upgrade-2.0.x-2.1.y.rst | 2 | ||||
-rw-r--r-- | docs/en/user/installation.rst | 2 | ||||
-rw-r--r-- | docs/en/user/upgrade-2.0.x-2.1.y.rst | 2 | ||||
-rw-r--r-- | docs/fr/user/installation.rst | 2 | ||||
-rw-r--r-- | docs/fr/user/upgrade-2.0.x-2.1.y.rst | 2 |
7 files changed, 7 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index f1334f52..c7bb05fb 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -62,7 +62,7 @@ before_script: | |||
62 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; | 62 | - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; |
63 | 63 | ||
64 | install: | 64 | install: |
65 | - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; | 65 | - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi; |
66 | - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi; | 66 | - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi; |
67 | - if [[ $ASSETS = build ]]; then npm install; fi; | 67 | - if [[ $ASSETS = build ]]; then npm install; fi; |
68 | 68 | ||
diff --git a/composer.json b/composer.json index 8220ed45..4f56162e 100644 --- a/composer.json +++ b/composer.json | |||
@@ -63,7 +63,6 @@ | |||
63 | "willdurand/hateoas-bundle": "~1.0", | 63 | "willdurand/hateoas-bundle": "~1.0", |
64 | "htmlawed/htmlawed": "~1.1.19", | 64 | "htmlawed/htmlawed": "~1.1.19", |
65 | "liip/theme-bundle": "~1.1", | 65 | "liip/theme-bundle": "~1.1", |
66 | "pagerfanta/pagerfanta": "~1.0.3", | ||
67 | "lexik/form-filter-bundle": "~5.0", | 66 | "lexik/form-filter-bundle": "~5.0", |
68 | "j0k3r/graby": "~1.0", | 67 | "j0k3r/graby": "~1.0", |
69 | "friendsofsymfony/user-bundle": "~2.0@dev", | 68 | "friendsofsymfony/user-bundle": "~2.0@dev", |
@@ -81,7 +80,6 @@ | |||
81 | "lexik/maintenance-bundle": "~2.1", | 80 | "lexik/maintenance-bundle": "~2.1", |
82 | "ocramius/proxy-manager": "1.*", | 81 | "ocramius/proxy-manager": "1.*", |
83 | "white-october/pagerfanta-bundle": "^1.0", | 82 | "white-october/pagerfanta-bundle": "^1.0", |
84 | "mouf/nodejs-installer": "~1.0", | ||
85 | "php-amqplib/rabbitmq-bundle": "^1.8", | 83 | "php-amqplib/rabbitmq-bundle": "^1.8", |
86 | "predis/predis": "^1.0", | 84 | "predis/predis": "^1.0", |
87 | "javibravo/simpleue": "^1.0" | 85 | "javibravo/simpleue": "^1.0" |
@@ -100,8 +98,7 @@ | |||
100 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", | 98 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", |
101 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", | 99 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", |
102 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", | 100 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", |
103 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", | 101 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" |
104 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget" | ||
105 | ], | 102 | ], |
106 | "post-install-cmd": [ | 103 | "post-install-cmd": [ |
107 | "@post-cmd" | 104 | "@post-cmd" |
diff --git a/docs/de/user/upgrade-2.0.x-2.1.y.rst b/docs/de/user/upgrade-2.0.x-2.1.y.rst index a30488f8..eee50fe4 100644 --- a/docs/de/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/de/user/upgrade-2.0.x-2.1.y.rst | |||
@@ -30,7 +30,7 @@ Lade das neueste Release von wallabag herunter: | |||
30 | 30 | ||
31 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package | 31 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package |
32 | 32 | ||
33 | (md5 hash: ``6c33520e29cc754b687f9cee0398dede``) | 33 | (2.1.1 md5 hash: ``9584a3b60a2b2a4de87f536548caac93``) |
34 | 34 | ||
35 | Entpacke das Archiv in deinen wallabag-Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei. | 35 | Entpacke das Archiv in deinen wallabag-Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei. |
36 | 36 | ||
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index bab8f0a5..4aaabd82 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst | |||
@@ -86,7 +86,7 @@ Execute this command to download and extract the latest package: | |||
86 | 86 | ||
87 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package | 87 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package |
88 | 88 | ||
89 | (md5 hash of the 2.1.0 package: ``6c33520e29cc754b687f9cee0398dede``) | 89 | (md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``) |
90 | 90 | ||
91 | Now, read the following documentation to create your virtual host, then access your wallabag. | 91 | Now, read the following documentation to create your virtual host, then access your wallabag. |
92 | 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``. | 92 | 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``. |
diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst index 649ab6ca..ec353a18 100644 --- a/docs/en/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst | |||
@@ -30,7 +30,7 @@ Download the last release of wallabag: | |||
30 | 30 | ||
31 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package | 31 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package |
32 | 32 | ||
33 | (md5 hash of the 2.1.0 package: ``6c33520e29cc754b687f9cee0398dede``) | 33 | (md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``) |
34 | 34 | ||
35 | Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. | 35 | Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. |
36 | 36 | ||
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index fecdea0f..9dd39af7 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst | |||
@@ -83,7 +83,7 @@ Exécutez cette commande pour télécharger et décompresser l'archive : | |||
83 | 83 | ||
84 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package | 84 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package |
85 | 85 | ||
86 | (hash md5 de l'archive 2.1.0 : ``6c33520e29cc754b687f9cee0398dede``) | 86 | (hash md5 de l'archive 2.1.1 : ``9584a3b60a2b2a4de87f536548caac93``) |
87 | 87 | ||
88 | Maintenant, lisez la documentation ci-dessous pour crééer un virtual host. Accédez ensuite à votre installation de wallabag. | 88 | Maintenant, lisez la documentation ci-dessous pour crééer un virtual host. Accédez ensuite à votre installation de wallabag. |
89 | 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``. | 89 | 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``. |
diff --git a/docs/fr/user/upgrade-2.0.x-2.1.y.rst b/docs/fr/user/upgrade-2.0.x-2.1.y.rst index 42136212..952fa737 100644 --- a/docs/fr/user/upgrade-2.0.x-2.1.y.rst +++ b/docs/fr/user/upgrade-2.0.x-2.1.y.rst | |||
@@ -30,7 +30,7 @@ Téléchargez la dernière version de wallabag : | |||
30 | 30 | ||
31 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package | 31 | wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package |
32 | 32 | ||
33 | (hash md5 de l'archive 2.1.0 : ``6c33520e29cc754b687f9cee0398dede``) | 33 | (hash md5 de l'archive 2.1.1 : ``9584a3b60a2b2a4de87f536548caac93``) |
34 | 34 | ||
35 | Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. | 35 | Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. |
36 | 36 | ||