Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update from upstream repo CachetHQ/Cachet #10

Merged
merged 10 commits into from
Nov 26, 2018
Merged

Update from upstream repo CachetHQ/Cachet #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
53cb71e
Added v-pre to textarea to fix view not working
Aug 20, 2018
b389e4a
Reverted .env.example
Aug 20, 2018
6e426ea
Revert .env.example to 2.4 branch default
Aug 20, 2018
d3bb50b
Merge branch '2.4' into 2.4
Sep 6, 2018
a05fec9
Merge pull request #2 from CachetHQ/2.4
Sep 10, 2018
4a6fd7d
Merge pull request #3223 from stobbsm/2.4
jbrooksuk Nov 23, 2018
6feed9e
Fix configuring postgres leads to wrong database driver key
nstapelbroek Nov 25, 2018
4fb2f3e
Add warning when setting up localhost with mysql driver
nstapelbroek Nov 25, 2018
2750505
Merge pull request #3341 from nstapelbroek/fix/postgress-driver-durin…
jbrooksuk Nov 25, 2018
05d6af9
Merge pull request #3340 from nstapelbroek/feature/configure-socket-w…
jbrooksuk Nov 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/Console/Commands/InstallCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,17 @@ protected function configureDatabase(array $default = [])

$config['DB_DRIVER'] = $this->choice('Which database driver do you want to use?', [
'mysql' => 'MySQL',
'postgresql' => 'PostgreSQL',
'pgsql' => 'PostgreSQL',
'sqlite' => 'SQLite',
], $config['DB_DRIVER']);

if ($config['DB_DRIVER'] === 'sqlite') {
$config['DB_DATABASE'] = $this->ask('Please provide the full path to your SQLite file.', $config['DB_DATABASE']);
} else {
$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']);

Expand Down
2 changes: 1 addition & 1 deletion resources/views/dashboard/templates/edit.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</div>
<div class="form-group">
<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>
</div>
</fieldset>
Expand Down