From d0c4910a51fa58e8e010ad995a846db02ae7f15f Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Sep 2023 18:44:02 +0100 Subject: [PATCH 1/8] Fixed checkbox formatting on quickstart Signed-off-by: snipe --- resources/views/setup/user.blade.php | 31 +++++++++++----------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php index 04c5dfb82..30e5174c8 100644 --- a/resources/views/setup/user.blade.php +++ b/resources/views/setup/user.blade.php @@ -48,23 +48,19 @@
- -
- -
+ + +
- {{ Form::label('full_multiple_companies_support', trans('admin/settings/general.full_multiple_companies_support_text')) }} -
- -
-
+ +
@@ -156,12 +152,9 @@
- -
- -
+
@stop From 8e41fb7b3607eeadb278fe9e2fa31c5816119c68 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Sep 2023 18:48:20 +0100 Subject: [PATCH 2/8] Removed stray text Signed-off-by: snipe --- resources/views/setup/user.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php index 30e5174c8..88d692aca 100644 --- a/resources/views/setup/user.blade.php +++ b/resources/views/setup/user.blade.php @@ -1,5 +1,5 @@ @extends('layouts/setup') -{{ trans('admin/users/table.createuser') }} + @section('title') {{ trans('admin/users/general.create_user') }} :: @parent From b113411891aa41ba8d186eb69c61774d32d2163d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 14 Sep 2023 13:00:38 -0700 Subject: [PATCH 3/8] Remove ChipperCI --- .chipperci.yml | 44 -------------------------------------------- README.md | 2 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 .chipperci.yml diff --git a/.chipperci.yml b/.chipperci.yml deleted file mode 100644 index bfd1e9ecb..000000000 --- a/.chipperci.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: 1 - -environment: - php: 8.0 - node: 12 - -services: - - mysql: 5.7 - -on: - push: - branches: - - master - - develop - - pull_request: - branches: .* - -pipeline: - - name: Setup - cmd: | - cp -v .env.testing.example .env - cp -v .env.testing.example .env.testing - composer install --no-interaction --prefer-dist --optimize-autoloader - - - name: Generate Key - cmd: | - php artisan key:generate --force - - - name: Passport Keys - cmd: | - php artisan passport:keys - - - name: Run Migrations - cmd: | - php artisan migrate --force - - - name: PHPUnit Unit Tests - cmd: | - php artisan test --testsuite Unit - - - name: PHPUnit Feature Tests - cmd: | - php artisan test --testsuite Feature diff --git a/README.md b/README.md index fe57aa2f3..c29cccb67 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) +[![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) [![All Contributors](https://img.shields.io/badge/all_contributors-326-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev) ## Snipe-IT - Open Source Asset Management System From 8f4ca9da571d31b02ccb29bd3f24e16994b8343d Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Sep 2023 21:20:21 +0100 Subject: [PATCH 4/8] Simplify upload messaging Signed-off-by: snipe --- resources/lang/en/general.php | 9 +++++--- resources/views/livewire/importer.blade.php | 24 +++++++++------------ resources/views/notifications.blade.php | 14 ++++++------ 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index d8f5bb887..b638682b1 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -369,9 +369,9 @@ return [ 'notification_error' => 'Error:', 'notification_error_hint' => 'Please check the form below for errors', 'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:', - 'notification_success' => 'Success:', - 'notification_warning' => 'Warning:', - 'notification_info' => 'Info:', + 'notification_success' => 'Success', + 'notification_warning' => 'Warning', + 'notification_info' => 'Info', 'asset_information' => 'Asset Information', 'model_name' => 'Model Name', 'asset_name' => 'Asset Name', @@ -481,5 +481,8 @@ return [ 'address2' => 'Address Line 2', 'import_note' => 'Imported using csv importer', ], + 'percent_complete' => '% complete', + 'uploading' => 'Uploading... ', + 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.' ]; diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index 60f4502b2..3536d47f6 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -24,7 +24,7 @@
- {{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }} + {{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }}
@@ -65,17 +65,18 @@
+ @if($progress != -1) -
-
{{-- so someof these values are in importer.vue! --}} +
+
- {{ $progress_message }} +

{!! $progress_message !!}

@endif -
+
@if (!config('app.lock_passwords')) @@ -289,7 +290,7 @@ dataType: 'json', done: function(e, data) { @this.progress_bar_class = 'progress-bar-success'; - @this.progress_message = '{{ trans('general.notification_success') }}'; // TODO - we're already round-tripping to the server here - I'd love it if we could get internationalized text here + @this.progress_message = ' {{ trans('general.notification_success') }}'; @this.progress = 100; }, add: function(e, data) { @@ -302,17 +303,12 @@ }, progress: function(e, data) { @this.progress = parseInt((data.loaded / data.total * 100, 10)); - @this.progress_message = @this.progress+'% Complete'; // TODO - make this use general.percent_complete as a translation, passing :percent as a variable + @this.progress_message = '{{ trans('general.uploading') }}'; }, - fail: function(e, data) { + fail: function() { @this.progress_bar_class = "progress-bar-danger"; @this.progress = 100; - - var error_message = '' - for(var i in data.jqXHR.responseJSON.messages) { - error_message += i+": "+data.jqXHR.responseJSON.messages[i].join(", ") - } - @this.progress_message = error_message; + @this.progress_message = ' {{ trans('general.upload_error') }}'; } }) diff --git a/resources/views/notifications.blade.php b/resources/views/notifications.blade.php index ca7945d56..1811b3cdd 100755 --- a/resources/views/notifications.blade.php +++ b/resources/views/notifications.blade.php @@ -3,7 +3,7 @@
- {{ trans('general.notification_error') }} + {{ trans('general.notification_error') }}: {{ trans('general.notification_error_hint') }}
@@ -16,7 +16,7 @@
- {{ trans('general.notification_success') }} + {{ trans('general.notification_success') }}: {{ $message }}
@@ -28,7 +28,7 @@
- {{ trans('general.notification_success') }} + {{ trans('general.notification_success') }}: {{ $message }}
@@ -67,7 +67,7 @@
- {{ trans('general.consumable_information') }} + {{ trans('general.consumable_information') }}
  • {{ trans('general.consumable_name') }} {{ $consumable->name }}
@@ -120,7 +120,7 @@
- {{ trans('general.notification_error') }} + {{ trans('general.notification_error') }}: {{ trans('general.notification_bulk_error_hint') }} @foreach($messages as $message)
    @@ -137,7 +137,7 @@
    - {{ trans('general.notification_warning') }} + {{ trans('general.notification_warning') }}: {{ $message }}
@@ -149,7 +149,7 @@
- {{ trans('general.notification_info') }} + {{ trans('general.notification_info') }}: {{ $message }}
From 273740b8f54805131baf7bc3f1b39c74a67166e0 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Sep 2023 22:04:23 +0100 Subject: [PATCH 5/8] Fixed import error warning Signed-off-by: snipe --- resources/views/livewire/importer.blade.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index 3536d47f6..6cdccc5ac 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -8,7 +8,7 @@ {{-- alert --}} @if($message != '') -
+
dvfds
@if($message_type == 'success') @@ -20,11 +20,13 @@
@endif -@if($import_errors) + @if($import_errors) +
- {{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }} + +

{{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }}

@@ -57,6 +59,7 @@
+
@endif
From 84b0ff76ed1807cd9f558c8472391e49120b1503 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Sep 2023 22:06:19 +0100 Subject: [PATCH 6/8] Revert large warning size Signed-off-by: snipe --- resources/views/livewire/importer.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index 6cdccc5ac..f2d960d48 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -26,7 +26,7 @@
-

{{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }}

+ {{ trans('general.warning', ['warning'=> trans('general.errors_importing')]) }}
From 932c02cc547a7ecfc3af3006c3f544611ef8e15e Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Sep 2023 22:08:30 +0100 Subject: [PATCH 7/8] Typo Signed-off-by: snipe --- resources/views/livewire/importer.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index f2d960d48..e9fc1a3c8 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -8,7 +8,7 @@ {{-- alert --}} @if($message != '') -
dvfds +
@if($message_type == 'success') From bbe7d9dde25743f4f8b63b2e37dfbd0107982164 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 14 Sep 2023 22:08:53 +0100 Subject: [PATCH 8/8] Removed stray space Signed-off-by: snipe --- resources/views/livewire/importer.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php index e9fc1a3c8..5646d0928 100644 --- a/resources/views/livewire/importer.blade.php +++ b/resources/views/livewire/importer.blade.php @@ -9,7 +9,7 @@ {{-- alert --}} @if($message != '')
-
+
@if($message_type == 'success')