Merge remote-tracking branch 'origin/development' into feature/DIMOC-…

…208/fileupload-fe
OpenCatalogi · Aug 7, 2024 · d614e67 · d614e67
2 parents 63c86ed + 8826ee3
commit d614e67
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,6 +6,11 @@ volumes:
   config:
 
 services:
+  frontend:
+    image: acatonl/woo-ui-develop
+    ports:
+    - "8081:80"
+
   db:
     image: mariadb:10.6
     restart: always
@@ -47,4 +52,4 @@ services:
       - TZ=Europe/Amsterdam
     depends_on:
       init-ubuntu:
-        condition: service_completed_successfully
+        condition: service_completed_successfully
diff --git a/lib/Controller/SearchController.php b/lib/Controller/SearchController.php
@@ -75,11 +75,10 @@ public function page(?string $getParameter)
             []
         );
     }
-	
+
     /**
      * @PublicPage
 	 * @NoCSRFRequired
-	 * @CORS
      */
     public function index(SearchService $searchService): JSONResponse
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -75,11 +75,10 @@ public function page(?string $getParameter) @@
                 []
             );
         }
         /**
          * @PublicPage
     	 * @NoCSRFRequired
-    	 * @CORS
          */
         public function index(SearchService $searchService): JSONResponse
         {
@@ Expand Down @@