DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12044 commits 96 branches 267 tags 296 MiB
Commit graph

12044 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 27488c1009 adds soft deletes to eager loading 2023-08-23 00:34:09 -07:00
Godfrey M ce60db009c adds soft deletes to eager loading 2023-08-23 00:32:43 -07:00
snipe d393bd5c97
Merge pull request #13511 from snipe/fixes/13510_no_translations_in_migrations 
Fixed #13510 - do not use translations in migrations
 2023-08-23 08:21:18 +01:00
snipe ea37325806 Remove trans() from default values 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-23 08:19:05 +01:00
snipe 31a7758ab1
Merge pull request #13509 from marcusmoore/bug/sc-23636 
Fixed asset model query in action log transformer
 2023-08-23 06:58:41 +01:00
Marcus Moore bee680683d Add withTrashed to asset model query 2023-08-22 17:05:06 -07:00
Godfrey M 92ddf8fc67 removed dead space 2023-08-22 12:38:50 -07:00
Godfrey M 1019287c76 retarget key 2023-08-22 12:36:43 -07:00
Godfrey M 9e438c3ed0 eager loaded changedInfo queries, reworked encrypted data change log changes 2023-08-22 12:34:45 -07:00
Godfrey M c7f2acf2c6 removes encrypted info from change log, renames asset_eol_date in the change log 2023-08-22 11:39:38 -07:00
snipe 79b330f492
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error 
Fixed Asset acceptance error when user company and asset company don't match
 2023-08-22 15:49:56 +01:00
snipe 3da21e73e2
Merge pull request #13501 from snipe/fixes/checkbox_layout_in_settings 
Small fixes to checkbox layout in general settings blade
 2023-08-22 14:12:15 +01:00
snipe da38945a53 Small fixes to checkbox layout in general settings blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-22 14:10:39 +01:00
snipe a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order 
Fixed #13495 added setting for name order
 2023-08-22 12:50:58 +01:00
snipe 23237e5cd3 Removed unused translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-22 12:50:32 +01:00
snipe aafb7668f5
Merge pull request #13453 from inietov/fixes/accessories_declined_issue 
Fixed #13317 Accessories declined by user remain assigned
 2023-08-22 12:42:55 +01:00
snipe fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields 
Bulk Editing Custom Fields
 2023-08-22 12:40:18 +01:00
snipe 303b45c9e9
Merge pull request #13485 from Godmartinz/history_info_clean_up 
Added better handling of information of asset history
 2023-08-22 12:25:17 +01:00
snipe 8c7925e703
Merge pull request #13436 from marcusmoore/chore/dependency-updates 
Bumped dependencies
 2023-08-21 22:58:52 +01:00
Marcus Moore 191c4f959f Bump guzzlehttp/psr7 to 2.4.5 2023-08-21 14:46:08 -07:00
Marcus Moore 1e10a7ee23 Bump nyholm/psr7 to 1.6.1 2023-08-21 14:45:21 -07:00
Marcus Moore 4e8537a1c7 Merge branch 'develop' into chore/dependency-updates 
# Conflicts:
#	composer.lock
 2023-08-21 14:44:15 -07:00
Marcus Moore 4e2ef4f056 Default to using the current date if last check in end date is not provided 2023-08-21 14:35:15 -07:00
snipe 79a4d915db
Merge pull request #13456 from marcusmoore/fixes/auto-incrementing-on-74 
Fixed passing invalid argument to `strpos()`
 2023-08-21 22:25:52 +01:00
Marcus Moore c332b98456 Add last checkin options to report front end 2023-08-21 13:44:49 -07:00
Godfrey M b54aaefefb adds some spacing 2023-08-21 13:43:06 -07:00
Godfrey M 5076b45a0d adds id to history info 2023-08-21 13:40:39 -07:00
Marcus Moore 6fc06f2ee1 Add simple tests around asset check in 2023-08-21 12:31:51 -07:00
snipe 36a343365e Switched from fullName() to getFullNameAttribute() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:14:07 +01:00
snipe c617bf89b6 Tweak layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:13:45 +01:00
snipe ba0643f6a4 Added name display format, tweaked some 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:13:28 +01:00
snipe bfd674b622 Switched to getFullNameAttribute() from fullName() in User Presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:12:25 +01:00
snipe d73d15b8a2 Added form macro for name format 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:59 +01:00
snipe 8660d41aa3 Changed width of locale field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:45 +01:00
snipe c39579b170 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:25 +01:00
snipe 354550b52e Removed getCompleteNameAttribute(), modified getFullNameAttribute() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:17 +01:00
snipe f3460b5a4f Switch to getFullNameAttribute() in user transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:10:48 +01:00
snipe 474c03e3fc Added name order to settings save controller method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:10:03 +01:00
snipe 749002b768 Added migration to add name order to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:09:48 +01:00
Marcus Moore 489d30c685 Set last_checkin in ui and api controllers 2023-08-21 11:57:33 -07:00
snipe 2346bab8ed
Merge pull request #13492 from snipe/features/add_dymo_labelwriter 
Added Dymo labelwriter
 2023-08-18 23:27:37 +01:00
snipe 45898deb1a Don’t 500 if the 1D barcode doesn’t match the format requested - log an error instead 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:38 +01:00
snipe ffc7c4e99a use number format to constrain large number displays 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:09 +01:00
snipe 1e82c2bfad Changed example asset name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:17:54 +01:00
snipe d12f4564e1 Added Dymo Labelwriter template 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:44:12 +01:00
snipe 1dcca14c37 Values are not sortable, so don’t show them as sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:21:54 +01:00
snipe 63f847f125
Merge pull request #13491 from snipe/fixes/remove_border_from_default_label 
Removed the black label from around the default labels
 2023-08-18 18:40:45 +01:00
snipe d56c671410 Removed the black label from around the default labels 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:39:00 +01:00
snipe 802651a1b4
Merge pull request #13489 from snipe/fixes/override_0_cols_rows_in_default_for_new_engine 
Make sure the columns and rows can never be 0
 2023-08-18 18:14:01 +01:00
snipe 0cb76a049a Make sure the columns and rows can never be 0 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:13:16 +01:00