Merge pull request #3 from Webcampak/develop

Preparation for release v3.0.1
Webcampak · Nov 20, 2016 · 2f2e774 · 2f2e774
2 parents b088b70 + a0b0f9d
commit 2f2e774
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 4 deletions.
diff --git a/apps/api b/apps/api
diff --git a/apps/cli b/apps/cli
diff --git a/apps/ui b/apps/ui
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 <[email protected]>",
+            "Content-Type" : " text/plain; charset=UTF-8",
+            "PO-Revision-Date" : " 2012-08-25 11:50+0100",
+            "Language-Team" : " François Gerthoffert <[email protected]>",
+            "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
+9 −7		Symfony/3.0/src/AppBundle/Command/RunSyncReportsCommand.php
+1 −1		Symfony/3.0/src/AppBundle/Command/SourceCreateCommand.php
+1 −4		Symfony/3.0/src/AppBundle/Services/StatusService.php
+43 −21		Symfony/3.0/src/AppBundle/Services/SyncReportsService.php
+41 −7		Symfony/3.0/src/AppBundle/Services/UserService.php
+1 −1		requirements.txt
+1 −1		webcampak/core/wpakFileUtils.py
+7 −11		webcampak/core/wpakReportsDaily.py
+88 −87		webcampak/core/wpakStatsRrd.py
+3 −3		webcampak/core/wpakXferStart.py
+7 −0		Sencha/App6.0/workspace/Desktop/app/controller/desktop/authentication/UserSettings.js
+1 −1		Sencha/App6.0/workspace/Desktop/app/model/desktop/authentication/UserSettings.js
+0 −3		Sencha/App6.0/workspace/Desktop/app/view/accesscontrol/Main.js
+0 −3		Sencha/App6.0/workspace/Desktop/app/view/accesscontrol/customers/CustomersList.js
+1 −1		Sencha/App6.0/workspace/Desktop/bootstrap.json
+1 −1		Sencha/App6.0/workspace/Desktop/bootstrap.jsonp
+45 −0		Sencha/App6.0/workspace/Desktop/overrides/grid/RowEditor.js
+1 −1		Sencha/App6.0/workspace/Desktop/sass/example/bootstrap.json
+1 −1		Sencha/App6.0/workspace/Desktop/sass/example/bootstrap.jsonp
+1 −1		Sencha/App6.0/workspace/build/production/WPAKD/app.js
+1 −1		Sencha/App6.0/workspace/build/production/WPAKD/app.json
+1 −0		Sencha/App6.0/workspace/build/temp/production/WPAKD/sass/WPAKD-all.scss
+1 −0		Sencha/App6.0/workspace/build/temp/production/WPAKD/sass/WPAKD-all.scss.tmp
+1 −0		Sencha/App6.0/workspace/build/temp/production/WPAKD/slicer-temp/WPAKD-example.scss
+1 −0		Sencha/App6.0/workspace/build/temp/production/WPAKD/slicer-temp/WPAKD-example.scss.tmp
+ −		Sencha/App6.0/workspace/build/temp/production/WPAKD/slicer-temp/theme-capture.png