Merge branch 'master' of github.com:freescout-helpdesk/freescout into…

… dist
wcasia · Nov 7, 2018 · e43e371 · e43e371
2 parents 0ae9757 + e7de1f8
commit e43e371
Show file tree

Hide file tree

Showing 38 changed files with 3,336 additions and 85 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,7 +20,7 @@ composer.phar
 #composer.lock
 .DS_Store
 Thumbs.db
-/.htaccess
+#/.htaccess
 /public/css/builds/
 /public/js/builds/
 /public/.well-known

diff --git a/.htaccess b/.htaccess
@@ -0,0 +1,4 @@
+# On some hostings it is impossible to change web root directory
+# so we rewrite all web requests into /public folder
+RewriteEngine on
+RewriteRule (.*) /public/$1 [L]
diff --git a/app/ActivityLog.php b/app/ActivityLog.php
@@ -11,6 +11,7 @@ class ActivityLog extends Activity
     const NAME_EMAILS_SENDING = 'send_errors';
     const NAME_EMAILS_FETCHING = 'fetch_errors';
     const NAME_SYSTEM = 'system';
+    const NAME_APP_LOGS = 'app';
 
     const DESCRIPTION_USER_LOGIN = 'login';
     const DESCRIPTION_USER_LOGOUT = 'logout';
@@ -83,6 +84,8 @@ public static function getLogTitle($log_name)
                 return __('Fetch Errors');
             case self::NAME_SYSTEM:
                 return __('System');
+            case self::NAME_APP_LOGS:
+                return __('App Logs');
             default:
                 return ucfirst($log_name);
         }

diff --git a/app/Console/Commands/ModuleInstall.php b/app/Console/Commands/ModuleInstall.php
@@ -1,5 +1,7 @@
 <?php
-
+/**
+ * php artisan freescout:module-install modulealias
+ */
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
@@ -40,6 +42,9 @@ public function handle()
         $install_all = false;
         $modules = [];
 
+        // We have to clear modules cache first to update modules cache
+        $this->call('cache:clear');
+
         // Create a symlink for the module (or all modules)
         $module_alias = $this->argument('module_alias');
         if (!$module_alias) {
@@ -60,8 +65,9 @@ public function handle()
         }
 
         if ($install_all) {
-            $this->call('module:migrate');
             foreach ($modules as $module) {
+                $this->line('Module: '.$module->getName());
+                $this->call('module:migrate', ['module' => $module->getName()]);
                 $this->createModulePublicSymlink($module);
             }
         } else {
@@ -70,9 +76,10 @@ public function handle()
                 $this->error('Module with the specified alias not found: '.$module_alias);
                 return;
             }
-            $this->call('module:migrate "'.$module->getName().'"');
+            $this->call('module:migrate', ['module' => $module->getName()]);
             $this->createModulePublicSymlink($module);
         }
+        $this->line('Clearing cache...');
         $this->call('freescout:clear-cache');
     }