aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2016-07-20 11:38:55 +0200
committerGitHub <noreply@github.com>2016-07-20 11:38:55 +0200
commit317fc6e684356b645ea1327c2631c7d5fc193ddd (patch)
tree9168c70fb714f99fb7db22745c7eecc1012296b9
parent0dc09439efeb01e8c56d3417922aa8fccce01ead (diff)
parent8d8d48a2bbdb5db61a210e123d99515ca4a9f52a (diff)
downloadwallabag-317fc6e684356b645ea1327c2631c7d5fc193ddd.tar.gz
wallabag-317fc6e684356b645ea1327c2631c7d5fc193ddd.tar.zst
wallabag-317fc6e684356b645ea1327c2631c7d5fc193ddd.zip
Merge pull request #2195 from wallabag/remove-bin
Remove binary from repo
-rw-r--r--.gitignore3
-rw-r--r--README.md2
l---------bin/doctrine1
l---------bin/doctrine-dbal1
l---------bin/doctrine-migrations1
l---------bin/doctrine.php1
l---------bin/php-cs-fixer1
l---------bin/security-checker1
-rw-r--r--docs/en/user/installation.rst2
-rw-r--r--docs/fr/user/installation.rst2
10 files changed, 6 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index 02e921f8..f596c7b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,9 @@
10/var/sessions/* 10/var/sessions/*
11!var/sessions/.gitkeep 11!var/sessions/.gitkeep
12!var/SymfonyRequirements.php 12!var/SymfonyRequirements.php
13/bin/*
14!/bin/console
15!/bin/symfony_requirements
13 16
14# Parameters 17# Parameters
15/app/config/parameters.yml 18/app/config/parameters.yml
diff --git a/README.md b/README.md
index 2a7b54bf..0d87d7bb 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ More informations on our website: [wallabag.org](https://wallabag.org)
10 10
11# Install wallabag 11# Install wallabag
12 12
13If you don't have it yet, please [install composer](https://getcomposer.org/download/). 13If you don't have it yet, please [install composer](https://getcomposer.org/download/) or be sure to use Composer 1.2 (`composer selfupdate` can help you about that).
14Then you can install wallabag by executing the following commands: 14Then you can install wallabag by executing the following commands:
15 15
16``` 16```
diff --git a/bin/doctrine b/bin/doctrine
deleted file mode 120000
index 0f72e36f..00000000
--- a/bin/doctrine
+++ /dev/null
@@ -1 +0,0 @@
1../vendor/doctrine/orm/bin/doctrine \ No newline at end of file
diff --git a/bin/doctrine-dbal b/bin/doctrine-dbal
deleted file mode 120000
index 110e93c5..00000000
--- a/bin/doctrine-dbal
+++ /dev/null
@@ -1 +0,0 @@
1../vendor/doctrine/dbal/bin/doctrine-dbal \ No newline at end of file
diff --git a/bin/doctrine-migrations b/bin/doctrine-migrations
deleted file mode 120000
index 7184da71..00000000
--- a/bin/doctrine-migrations
+++ /dev/null
@@ -1 +0,0 @@
1../vendor/doctrine/migrations/bin/doctrine-migrations \ No newline at end of file
diff --git a/bin/doctrine.php b/bin/doctrine.php
deleted file mode 120000
index b22b74da..00000000
--- a/bin/doctrine.php
+++ /dev/null
@@ -1 +0,0 @@
1../vendor/doctrine/orm/bin/doctrine.php \ No newline at end of file
diff --git a/bin/php-cs-fixer b/bin/php-cs-fixer
deleted file mode 120000
index 4d771203..00000000
--- a/bin/php-cs-fixer
+++ /dev/null
@@ -1 +0,0 @@
1../vendor/friendsofphp/php-cs-fixer/php-cs-fixer \ No newline at end of file
diff --git a/bin/security-checker b/bin/security-checker
deleted file mode 120000
index 85f6e8ed..00000000
--- a/bin/security-checker
+++ /dev/null
@@ -1 +0,0 @@
1../vendor/sensiolabs/security-checker/security-checker \ No newline at end of file
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 58d9fb7e..bd3095e0 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -37,7 +37,7 @@ Installation
37On a dedicated web server (recommended way) 37On a dedicated web server (recommended way)
38~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 38~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
39 39
40wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so. 40wallabag uses a large number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you have not already done so and be sure to use the 1.2 version (if you already have Composer, run a ``composer selfupdate``).
41 41
42Install Composer: 42Install Composer:
43 43
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index b1136c12..0693fc5d 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -35,7 +35,7 @@ Installation
35Sur un serveur dédié (méthode conseillée) 35Sur un serveur dédié (méthode conseillée)
36~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 36~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
37 37
38wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait. 38wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait et vous assurer que vous utilisez bien la version 1.2 (si vous avez déjà Composer, faite un ``composer selfupdate``).
39 39
40Installation de Composer : 40Installation de Composer :
41 41