ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,374 Commits 84 Branches 293 Tags
0004d4936caf2e7db8d4de197d47ffc2df51d2bf
Commit Graph

1639 Commits

Author SHA1 Message Date
snipe 2eb727bd0c Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-09 13:51:56 +01:00
snipe 57af507170 Added deleted button to locations, check for additional relations 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-09 12:20:34 +01:00
snipe 9604ecebad Fixed jobtitle in advanced search 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-08 12:01:59 +01:00
snipe f340390fc8 Merge pull request #17703 from marcusmoore/17369-accessory-checkout-qty-scaffold 
Fixed issues around accessory acceptance
 2025-09-08 09:09:26 +01:00
snipe c5bede8594 More small display_name fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-04 17:15:06 +01:00
Marcus Moore d29e09a3ff Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold 
# Conflicts:
#	resources/views/account/accept/create.blade.php
#	resources/views/account/accept/index.blade.php
 2025-09-03 12:26:43 -07:00
Godfrey M db9f85e9da Merge branch 'develop' into checkin_non_reassignable_license 
# Conflicts:
#	app/Models/License.php
#	resources/views/licenses/view.blade.php
#	tests/Feature/Checkins/Api/LicenseCheckInTest.php
 2025-09-03 11:09:51 -07:00
snipe b06c58fe7b Switch to older style rules for consistency 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:06:27 +01:00
snipe f5c8b3eb04 Fixed #17791 - increase size of purchase cost field 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 15:03:49 +01:00
snipe 739980aa09 Merge pull request #16947 from Godmartinz/add-require-serial-to-models 
Adds require serial as Asset Model option
 2025-09-03 14:53:15 +01:00
snipe 52140dbe06 Log upload deletion 
Signed-off-by: snipe <snipe@snipe.net>
 2025-09-03 08:37:42 +01:00
snipe 7b5d90dd81 Moved model traits into proper directory 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-28 18:23:26 +01:00
snipe cfc979acf0 Merge pull request #17432 from oolivero45/patch-1 
Fixed #17431: EULA not displaying on asset acceptance page
 2025-08-28 16:09:36 +01:00
Godfrey M 95be847d87 renamed attribute 2025-08-27 14:10:51 -07:00
Godfrey M 648c25a0a7 adds item type to Accept asset index 2025-08-27 14:06:10 -07:00
Marcus Moore 4298aad008 Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold 
# Conflicts:
#	app/Http/Controllers/Account/AcceptanceController.php
#	resources/views/notifications/markdown/asset-acceptance.blade.php
 2025-08-26 11:39:52 -07:00
Brady Wetherington e74460aefc Merge branch 'develop' into improve_ldap_certifcate_ignoring 2025-08-26 15:01:11 +01:00
Brady Wetherington 55a5a12b30 Formalize the 'double-barrel' method of setting TLS cert ignores 2025-08-26 15:00:33 +01:00
Brady Wetherington 15e64155b5 Add version checking to LDAP troubleshooter, clean up ldap model 2025-08-26 13:57:25 +01:00
snipe 47b2b30455 Merge pull request #17710 from akaspeh1/develop 
Adds support for label sheets Avery L4736 & L6009
 2025-08-26 12:42:02 +01:00
Jakub Aqaba Štarman be0f3910bb Fixed: Old computation 2025-08-25 16:57:32 +02:00
snipe 07dbc6842c Are you KIDDING ME, Github?? 
This reverts commit c8e79aa5ca, reversing
changes made to e60f2b2332.

Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 15:56:28 +01:00
Jakub Aqaba Štarman 5a16b59462 Adds support for label sheets Avery L4736 & L6009 2025-08-25 16:47:52 +02:00
Brady Wetherington 13cd7071b8 WIP improving some LDAP stuff 2025-08-25 15:41:01 +01:00
snipe c8e79aa5ca Merge branch 'develop' into add-display-name-to-users-fixed 2025-08-25 15:28:20 +01:00
snipe e60f2b2332 Tightened up accessor code for better inheritence 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 15:00:10 +01:00
snipe b6d397bcca Updated ->present()->fullName() to ->display_name 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-25 14:57:34 +01:00
snipe 6503f9c667 Revert "Merge pull request #17650 from grokability/add-displayName-to-users" 
This reverts commit 4770e469b4, reversing
changes made to 29a18c7c8b.

Signed-off-by: snipe <snipe@snipe.net>
 2025-08-21 20:23:47 +01:00
snipe 4770e469b4 Merge pull request #17650 from grokability/add-displayName-to-users 
Add display name to users for LDAP/SCIM, added new sync fields
 2025-08-21 18:22:34 +01:00
Marcus Moore 18c2508d2f Scaffold command for cleaning accessory_checkout 2025-08-20 13:49:19 -07:00
snipe e0bb77a6d6 Merge pull request #17664 from FlorestanII/feature/support-for-dymo-11354-labels 
Support for Dymo 11354 Labels.
 2025-08-20 12:43:29 +01:00
snipe 9c06ff3899 Check for numeric 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-20 11:00:18 +01:00
Marcus Moore 9caa240fdb Revert "Remove total qty of accessory checkouts" 
This reverts commit 3ffb73a516.
 2025-08-19 17:17:46 -07:00
Marcus Moore 3ffb73a516 Remove total qty of accessory checkouts 2025-08-19 17:04:13 -07:00
snipe 2d6270c697 Updated validation, switch to string() as db field type 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 19:19:29 +01:00
Johannes Pollitt 765051ce88 Added LabelWriter for 11354 format labels. 
Printable for example with the Dymo LabelWriter 450.
 2025-08-19 19:21:48 +02:00
snipe 4b8c371097 Updated true to false 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:59:28 +01:00
snipe 0c3103e3d2 Modify the getter 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:56:30 +01:00
snipe ced30082a6 Added display_name as user field 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 12:10:28 +01:00
snipe f6c64abc1a Fixed #17641 - map mobile number via SCIM 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-19 11:41:02 +01:00
snipe 3b243b38c8 Fixed #9965 - fallback to category images (f there are any) when no consumable image is present 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-15 15:03:09 +02:00
snipe ef35a0f2f1 Fixed #10284: Added mobile phone to users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-11 18:38:22 +01:00
snipe ea84728a3f Rename models uploads dir 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 17:58:11 +01:00
snipe d14b34141c Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 15:53:53 +01:00
snipe 14bc2cc1ba Added basic logging for maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 15:51:48 +01:00
snipe deb1afd28b Few more replcamenents 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 14:14:21 +01:00
snipe 9e8eead71e Renamed routes and method names 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 13:29:48 +01:00
snipe 205725c767 Renamed model 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-10 12:30:50 +01:00
snipe a5e37519f5 Merge pull request #17539 from grokability/add-file-uploads-to-maintenances 
WIP: Add file uploads to maintenances
 2025-08-10 11:13:19 +01:00
snipe 5744e48ae8 Added getDisplayNameAttribute() to maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2025-08-08 12:54:36 +01:00