Merge branch 'bugfix-release' into 'main'
Release bugfix version 0.9.1 See merge request games-club/rbrecruiter-gc!28
This commit is contained in:
@@ -0,0 +1,38 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
|
||||||
|
class CreateTranslationsTable extends Migration {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function up()
|
||||||
|
{
|
||||||
|
Schema::create('ltm_translations', function(Blueprint $table)
|
||||||
|
{
|
||||||
|
$table->collation = 'utf8mb4_bin';
|
||||||
|
$table->bigIncrements('id');
|
||||||
|
$table->integer('status')->default(0);
|
||||||
|
$table->string('locale');
|
||||||
|
$table->string('group');
|
||||||
|
$table->text('key');
|
||||||
|
$table->text('value')->nullable();
|
||||||
|
$table->timestamps();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reverse the migrations.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function down()
|
||||||
|
{
|
||||||
|
Schema::drop('ltm_translations');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@@ -124,7 +124,7 @@ class PermissionSeeder extends Seeder
|
|||||||
'applications.vote'
|
'applications.vote'
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$hiringManager->givePermissionTo('appointments.*', 'applications.*', 'admin.hiring.*');
|
$hiringManager->givePermissionTo('admin.viewAllAbsences', 'admin.manageAbsences', 'appointments.*', 'applications.*', 'admin.hiring.*');
|
||||||
|
|
||||||
$admin->givePermissionTo([
|
$admin->givePermissionTo([
|
||||||
'appointments.*',
|
'appointments.*',
|
||||||
@@ -134,8 +134,6 @@ class PermissionSeeder extends Seeder
|
|||||||
'admin.notificationsettings.*',
|
'admin.notificationsettings.*',
|
||||||
'profiles.view.others',
|
'profiles.view.others',
|
||||||
'profiles.edit.others',
|
'profiles.edit.others',
|
||||||
'admin.viewAllAbsences',
|
|
||||||
'admin.manageAbsences',
|
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -270,6 +270,11 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
<div class="col">
|
||||||
|
<label for="uage">{{ __(' Age') }}</label>
|
||||||
|
<input id="uage" class="form-control" type="text" value="{{ (is_null($user->dob)) ? __('Age not provided yet') : __(':age years old', ['age' => \Carbon\Carbon::parse($user->dob)->age]) }}" disabled>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="col">
|
<div class="col">
|
||||||
<label for="uregdate">{{ __(' Registered at') }}</label>
|
<label for="uregdate">{{ __(' Registered at') }}</label>
|
||||||
<input id="uregdate" class="form-control" type="text" value="{{ $user->created_at }} ({{ $user->created_at->diffForHumans() }})" disabled>
|
<input id="uregdate" class="form-control" type="text" value="{{ $user->created_at }} ({{ $user->created_at->diffForHumans() }})" disabled>
|
||||||
|
@@ -161,6 +161,8 @@
|
|||||||
<p><b>{{ __('Discord tag: ') }}</b><i class="fab fa-discord"> </i> {{ __(':discordUsername (Connected account)', ['discordUsername' => $application->user->username]) }} </p>
|
<p><b>{{ __('Discord tag: ') }}</b><i class="fab fa-discord"> </i> {{ __(':discordUsername (Connected account)', ['discordUsername' => $application->user->username]) }} </p>
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
|
<p><b>{{ __('Age: ') }}</b>{{ __(':age years old', ['age' => \Carbon\Carbon::parse($application->user->dob)->age]) }}</p>
|
||||||
|
|
||||||
@if (Auth::user()->hasRole('hiringManager'))
|
@if (Auth::user()->hasRole('hiringManager'))
|
||||||
<p><b>{{__('Applicant IP Address')}}</b> <span class="badge badge-primary">{{ (!$shouldCollect) ? __('0.0.0.0 (censored)') : $application->user->registrationIp }}</span></p>
|
<p><b>{{__('Applicant IP Address')}}</b> <span class="badge badge-primary">{{ (!$shouldCollect) ? __('0.0.0.0 (censored)') : $application->user->registrationIp }}</span></p>
|
||||||
@endif
|
@endif
|
||||||
@@ -484,7 +486,7 @@
|
|||||||
@if($application->user->avatarPreference == 'gravatar')
|
@if($application->user->avatarPreference == 'gravatar')
|
||||||
<img class="profile-user-img img-fluid img-circle" src="https://gravatar.com/avatar/{{md5(Auth::user()->email)}}" alt="{{__("User profile picture")}}">
|
<img class="profile-user-img img-fluid img-circle" src="https://gravatar.com/avatar/{{md5(Auth::user()->email)}}" alt="{{__("User profile picture")}}">
|
||||||
@else
|
@else
|
||||||
<img class="profile-user-img img-fluid img-circle" src="https://crafatar.com/avatars/{{Auth::user()->uuid}}" alt="{{__("User profile picture")}}>
|
<img class="profile-user-img img-fluid img-circle" src="https://crafatar.com/avatars/{{Auth::user()->uuid}}" alt="{{__("User profile picture")}}">
|
||||||
@endif
|
@endif
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -512,7 +514,7 @@
|
|||||||
|
|
||||||
<div class="col text-right">
|
<div class="col text-right">
|
||||||
|
|
||||||
<p class="text-sm text-muted"><span id="charcount">0</span>/600 {{__(' max characters')}}</p>
|
<p class="text-sm text-muted">{!! __('<span id="charcount">0</span>/600 max characters') !!}</p>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user