Skip to content

Commit

Permalink
Merge branch 'master' of github.com:freescout-helpdesk/freescout into…
Browse files Browse the repository at this point in the history
… dist
  • Loading branch information
freescout-help-desk committed Dec 22, 2019
2 parents 19edef3 + c5117c7 commit a2efc65
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 10 deletions.
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ DB_HOST=localhost
DB_PORT=3306
DB_DATABASE=
DB_USERNAME=
# Maximum password length is 50 characters
DB_PASSWORD=

# Run the following console command to generate the key: php artisan key:generate
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Need anything else? Suggest features [here](https://feedback.userreport.com/25a3

## Demo

[Live demo](https://demo.freescout.net)
**[Live Demo](https://demo.freescout.net)**

## Mobile Apps

Expand Down
2 changes: 1 addition & 1 deletion config/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
| or any other location as required by the application or its packages.
*/

'version' => '1.3.17',
'version' => '1.3.18',

/*
|--------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public function up()
// To avoid 'Row size too large' error.
// https://github.com/freescout-helpdesk/freescout/issues/393
// https://dev.mysql.com/doc/refman/8.0/en/column-count-limit.html
if (version_compare(config('app.version'), '1.3.17', '<')) {
if (version_compare(config('app.version'), '1.3.18', '<=')) {
Schema::table('mailboxes', function (Blueprint $table) {
$table->text('out_password')->nullable()->change();
$table->text('in_password')->nullable()->change();
Expand All @@ -38,12 +38,5 @@ public function down()
Schema::table('mailboxes', function (Blueprint $table) {
$table->dropColumn('before_reply');
});

if (version_compare(config('app.version'), '1.3.17', '<')) {
Schema::table('mailboxes', function (Blueprint $table) {
$table->string('out_password', 255)->nullable()->change();
$table->string('in_password', 512)->nullable()->change();
});
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

class ChangePasswordsTypesInMailboxesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
// To avoid 'Row size too large' error.
// https://github.com/freescout-helpdesk/freescout/issues/393
// https://dev.mysql.com/doc/refman/8.0/en/column-count-limit.html
Schema::table('mailboxes', function (Blueprint $table) {
$table->text('out_password')->nullable()->change();
$table->text('in_password')->nullable()->change();
});
}

/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@
Password
</label>
<input type="text" name="database_password" id="database_password" value="{{ old('database_password', env('DB_PASSWORD')) }}" maxlength="50"/>
<span style="color: #AAAAAA; position: relative; top: -5px;">(Maximum password length is 50 characters)</span>
@if ($errors->has('database_password'))
<span class="error-block">
<i class="fa fa-fw fa-exclamation-triangle" aria-hidden="true"></i>
Expand Down

0 comments on commit a2efc65

Please sign in to comment.