Merge remote-tracking branch 'upstream/master' into elastic-indexer

Conflicts: composer.lock www/scripts/apps/admin/main/app.js
2025-10-23 09:53:15 +00:00 · 2015-03-10 15:25:20 +01:00
parent 38224cfae1 42a21e8e7d
commit 63eaaf1596
92 changed files with 27708 additions and 28968 deletions
--- a/lib/conf.d/configuration.yml
+++ b/lib/conf.d/configuration.yml
@@ -34,23 +34,15 @@ main:
    task-manager:
        status: started
        enabled: true
-        logger:
-            max-files: 10
-            enabled: true
-            level: INFO
-        listener:
+        options:
            protocol: tcp
            host: 127.0.0.1
            port: 6660
            linger: 500
-    websocket-server:
-        host: local.phrasea
-        port: 9090
-        ip: 0.0.0.0
-        subscriber:
-            protocol: tcp
-            host: 127.0.0.1
-            port: 13598
+        logger:
+            max-files: 10
+            enabled: true
+            level: INFO
    session:
        type: 'file'
        options: []