DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11434 commits 97 branches 266 tags 291 MiB
Commit graph

11434 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe e920199626
Merge pull request #13567 from johnson-yi/fixes/add_default_location_to_checkin_actionlog 
Add default location to tracked changes on checkin actionlog
 2023-09-06 09:37:04 +01:00
johnson-yi 5897f4d6d9
Add rtd_location_id to tracked changes on checkin actionlog 2023-09-06 00:36:48 +00:00
snipe a67888f3d3
Merge pull request #13547 from inietov/fixes/Attempt_to_read_property_asset_tag 
Fixed ErrorException: Attempt to read property "asset_tag" on null (rollbar #3541)
 2023-09-05 20:26:21 +01:00
Ivan Nieto Vivanco 91b1cc7121 Move the early return to the controller instead of the Label model 2023-09-05 13:23:51 -06:00
snipe d6dd332b09
Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog 
Added/Fixed: track changes on asset checkin/out
 2023-09-05 19:08:49 +01:00
snipe 65a76c599c Added inline=true to image preview modal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 18:35:07 +01:00
snipe f53db8ba75 Fixed #13562 - allow inline view for uploaded files 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 18:28:01 +01:00
snipe e486fe2794 Removed soft-delete query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 16:10:20 +01:00
snipe 26452a8a29
Merge pull request #13565 from snipe/fixes/asset_history_500_on_hard_deleted_models 
Account for hard-deleted models, suppliers
 2023-09-05 16:06:40 +01:00
snipe f85df6bb8c Use same method of accessing companies as others 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 16:02:28 +01:00
snipe 2acf2b880e Account for hard-deleted models, suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-05 15:58:21 +01:00
snipe b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost 
Added users total cost of assets to user profile
 2023-09-05 13:52:34 +01:00
snipe a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report 
Added last check in column and filter to custom asset report
 2023-09-05 13:22:15 +01:00
Johnson Yi 09f7b3debe Track changes on asset checkin/out 2023-09-01 13:12:07 +10:00
Marcus Moore da7d6f6f77
Merge branch 'develop' into update-testing-documentation 2023-08-31 10:36:06 -07:00
snipe f08cef8664
Merge pull request #13556 from snipe/feature/sc-23684 
Added model name and number to dynamic url
 2023-08-31 18:23:33 +01:00
snipe e192cbbbe1
Merge pull request #13550 from marcusmoore/remove-dusk 
Removed Dusk
 2023-08-31 18:06:04 +01:00
snipe 83b178f5b2 Added model name and number to dynamic url 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-31 18:03:32 +01:00
snipe c51574099f
Merge pull request #13507 from Godmartinz/ignore_encrypt_and_other_changes 
Added eager loading for `changedinfo` and removed encrypted values from Asset history
 2023-08-31 13:04:39 +01:00
snipe 9a0f691f05
Merge pull request #13546 from snipe/fixes/make_boolean_user_fields_more_consistant 
Don’t cast as boolean, do validate as boolean for User validation
 2023-08-31 12:01:20 +01: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
Marcus Moore 5828d29952 Remove Dusk 2023-08-30 16:43:18 -07:00
Marcus Moore 417b2c8331 Update testing documentation 2023-08-30 11:27:26 -07:00
snipe 663faffcc1 Un-cast byod, validate as boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 19:13:55 +01:00
snipe fb455be406 Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 19:13:38 +01:00
Ivan Nieto Vivanco 085a993340 Early return if no asset is found 2023-08-30 11:05:58 -06:00
Marcus Moore 07c3fe1fce Update assertions to account for type change 2023-08-30 09:42:53 -07:00
snipe 2a93c38830 Don’t cast as boolean, validate as boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 16:40:28 +01: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
Godfrey Martinez 0ac5d4d582
Merge pull request #8 from Godmartinz/fix-companyable 
Fix companyable
 2023-08-28 19:38:27 -07:00
Godfrey Martinez d86c63cf23
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable 2023-08-28 19:38:16 -07:00
Godfrey M 74f45a4473 reworks company queries for asset history 2023-08-28 19:35:46 -07: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
Godfrey Martinez 92e88a0ae2
Merge branch 'develop' into ignore_encrypt_and_other_changes 2023-08-28 10:14:41 -07: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