diff options
-rw-r--r-- | .gitignore | 2 | ||||
-rw-r--r-- | README.md | 19 | ||||
-rw-r--r-- | app/build.xml | 11 | ||||
-rw-r--r-- | app/config/config_test.yml | 4 | ||||
-rw-r--r-- | composer.json | 5 |
5 files changed, 34 insertions, 7 deletions
@@ -35,4 +35,4 @@ | |||
35 | 35 | ||
36 | # Data for wallabag | 36 | # Data for wallabag |
37 | data/assets/* | 37 | data/assets/* |
38 | data/db/poche.sqlite \ No newline at end of file | 38 | data/db/poche*.sqlite |
@@ -1,9 +1,22 @@ | |||
1 | # what is wallabag ? | 1 | # What is wallabag ? |
2 | wallabag is a self hostable application allowing you to not miss any content anymore. Click, save, read it when you can. It extracts content so that you can read it when you have time. | 2 | wallabag is a self hostable application allowing you to not miss any content anymore. |
3 | Click, save, read it when you can. It extracts content so that you can read it when you have time. | ||
3 | 4 | ||
4 | More informations on our website: [wallabag.org](http://wallabag.org) | 5 | More informations on our website: [wallabag.org](http://wallabag.org) |
5 | 6 | ||
7 | # Want to test the v2 ? | ||
8 | |||
9 | Keep in mind it's an **instable** branch, everything can be broken :) | ||
10 | |||
11 | ``` | ||
12 | git clone https://github.com/wallabag/wallabag.git -b refactor | ||
13 | cd wallabag | ||
14 | composer install | ||
15 | php app/console wallabag:install | ||
16 | php app/console server:run | ||
17 | ``` | ||
18 | |||
6 | ## License | 19 | ## License |
7 | Copyright © 2013-2014 Nicolas Lœuillet <nicolas@loeuillet.org> | 20 | Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org> |
8 | This work is free. You can redistribute it and/or modify it under the | 21 | This work is free. You can redistribute it and/or modify it under the |
9 | terms of the MIT License. See the COPYING file for more details. | 22 | terms of the MIT License. See the COPYING file for more details. |
diff --git a/app/build.xml b/app/build.xml index b3f4c13a..5300af04 100644 --- a/app/build.xml +++ b/app/build.xml | |||
@@ -14,6 +14,17 @@ | |||
14 | </exec> | 14 | </exec> |
15 | <exec executable="php"> | 15 | <exec executable="php"> |
16 | <arg value="${basedir}/../app/console"/> | 16 | <arg value="${basedir}/../app/console"/> |
17 | <arg value="doctrine:database:drop"/> | ||
18 | <arg value="--force"/> | ||
19 | <arg value="--env=test"/> | ||
20 | </exec> | ||
21 | <exec executable="php"> | ||
22 | <arg value="${basedir}/../app/console"/> | ||
23 | <arg value="doctrine:database:create"/> | ||
24 | <arg value="--env=test"/> | ||
25 | </exec> | ||
26 | <exec executable="php"> | ||
27 | <arg value="${basedir}/../app/console"/> | ||
17 | <arg value="cache:clear"/> | 28 | <arg value="cache:clear"/> |
18 | <arg value="--env=test"/> | 29 | <arg value="--env=test"/> |
19 | </exec> | 30 | </exec> |
diff --git a/app/config/config_test.yml b/app/config/config_test.yml index 2f6d9250..83e2922a 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml | |||
@@ -14,3 +14,7 @@ web_profiler: | |||
14 | 14 | ||
15 | swiftmailer: | 15 | swiftmailer: |
16 | disable_delivery: true | 16 | disable_delivery: true |
17 | |||
18 | doctrine: | ||
19 | dbal: | ||
20 | path: %kernel.root_dir%/../data/db/poche_test.sqlite | ||
diff --git a/composer.json b/composer.json index 2b22d6bd..8771ea90 100644 --- a/composer.json +++ b/composer.json | |||
@@ -92,8 +92,7 @@ | |||
92 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", | 92 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap", |
93 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", | 93 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache", |
94 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", | 94 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets", |
95 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile", | 95 | "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile" |
96 | "app/console wallabag:install --no-interaction" | ||
97 | ], | 96 | ], |
98 | "post-update-cmd": [ | 97 | "post-update-cmd": [ |
99 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", | 98 | "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters", |
@@ -112,7 +111,7 @@ | |||
112 | } | 111 | } |
113 | }, | 112 | }, |
114 | "autoload": { | 113 | "autoload": { |
115 | "psr-0": { "": "src/", "SymfonyStandard": "app/" } | 114 | "psr-0": { "": "src/" } |
116 | }, | 115 | }, |
117 | "config": { | 116 | "config": { |
118 | "bin-dir": "bin" | 117 | "bin-dir": "bin" |