Merge pull request #3 from Webcampak/develop

Fgerthoffert · web-flow · commit 2f2e77409f55 · 2016-11-20T12:22:48.000-05:00
Preparation for release v3.0.1
diff --git a/apps/api b/apps/api
@@ -1 +1 @@
-Subproject commit 52b07626b88cea6f29c19190bb4248c1bd9c2bee
+Subproject commit 4de1b69ee40ec943612ca8b937e16b3baf199530
diff --git a/apps/cli b/apps/cli
@@ -1 +1 @@
-Subproject commit cf8e2a36a2fc963b120ae02ac9e47c7b60081204
+Subproject commit 46735766b555b3963d100d1640e0a334e0c98591
diff --git a/apps/ui b/apps/ui
@@ -1 +1 @@
-Subproject commit 8bdb76e3b218bd39bfd7034ad46ec38a966e7026
+Subproject commit 973cdd853b454a5592ea6c3587f363464751b7c5
diff --git a/config/param_paths.yml b/config/param_paths.yml
@@ -36,6 +36,11 @@ parameters:
     dir_xfer_failed:        'failed/'
     
 
+    app_core:        '/home/webcampak/webcampak/'
+    app_cli:        '/home/webcampak/webcampak/apps/cli/'
+    app_api:        '/home/webcampak/webcampak/apps/api/'
+    app_ui:        '/home/webcampak/webcampak/apps/ui/'
+
 doctrine:
     dbal:
         path: "/home/webcampak/webcampak/resources/database/webcampak.db"
diff --git a/config/services.yml b/config/services.yml
@@ -66,7 +66,7 @@ services:
 
     app.svc.user:
         class: AppBundle\Services\UserService
-        arguments: ['@security.token_storage', '@doctrine', '@logger', %kernel.root_dir%]
+        arguments: ['@security.token_storage', '@doctrine', '@logger', %kernel.root_dir%, %app_core%, %app_cli%, %app_api%, %app_ui%]
 
     app.svc.ftp:
         class: AppBundle\Services\FtpService
diff --git a/i18n/en_US.utf8/LC_MESSAGES/ui-desktop.js b/i18n/en_US.utf8/LC_MESSAGES/ui-desktop.js
@@ -0,0 +1,15 @@
+var jsonLocaleData = {
+        "" : {
+            "MIME-Version" : " 1.0",
+            "POT-Creation-Date" : " 2012-08-25 11:49+0200",
+            "Language" : " ",
+            "Last-Translator" : " Francois Gerthoffert <contact@webcampak.com>",
+            "Content-Type" : " text/plain; charset=UTF-8",
+            "PO-Revision-Date" : " 2012-08-25 11:50+0100",
+            "Language-Team" : " François Gerthoffert <contact@webcampak.com>",
+            "Content-Transfer-Encoding" : " 8bit",
+            "Project-Id-Version" : " Webcampak",
+            "Report-Msgid-Bugs-To" : " "
+        }
+    }
+    ;
diff --git a/install/config/webcampak.apache2.conf b/install/config/webcampak.apache2.conf
@@ -54,6 +54,7 @@
     Alias /app_dev.php/bootstrap.json /home/webcampak/webcampak/apps/ui/Sencha/App6.0/workspace/Desktop/bootstrap.json
     Alias /app_dev.php/app.js /home/webcampak/webcampak/apps/ui/Sencha/App6.0/workspace/Desktop/app.js
     Alias /app_dev.php/app/ /home/webcampak/webcampak/apps/ui/Sencha/App6.0/workspace/Desktop/app/
+    Alias /app_dev.php/overrides/ /home/webcampak/webcampak/apps/ui/Sencha/App6.0/workspace/Desktop/overrides/
     Alias /app.php/app.json /home/webcampak/webcampak/apps/ui/Sencha/App6.0/workspace/build/production/WPAKD/app.json
     Alias /app.php/app.js /home/webcampak/webcampak/apps/ui/Sencha/App6.0/workspace/build/production/WPAKD/app.js
     Alias /app_test.php/app.json /home/webcampak/webcampak/apps/ui/Sencha/App6.0/workspace/build/testing/WPAKD/app.json
