Merge branch 'develop'

Updated changelog
Placed cross domain middleware as the first one for rest requests
2026-03-02 05:03:12 +08:00 · 2016-08-21 21:24:31 +02:00 · 2016-08-21 21:24:00 +02:00 · 2016-08-21 21:21:31 +02:00 · 2016-08-21 19:16:36 +02:00 · 2016-08-21 19:16:21 +02:00
3 changed files with 8 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 ## CHANGELOG

+### 1.2.1
+
+**Bugs**
+
+* [62: Fix cross-domain requests in REST API](https://github.com/acelaya/url-shortener/issues/62)
+
 ### 1.2.0

 **Features**
--- a/build.sh
+++ b/build.sh
@@ -40,5 +40,5 @@ rm -rf config/autoload/{{,*.}local.php{,.dist},.gitignore}

 # Compressing file
 rm -f "${projectdir}"/build/shlink_${version}_dist.zip
-zip -r "${projectdir}"/build/shlink_${version}_dist.zip .
+zip -ry "${projectdir}"/build/shlink_${version}_dist.zip .
 rm -rf "${builtcontent}"
--- a/module/Rest/config/middleware-pipeline.config.php
+++ b/module/Rest/config/middleware-pipeline.config.php
@@ -7,9 +7,9 @@ return [
        'rest' => [
            'path' => '/rest',
            'middleware' => [
+                Middleware\CrossDomainMiddleware::class,
                Middleware\BodyParserMiddleware::class,
                Middleware\CheckAuthenticationMiddleware::class,
-                Middleware\CrossDomainMiddleware::class,
            ],
            'priority' => 5,
        ],
Author	SHA1	Message	Date
Alejandro Celaya	6eef694315	Merge branch 'develop'	2016-08-21 21:24:31 +02:00
Alejandro Celaya	fe4a4aef34	Updated changelog	2016-08-21 21:24:00 +02:00
Alejandro Celaya	b13c95cf1a	Placed cross domain middleware as the first one for rest requests	2016-08-21 21:21:31 +02:00
Alejandro Celaya	c1c325588e	Merge branch 'develop'	2016-08-21 19:16:36 +02:00
Alejandro Celaya	faad60f79e	Merge branch 'develop' of https://github.com/shlinkio/shlink into develop	2016-08-21 19:16:21 +02:00
Alejandro Celaya	cbb5a02b95	Kept symlincs while generating the dist file	2016-08-21 19:16:06 +02:00
Alejandro Celaya	7aa42ada54	Merge pull request #61 from acelaya/develop Develop	2016-08-21 18:31:32 +02:00