Commit graph

257 commits

Author SHA1 Message Date
snipe 4d3db2ab44
Merge pull request #15919 from Godmartinz/table_dropdownmenu-fix
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Removed the `table-responsive` div from several index blades
2025-01-06 18:11:19 +00:00
snipe 15296d2b1c
Merge pull request #15714 from akemidx/saving_custom_report_template
Saved Custom Report Templates
2024-12-19 22:43:59 +00:00
snipe 360e0ff534 Added a few order options on audit report
Signed-off-by: snipe <snipe@snipe.net>
2024-12-19 22:19:33 +00:00
Godfrey M b85b4b1e1b remove table-responsive div from several index bladees 2024-12-03 10:26:14 -08:00
Marcus Moore 53de97db4e
Merge branch 'develop' into saving_custom_report_template 2024-11-12 10:36:07 -08:00
Marcus Moore f8d0ddb3f7
Improve template name input 2024-11-07 14:17:20 -08:00
Marcus Moore 4aa5961860
Update page titles 2024-11-07 12:13:20 -08:00
Marcus Moore 8873137ed0
Scaffold updating template name 2024-11-06 12:29:31 -08:00
Marcus Moore 37d792352d
Update page title dynamically 2024-11-06 12:11:35 -08:00
Marcus Moore 4daa8e7c63
Indenting 2024-11-04 12:49:44 -08:00
Marcus Moore 41f25341fd
Populate select with selected template 2024-11-04 12:32:05 -08:00
snipe f68df1fa06 Made type searchable in action logs
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Signed-off-by: snipe <snipe@snipe.net>
2024-10-30 13:21:13 +00:00
Marcus Moore 702edf7908
Remove x from select dropdown 2024-10-29 15:34:00 -07:00
Marcus Moore b97c54a54b
Improve handling of old data for text inputs 2024-10-29 11:25:54 -07:00
Marcus Moore 54dec8d30d
Add translations 2024-10-28 12:56:42 -07:00
Marcus Moore e390a95bd3
Improve back button behavior 2024-10-23 15:42:09 -07:00
Marcus Moore 2fcc7e1188
Make template name required 2024-10-23 15:24:58 -07:00
Marcus Moore 8a06f4ad82
Improve label 2024-10-23 15:21:02 -07:00
Marcus Moore 853e14f369
Fix width 2024-10-23 13:24:06 -07:00
Marcus Moore c1aa33862d
Add error message for eol start and end fields 2024-10-23 13:22:21 -07:00
Marcus Moore 30dc5fa0cf
Allow retrieving eol start and end dates 2024-10-23 13:21:44 -07:00
Marcus Moore 94e168fa15
Fix label 2024-10-23 13:17:20 -07:00
Marcus Moore 5306e1cd15
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/supplier-select.blade.php
#	resources/views/reports/custom.blade.php
2024-10-15 12:32:01 -07:00
snipe 658c94ad8b Changed action_date to created_at
Signed-off-by: snipe <snipe@snipe.net>
2024-09-25 17:25:15 +01:00
snipe b21c303e56 Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by 2024-09-20 13:43:50 +01:00
snipe 8270947ed2
Merge pull request #13291 from akemidx/eol_date_range_for_reports
Added date range for EOL in custom reports
2024-09-19 21:49:27 +01:00
snipe 836893cba5 Added id to report
Signed-off-by: snipe <snipe@snipe.net>
2024-09-19 18:35:00 +01:00
Marcus Moore 89e2d03a81
Fix the deleted assets radio 2024-09-17 16:24:18 -07:00
Marcus Moore 8e0b718a4a
Scope Select All checkbox to fields on left side of page 2024-09-17 16:00:32 -07:00
Marcus Moore b51c505d9e
Fix department, manufacturer, and category multi-selects 2024-09-17 15:29:38 -07:00
Marcus Moore 8bba11e1bb
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
#	app/Http/Controllers/ReportsController.php
#	resources/views/partials/forms/edit/category-select.blade.php
#	resources/views/partials/forms/edit/company-select.blade.php
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/status-select.blade.php
#	resources/views/reports/custom.blade.php
2024-09-17 15:26:35 -07:00
snipe 69e981364a Made multiple select
Signed-off-by: snipe <snipe@snipe.net>
2024-08-29 17:51:20 +01:00
akemidx 8e1111c681 Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports 2024-08-19 19:33:44 -04:00
snipe 0c09f2b2c0 Moar icon replacement
Signed-off-by: snipe <snipe@snipe.net>
2024-08-18 18:13:49 +01:00
snipe 1c229a8e08 Made notes field sortable
Signed-off-by: snipe <snipe@snipe.net>
2024-08-10 17:00:11 +01:00
snipe d53a032402 More consistent UI for indented checkboxes
Signed-off-by: snipe <snipe@snipe.net>
2024-07-16 21:07:03 +01:00
snipe e6f2c457a8 Handle localization better, clearer indenting on addresses
Signed-off-by: snipe <snipe@snipe.net>
2024-07-16 19:01:50 +01:00
snipe c3cf123189 Better translation for custom fields
Signed-off-by: snipe <snipe@snipe.net>
2024-05-25 10:39:47 +01:00
snipe c54eb22754 Moved URL string to general
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 14:46:52 +00:00
Marcus Moore 2d5631284b
Indent 2024-01-23 15:19:36 -08:00
Marcus Moore 3952fc10a6
Re-render order number properly 2024-01-23 15:18:02 -08:00
Marcus Moore 530ea474d1
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
#	resources/lang/en/admin/reports/general.php
#	resources/views/reports/custom.blade.php
2024-01-23 13:55:07 -08:00
Marcus Moore 219540281f
Add trailing commas 2024-01-22 12:42:01 -08:00
Marcus Moore 1630392953
Uncheck a couple boxes by default to match existing behavior 2024-01-18 13:30:51 -08:00
Marcus Moore 1a1f417633
Change variable name to keep foreach scoped 2024-01-17 17:00:03 -08:00
Marcus Moore 82f4cc799b
Improve variable name 2024-01-17 11:54:37 -08:00
Marcus Moore 4d8d069bbc
Update placeholder 2024-01-17 11:43:34 -08:00
akemidx 2768f19b7c code cleanup 2024-01-16 18:56:29 -05:00
Marcus Moore 8aa5cf530b
Improve radio button values in custom report form 2024-01-16 12:33:16 -08:00
akemidx 20bd83232e standardizing naming to use Template 2024-01-11 19:41:19 -05:00