DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
11327 commits 97 branches 266 tags 292 MiB
Commit graph

11327 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 56e6205667 Formatting 2023-09-07 12:45:03 -07:00
Marcus Moore 899c2eb19b Implement test case 2023-09-07 12:34:50 -07:00
Marcus Moore 1c3c36f2a0 Begin to implement patch test 2023-09-06 16:14:14 -07:00
Marcus Moore a799659610 Scaffold tests and add context 2023-08-30 17:33:23 -07:00
Marcus Moore 999605f832 Add failing test 2023-08-30 17:10:50 -07:00
snipe c0cbdb1fc4 Fixed bug introduced in #13528 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 15:48:35 +01:00
snipe 5cf8c36698 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 15:43:06 +01:00
snipe 1bcc74f156 Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.4.2 #13527 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 15:41:11 +01:00
snipe 9ebcde4472 Upgrade less from 4.1.2 to 4.2.0 #13534 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 15:40:56 +01:00
snipe fbc04cfd47 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 15:07:38 +01:00
snipe b109ee281a
Merge pull request #13544 from marcusmoore/bug/sc-23675 
Fixed user search not adhering to company scoping
 2023-08-30 08:54:41 +01:00
Marcus Moore 806ab2cb9d Ensure users are scoped by company in index method 2023-08-29 16:17:29 -07:00
Marcus Moore aafa1ab70e Add failing test 2023-08-29 16:15:13 -07:00
snipe 22d136df46
Merge pull request #13528 from inietov/fixes/cloning_model_blanks_fieldset 
Fixed #12548 Cloning a model blanks fieldset of new one
 2023-08-29 19:14:38 +01:00
Ivan Nieto Vivanco 4e4ba38038 Pass the model_id variable in the controller and get it only if we are cloning the asset model 2023-08-28 16:23:26 -06:00
snipe 367484a766
Merge pull request #13537 from snipe/fixes/13500_prevent_autocomplete_on_ldap_password 
Fixed #13500 - Try to prevent the browser from pre-filling the LDAP password
 2023-08-28 20:42:58 +01:00
snipe 81365ef911
Merge pull request #13518 from marcusmoore/chore/tests-via-github-actions 
Run tests for PHP 7.4, 8.0, and 8.1.1 via GitHub Actions
 2023-08-28 20:28:42 +01:00
snipe 6020927e24
Merge pull request #13538 from snipe/fixes/13516_use_int_not_string_for_port_default 
Fixed #13516 - Use int not string if no DB_PORT specified
 2023-08-28 19:38:41 +01:00
snipe 82981290d4 Use int not string if no DB_PORT specified 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 19:34:08 +01:00
snipe 7787ca328c Try to prevent the browser from pre-filling the LDAP password 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 18:36:06 +01:00
snipe 535ca0e3c0
Merge pull request #13535 from snipe/fixes/13521_make_modal_upload_button_wider 
Fixed #13521 - make modal “select files” button wider
 2023-08-28 12:41:27 +01:00
snipe 582cad2dc5 Fixed #13521 - make modal “select files” button wider 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 12:37:42 +01:00
snipe e3a9c34818
Merge pull request #13533 from snipe/improvements/labels_clearer_barcode_text 
Clearer labels barcode text
 2023-08-26 18:08:10 +01:00
snipe 20e9f05a64 Tighter layout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-26 17:43:02 +01:00
snipe 844fe0938c Added link to the help docs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-26 17:42:56 +01:00
Ivan Nieto Vivanco a12a68e4e9 Add a variable so I dont ended rewriting the original model 2023-08-24 15:28:12 -06:00
Ivan Nieto Vivanco 950536f59f Added a condition to send correct model id when cloning one 2023-08-24 15:18:51 -06:00
snipe 26dd992d3c
Merge pull request #13525 from marcusmoore/bug/sc-23660 
Fixed undeclared variable in ActionlogsTransformer
 2023-08-24 17:09:30 +01:00
Marcus Moore e32c07be02 Clear commented log statements 2023-08-24 08:15:40 -07:00
Marcus Moore 5a0b0522b0 Explicitly declare $clean_meta variable 2023-08-24 08:15:07 -07:00
Marcus Moore 20457bd89e Run tests for PHP 7.4, 8.0, and 8.1.1 2023-08-23 15:53:34 -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
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
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
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