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

11559 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 2a1aa53ba6 Merge remote-tracking branch 'origin/develop' 2023-08-31 13:04:56 +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 821c3085f0 Merge remote-tracking branch 'origin/develop' 2023-08-31 12:01:58 +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 3cf9c1fea5 Adds a null coalescing operator to the license seat checkin notification 2023-08-30 11:57:29 -06: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 587a787b5d Fixed bug introduced in #13528 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 15:50:28 +01:00
snipe 305804f260 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	package-lock.json
#	public/css/dist/all.css
#	public/js/dist/all-defer.js
#	public/mix-manifest.json
 2023-08-30 15:50:09 +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 319cb2305d Merge remote-tracking branch 'origin/develop' 2023-08-30 15:05:46 +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 18ff810d7e Reverse orderof parent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:51:52 +01:00
snipe baffcbad71 Set password property properly 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:47:56 +01:00
snipe 611db4c0d2 Removed stray line 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 20:46:45 +01: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 0f43388a2b Merge remote-tracking branch 'origin/develop' 2023-08-28 20:40:12 +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 b93adf44c8 Merge remote-tracking branch 'origin/develop' 2023-08-28 12:41:45 +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 a1897298dc Merge remote-tracking branch 'origin/develop' 2023-08-27 13:56:54 +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
snipe 0a47706e46 Merge remote-tracking branch 'origin/develop' 2023-08-25 15:47:47 +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