From ee32248f43baef7e995c9e420cd00a137e626cf0 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 8 Oct 2016 00:02:22 +0200 Subject: Ensure access_token are removed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When we remove the client, we should ensure that access_token are also removed. To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error. Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form) --- app/config/routing.yml | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'app/config') diff --git a/app/config/routing.yml b/app/config/routing.yml index 2be74d7f..750ed435 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml @@ -12,6 +12,11 @@ wallabag_user: type: annotation prefix: /users +wallabag_api: + resource: "@WallabagApiBundle/Controller/" + type: annotation + prefix: / + wallabag_api: resource: "@WallabagApiBundle/Resources/config/routing.yml" prefix: / -- cgit v1.2.3 From fb8835cc8f1dcb5cd7e221a7179d6620ce3bce58 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 10 Oct 2016 11:31:57 +0200 Subject: Define a dev version for the master This is to be sure that user testing wallabag from the master will have the version defined as dev. --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 75d7299c..bcc4c8eb 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.1.1 + version: 2.1.2-dev paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' -- cgit v1.2.3