Commit graph

185 commits

Author SHA1 Message Date
snipe 92ba889cae Updated/removed facades
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 12:53:51 +01:00
snipe fb233c0aa4 Cleaned up facade names and references
Signed-off-by: snipe <snipe@snipe.net>
2024-05-29 12:38:15 +01:00
Marcus Moore 8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-05-22 16:09:27 -07:00
snipe 312ce51de6 Removed more debugging
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 15:25:57 +01:00
Marcus Moore 2a71877bec
Add additional condition 2024-04-25 17:04:07 -07:00
Marcus Moore 30bd920497
Add conditional 2024-04-25 16:24:12 -07:00
Marcus Moore 1d5b48b88d
Add comment and improve method 2024-04-25 16:22:15 -07:00
Marcus Moore 3a2eeaea7a
WIP: Future-proof rules being converted to array syntax 2024-04-24 17:40:40 -07:00
Marcus Moore 12418ae91b
WIP: allow EU style purchase cost via api 2024-04-24 17:18:29 -07:00
snipe 8dd71f99cc Added ico, image/x-icon,image/vnd.microsoft.icon to favicon validation
Signed-off-by: snipe <snipe@snipe.net>
2024-04-22 13:54:19 +01:00
Marcus Moore 6d572424ac
Add validation around dates 2024-04-10 14:02:25 -07:00
Marcus Moore 57d1c036ec
Improve method name 2024-03-25 13:53:30 -07:00
Marcus Moore 71722b753d
Little bit of clean up 2024-03-25 13:49:03 -07:00
Marcus Moore a2625c889a
Improve comment 2024-03-25 13:48:32 -07:00
Marcus Moore c98b9da612
Pass last_audit_date through for model level validation if not a date 2024-03-25 13:47:24 -07:00
Marcus Moore 5f4c964309
Account for last_audit_date not being provided 2024-03-25 12:45:11 -07:00
Marcus Moore 66ba96d531
Set last_audit_date to valid format in StoreAssetRequest 2024-03-25 12:38:12 -07:00
snipe 321414f6e3 Updated comment
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 12:38:48 +00:00
snipe 7787fe42c8 Added avif to helpers
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 12:30:28 +00:00
snipe 3b66912742 Fixed #14460 - added support for avif
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 12:25:02 +00:00
Brady Wetherington a6dfd67cd7 Clean up the file extension on image file uploads 2024-02-19 16:51:23 +00:00
Brady Wetherington 9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +00:00
snipe 3b948c7b7e Add orientate to image upload
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 14:29:43 +00:00
Marcus Moore 423b636db9
Guard against non-integers being passed for company_id 2024-01-09 10:57:43 -08:00
spencerrlongg 901b1b83d0 rm code, was probably fixed through rules at some point 2024-01-02 18:27:17 -06:00
spencerrlongg b17078fffd a couple notes 2023-11-28 22:15:13 -06:00
spencerrlongg c886fb555b checkout on store tests almost done 2023-11-28 22:11:20 -06:00
spencerrlongg 75ac7f80b9 some refactor + tests 2023-11-28 15:17:46 -06:00
spencerrlongg d167ec6dc0 unique undeleted recreated with laravel rule 2023-11-01 13:36:35 -05:00
spencerrlongg e05af5216e formatting 2023-11-01 12:14:46 -05:00
spencerrlongg 3f834cb88f authorization tested in request 2023-11-01 11:43:53 -05:00
spencerrlongg 53bd5626c9 this works, need to write up pr 2023-11-01 11:33:29 -05:00
spencerrlongg b67b00dd82 this is a start, something up with asset_tag unique rule 2023-10-31 21:06:44 -05:00
Robert-Azelis 47186b0abe
[FIX] Custom report - date fields error
Custom report in v6.2.3 give Error if selected are fields:
Purchase Date, Checkout Date, Last Checkin Date, Expected Checkin Date
Reason is: date field format
2023-10-22 16:28:44 +02:00
snipe f2fb5b43e3 Added custom report validator
Signed-off-by: snipe <snipe@snipe.net>
2023-10-18 14:12:52 +01:00
Marcus Moore 4caa501996 Relax property type check 2023-09-07 13:28:32 -07:00
Marcus Moore 899c2eb19b Implement test case 2023-09-07 12:34:50 -07:00
snipe da4841987e Use translation string
Signed-off-by: snipe <snipe@snipe.net>
2023-05-03 10:55:30 -07:00
snipe 5759d2c948 Added a check to fail validation if the associated fieldsets are not value
Signed-off-by: snipe <snipe@snipe.net>
2023-04-25 21:30:47 -07:00
snipe 16dcc2d3ed Fixed #12641 - add JSON to mimes
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 06:57:43 -07:00
snipe 45b5a8b6ab Catch exception if the file can’t be handled via Intervention
Signed-off-by: snipe <snipe@snipe.net>
2023-03-07 15:56:36 -08:00
snipe ff895739f4
Merge pull request #12446 from Godmartinz/livewire_slack_inputs
Adds Livewire slack inputs
2023-02-15 13:27:07 -08:00
snipe cd5546e4a1 Fixed wonky switch statement indenting
Signed-off-by: snipe <snipe@snipe.net>
2023-02-06 12:44:17 -08:00
Godfrey M 3a86547ef5 fixes messages for integration test, removes slack request file, rehouses ajax method 2023-02-01 16:51:05 -08:00
Godfrey M f95a904d90 adds integration button, working on its functionality 2023-02-01 12:08:13 -08:00
snipe a0aed19f95 Refactor image handler
Signed-off-by: snipe <snipe@snipe.net>
2023-01-21 18:05:55 -08:00
snipe 9d0a15990e Check that the $use_db_field has a value before attempting a delete
Signed-off-by: snipe <snipe@snipe.net>
2023-01-13 11:26:11 -08:00
snipe 9c63f426d9 Added missing translation string
Signed-off-by: snipe <snipe@snipe.net>
2023-01-04 14:09:14 -08:00
snipe 9aac1cbba4 Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Console/Commands/MoveUploadsToNewDisk.php
#	app/Http/Controllers/ActionlogController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Assets/AssetCheckinController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/BulkUsersController.php
#	app/Http/Requests/AssetCheckoutRequest.php
#	app/Importer/LicenseImporter.php
#	app/Models/Actionlog.php
#	app/Models/License.php
#	app/Models/User.php
#	app/Observers/AssetObserver.php
#	composer.lock
#	config/version.php
#	database/factories/LicenseFactory.php
#	database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
#	database/migrations/2018_10_18_191228_add_kits_licenses_table.php
#	database/migrations/2018_10_19_153910_add_kits_table.php
#	database/migrations/2018_10_19_154013_add_kits_models_table.php
#	database/migrations/2019_02_07_185953_add_kits_consumables_table.php
#	database/migrations/2019_02_07_190030_add_kits_accessories_table.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/ar/general.php
#	resources/lang/ar/passwords.php
#	resources/lang/cs/general.php
#	resources/lang/cs/passwords.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/fr/admin/custom_fields/general.php
#	resources/lang/fr/admin/hardware/general.php
#	resources/lang/fr/admin/locations/table.php
#	resources/lang/fr/admin/settings/message.php
#	resources/lang/hu/admin/custom_fields/general.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/general.php
#	resources/lang/it/admin/settings/general.php
#	resources/lang/nl/admin/custom_fields/general.php
#	resources/lang/nl/admin/settings/general.php
#	resources/lang/nl/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/sv-SE/passwords.php
#	resources/lang/tr/general.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/reports/activity.blade.php
#	resources/views/users/print.blade.php
2022-04-28 17:49:06 +01:00
snipe b2087a9947 Adds validator to make sure the status ID is deployable
Signed-off-by: snipe <snipe@snipe.net>
2022-04-15 13:06:55 +01:00