lucas.mathieu/cachet-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from CachetHQ/2.4

Browse Source 
Update from upstream repo CachetHQ/Cachet
This commit is contained in:
Mr.Patch
2018-11-26 10:05:39 +05:30
committed by GitHub
parent 05f9217b62 05d6af9c3a
commit 86f0a801ac
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Console/Commands/InstallCommand.php
+4 -1
View File
@@ -140,7 +140,7 @@ class InstallCommand extends Command
$config['DB_DRIVER'] = $this->choice('Which database driver do you want to use?', [ $config['DB_DRIVER'] = $this->choice('Which database driver do you want to use?', [
'mysql' => 'MySQL', 'mysql' => 'MySQL',
'postgresql' => 'PostgreSQL', 'pgsql' => 'PostgreSQL',
'sqlite' => 'SQLite', 'sqlite' => 'SQLite',
], $config['DB_DRIVER']); ], $config['DB_DRIVER']);
@@ -148,6 +148,9 @@ class InstallCommand extends Command
$config['DB_DATABASE'] = $this->ask('Please provide the full path to your SQLite file.', $config['DB_DATABASE']); $config['DB_DATABASE'] = $this->ask('Please provide the full path to your SQLite file.', $config['DB_DATABASE']);
} else { } else {
$config['DB_HOST'] = $this->ask("What is the host of your {$config['DB_DRIVER']} database?", $config['DB_HOST']); $config['DB_HOST'] = $this->ask("What is the host of your {$config['DB_DRIVER']} database?", $config['DB_HOST']);
if ($config['DB_HOST'] === 'localhost' && $config['DB_DRIVER'] === 'mysql') {
$this->warn("Using 'localhost' will result in the usage of a local unix socket. Use 127.0.0.1 if you want to connect over TCP");
}
$config['DB_DATABASE'] = $this->ask('What is the name of the database that Cachet should use?', $config['DB_DATABASE']); $config['DB_DATABASE'] = $this->ask('What is the name of the database that Cachet should use?', $config['DB_DATABASE']);
resources/views/dashboard/templates/edit.blade.php
+1 -1
View File
@@ -52,7 +52,7 @@ window.addEventListener("DOMContentLoaded", function(e) {
</div> </div>
<div class="form-group"> <div class="form-group">
<label>{{ trans('forms.incidents.templates.template') }}</label> <label>{{ trans('forms.incidents.templates.template') }}</label>
<textarea name="template[template]" id="cm-editor" class="form-control" rows="8" placeholder="{{ trans('forms.incidents.templates.template') }}">{{ $template->template }}</textarea> <textarea v-pre name="template[template]" id="cm-editor" class="form-control" rows="8" placeholder="{{ trans('forms.incidents.templates.template') }}">{{ $template->template }}</textarea>
<span class="help-block">{!! trans('forms.incidents.templates.twig') !!}</span> <span class="help-block">{!! trans('forms.incidents.templates.twig') !!}</span>
</div> </div>
</fieldset> </fieldset>