DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10844 commits 101 branches 268 tags 288 MiB
Commit graph

10844 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 1e7986d75b
Limit ChipperCI to running on push to master or develop 2023-05-09 16:39:56 -07:00
snipe a43dea3c04 Merge remote-tracking branch 'origin/develop' 2023-05-09 16:29:53 -07:00
Marcus Moore 1f11a8a2c1
Configure Dusk for ChipperCI 2023-05-09 14:45:18 -07:00
Marcus Moore 8d205e80e5
Add ejected pipeline configuration for ChipperCI 2023-05-09 14:44:43 -07:00
snipe 2d5da67b1e
Merge pull request #12982 from akemidx/feature/sc-23214 
Buttons on the Accessory View Page
 2023-05-09 14:26:28 -07:00
snipe 7dd41aa574 Removed whitespace 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 15:49:12 -07:00
snipe c4d40cdbd4 Merge remote-tracking branch 'origin/develop' 2023-05-08 15:11:25 -07:00
snipe b76c5206ff
Merge pull request #12986 from snipe/features/import_backup_filename 
Pass filename to pre-import backup
 2023-05-08 15:08:59 -07:00
snipe 17efc78816
Merge pull request #12985 from snipe/fixes/increase_state_from_3_chars 
Increase state from 3 chars
 2023-05-08 15:08:44 -07:00
snipe 332b017dcc Pass filename for manual backups 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 15:00:02 -07:00
snipe 5960a5425d Pass filename to pre-import backup 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 14:48:26 -07:00
snipe 277618bf16 Added maxlenth to form fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 14:13:24 -07:00
snipe f84f4ffe99 Migration to embiggen state fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 14:13:06 -07:00
snipe f1d85c67f1 Make validation match database fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 14:12:54 -07:00
snipe 6cb6beb6c7 Merge remote-tracking branch 'origin/develop' 2023-05-08 13:21:43 -07:00
snipe 6486ea4fb7
Merge pull request #12976 from inietov/fixes/validate_soft-deleted_models_in_asset_model 
Refactor of #12955
 2023-05-08 13:14:02 -07:00
snipe d685335aea
Merge pull request #12975 from inietov/fixes/import_asset_notes 
Fixed Notes field doesn't get populate when creating/updating assets via Importer [sc-23222]
 2023-05-08 13:11:50 -07:00
snipe d70e14de61
Merge pull request #12972 from marcusmoore/bug/sc-23177 
Fixes user name missing in accessory acceptance notifications
 2023-05-08 13:04:37 -07:00
snipe 480ef23505 Merge remote-tracking branch 'origin/develop' 2023-05-08 12:44:01 -07:00
snipe 4503815ad7
Merge pull request #12984 from snipe/features/check_for_zip_in_backup_filename 
Check that the filename we pass ends in zip, add it if not
 2023-05-08 12:43:34 -07:00
snipe ba462d1e93 Check that the filename we pass ends in zip, add it if not 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 12:41:32 -07:00
snipe 3429d1f4b4 Merge remote-tracking branch 'origin/develop' 2023-05-08 12:22:22 -07:00
snipe 0f76eda4af
Merge pull request #12983 from snipe/features/add_optional_filename_to_backup_artisan 
Add optional filename to backup
 2023-05-08 12:21:55 -07:00
snipe 85243423cf Add optional filename to backup 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 12:20:43 -07:00
snipe a73205f228 Merge remote-tracking branch 'origin/develop' 2023-05-08 11:24:03 -07:00
snipe 06ffe64f62
Merge pull request #12981 from snipe/fixes/wonky_div_when_saml_disabled 
Fixed misplaced div when saml is disabled
 2023-05-08 11:22:54 -07:00
snipe 223ff5e97e Fixed misplaced div when saml is disabled 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-08 11:20:26 -07:00
snipe fe40902765 Merge remote-tracking branch 'origin/develop' 2023-05-06 06:37:29 -07:00
snipe 689ef433b3
Merge pull request #12979 from snipe/fixes/added_use_for_fieldsets_controller 
Added missing use statement
 2023-05-06 06:37:01 -07:00
snipe 8b73fa0053 Added missing use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-06 06:36:09 -07:00
snipe 3d345d15ac Merge remote-tracking branch 'origin/develop' 2023-05-04 11:01:15 -07:00
snipe 4efa84270a
Merge pull request #12974 from snipe/fixes/show_sig_column_regardless_of_sig_status 
Show signature column in asset history regardless of “require sig” state
 2023-05-04 11:00:51 -07:00
snipe 60515f1262 Show signature column regardless of “require sig” state 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-04 10:56:35 -07:00
Ivan Nieto Vivanco fbb7c55450 Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models 2023-05-04 03:12:36 -06:00
Ivan Nieto Vivanco 89fbd60d97 Restore the 'Asset Notes' and 'Model Notes' in the Map Asset Import Fields form 2023-05-04 02:00:04 -06:00
Marcus Moore 96c6d8896f
Add additional information to acceptance notifications for assets, accessories, and consumables 2023-05-03 17:04:01 -07:00
Marcus Moore 9efe13bb5e
Capitalize "declined" in acceptance in notification 2023-05-03 17:03:22 -07:00
Marcus Moore 4a0b3efd1f
Include user's name in Acceptance result notifications for accessories 2023-05-03 14:22:05 -07:00
Marcus Moore f96d8fe674
Add CheckoutAcceptance factory 2023-05-03 14:21:13 -07:00
snipe 5950ec27ab Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2023-05-03 13:49:36 -07:00
snipe cd6f6ee8ff Bumped version to 6.1.1-pre 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 13:47:46 -07:00
akemidx 526c089424 Buttons on the accessory view page 2023-05-03 16:40:06 -04:00
akemidx 67105528d1 Buttons on the accessory view page 2023-05-03 16:31:56 -04:00
akemidx 12f0c42545 buttons added 2023-05-03 16:31:56 -04:00
snipe fe710efb40
Merge pull request #12874 from Godmartinz/feature/sc-23130 
Adds a checkout range for custom asset reports
 2023-05-03 11:43:44 -07:00
snipe fc53b56481
Merge pull request #12955 from inietov/fixes/error_500_after_sign_and_accept_asset 
Fixed Error 500 after sign and accept asset
 2023-05-03 11:43:14 -07:00
snipe b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset 
Added ability to auto-add fields to new fieldsets
 2023-05-03 11:04:33 -07:00
snipe ea17fdeba5
Merge pull request #12846 from snipe/features/livewire_location_import 
Location importer via Livewire Importer
 2023-05-03 11:02:06 -07:00
snipe f5cd58e9b7 Unmix return type variables 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:57:02 -07:00
snipe da4841987e Use translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 10:55:30 -07:00