DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-09 23:24:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
This commit is contained in:
snipe 2023-03-28 03:32:04 -07:00
parent dcbd216e2c 6800098469
commit d2daaf30eb
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config/version.php
View file

@ -1,10 +1,10 @@
<?php
return array (
'app_version' => 'v6.0.14',
'full_app_version' => 'v6.0.14 - build 9715-g8b70a7f21',
'build_version' => '9715',
'app_version' => 'v6.1.0-pre',
'full_app_version' => 'v6.1.0-pre - build 10030-gdcbd216e2',
'build_version' => '10030',
'prerelease_version' => '',
'hash_version' => 'g8b70a7f21',
'full_hash' => 'v6.0.14-671-g8b70a7f21',
'hash_version' => 'gdcbd216e2',
'full_hash' => 'v6.1.0-pre-986-gdcbd216e2',
'branch' => 'master',
);

12
resources/views/setup/user.blade.php
View file

@ -1,14 +1,14 @@
@extends('layouts/setup')
{{ trans('admin/user/table.createuser') }}
{{ trans('admin/users/table.createuser') }}
@section('title')
{{ trans('admin/user/general.create_user') }} ::
{{ trans('admin/users/general.create_user') }} ::
@parent
@stop
{{-- Page content --}}
@section('content')
<p>{{ trans('admin/user/general.create_user_page_explanation') }}</p>
<p>{{ trans('admin/users/general.create_user_page_explanation') }}</p>
<form action="{{ route('setup.user.save') }}" method="POST">
{{ csrf_field() }}
@ -156,10 +156,10 @@
<!-- Email credentials -->
<div class="form-group col-lg-12">
<label>{{ trans('admin/user/general.email_credentials') }}</label>
<label>{{ trans('admin/users/general.email_credentials') }}</label>
<div class="checkbox">
<label>
<input type="checkbox" value="1" name="email_creds">{{ trans('admin/user/general.email_credentials_text') }}
<input type="checkbox" value="1" name="email_creds">{{ trans('admin/users/general.email_credentials_text') }}
</label>
</div>
</div>
@ -167,7 +167,7 @@
@stop
@section('button')
<button class="btn btn-primary">{{ trans('admin/user/general.next_save_user') }}</button>
<button class="btn btn-primary">{{ trans('admin/users/general.next_save_user') }}</button>
</form>
@parent
@stop