DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 16:27:35 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12543 commits 89 branches 265 tags 290 MiB
Commit graph

4952 commits

Author SHA1 Message Date
Brady Wetherington 82dd601661 Added back-migration for Big Locale Refactoring 2023-12-19 19:54:04 +00:00
snipe db138479aa Updated locale middleware for mapping 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:43:22 +00:00
snipe 081bd69d5a Added helper method to map values 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:43:05 +00:00
snipe 2226bd2cd7 Implement 1D barcode for label "Tapes\Dymo\LabelWriter_30252" #13987 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 14:03:55 +00:00
snipe fe51d0ef79
Merge pull request #14055 from snipe/bug/disallow_arrays_for_model_id_in_api_hardware_update 
Make sure we're getting an object instead of a collection on Asset API for model_id
 2023-12-19 13:30:54 +00:00
snipe f9139e0f10 Changed to use instanceof 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 13:25:32 +00:00
snipe 79ad598673
Merge pull request #14050 from marcusmoore/add-logging-to-checking-alerts-command 
Added log message for who is being sent expected checkin notifications
 2023-12-19 13:14:04 +00:00
snipe f13c1a53ef Get an object instead of a collection 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 12:51:35 +00:00
snipe f08ce34036 Fixed translation string in JSON 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 12:31:55 +00:00
akemidx 85bfbf8bc4 email in table, shows in export 2023-12-18 20:15:06 -05:00
Marcus Moore 1708897726
Add log message for who is being sent expected checkin notifications 2023-12-18 17:14:03 -08:00
akemidx 3fe3697a29 adding column, needs table join 2023-12-18 18:26:47 -05:00
snipe e1d2fdcfb7
Merge pull request #14001 from Godmartinz/feature/sc-18577 
Added Status Label names to Asset history/ Action log
 2023-12-18 22:41:02 +00:00
snipe 444c41bedb Fixed #14037 - record current time on accessory checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-15 16:39:18 +00:00
snipe 130be26820
Merge pull request #14031 from snipe/bug/ldap_undefined_search_base 
Fixed undefined $search_base
 2023-12-15 13:33:34 +00:00
snipe 421802893e Added new fields to action report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-15 10:45:22 +00:00
snipe 7aabf94a35 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:43:38 +00:00
snipe f5f136b9b5 Added fields to history views 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:34:31 +00:00
snipe a90b04c905 Allowed sorting on user_agent, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:34:08 +00:00
snipe 40052e99a7 Added user agent to log method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:33:39 +00:00
snipe 70303c2b2d Added searchable fields, improved formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 14:33:25 +00:00
snipe 5df6575c37 Fixed undefinted $search_base 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-14 00:11:02 +00:00
snipe 016ca1adc1 Fixed HTML for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-13 06:27:50 +00:00
snipe b53a4c366e Removed escaping on notes on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 13:26:41 +00:00
snipe e894138fd4 Added $user->created_at to API user create method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 12:26:02 +00:00
snipe 631dd58de1 Added model name and number to quickscan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 04:23:04 +00:00
snipe e7a9c7ec99
Merge pull request #14008 from akemidx/sc20532_change_log_level 
Change log level on status label colors above 256
 2023-12-08 09:01:28 +00:00
snipe aa4aaf69b0 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-08 08:58:45 +00:00
akemidx f112e31b46 changing log level from ERROR to LOG 2023-12-07 17:56:10 -05:00
akemidx dc83689553 changing log level from ERROR to LOG 2023-12-07 17:50:25 -05:00
snipe 778e45c9fd Fixed maintenances patch endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-07 19:36:12 +00:00
Brady Wetherington 6bd351c5d8 Whoops, didn't even add changes - duh 2023-12-07 14:08:15 +00:00
Godfrey M b90cfba796 adds status label id to line change 2023-12-05 11:56:54 -08:00
Godfrey M 49342a4542 added status names to asset history 2023-12-05 11:50:43 -08:00
snipe 1e46ecc2ee Added eula-pdfs to allow-list 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-04 15:33:56 +00:00
spencerrlongg 2d57b9399c more cleanup 2023-11-30 16:20:48 -06:00
spencerrlongg 6e5f296a13 gets rid of depreciate 2023-11-30 16:08:49 -06:00
spencerrlongg 68d85385a2 get rid of physical 2023-11-30 16:03:30 -06:00
spencerrlongg 88b6a541ee removed references to archived 2023-11-30 15:59:03 -06:00
spencerrlongg 133c469e36 organization 2023-11-30 14:25:58 -06:00
spencerrlongg 7e780c1187 cleanup rules formatting 2023-11-30 12:20:02 -06:00
spencerrlongg df954a3af2 return types 2023-11-30 12:06:58 -06:00
spencerrlongg 135b7bde7d added some more check out assertions 2023-11-30 11:53:26 -06:00
spencerrlongg d794608a09 note 2023-11-29 15:04:52 -06:00
spencerrlongg c3492f1699 fixed eol, add calculated eol/eol explicit tests 2023-11-29 14:57:31 -06:00
spencerrlongg 9d8433bd6d a couple quick things 2023-11-29 13:15:41 -06:00
snipe 3152df2c48 Created mutator for requestable attribute 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-29 10:07:47 +00:00
snipe c35d234cde
Merge pull request #13959 from snipe/fixes/rebased_bulk_edit_fix 
Fixed status and model in bulk edit
 2023-11-29 09:40:03 +00:00
spencerrlongg b17078fffd a couple notes 2023-11-28 22:15:13 -06:00
spencerrlongg c886fb555b checkout on store tests almost done 2023-11-28 22:11:20 -06:00
spencerrlongg 15d11f7f4e test checkout to user on store 2023-11-28 21:46:03 -06:00
spencerrlongg cba5f869c0 standardize some of the validation rules, fix int/string issue 2023-11-28 21:19:19 -06:00
spencerrlongg 4aae82fa38 cleanup validation rules a little 2023-11-28 17:28:17 -06:00
spencerrlongg 75ac7f80b9 some refactor + tests 2023-11-28 15:17:46 -06:00
snipe 899890b224 Use update array nomenclature 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 16:25:35 +00:00
snipe 2d4a14d4bb Fixed from rebase :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:55:41 +00:00
snipe 3b9f069627 Switched back to old version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:54:42 +00:00
snipe 2c6b957fbe Removed unused query 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:28:37 +00:00
snipe 6ae03a204b Added the model info back in 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:21:14 +00:00
snipe c91713e20a Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 15:14:55 +00:00
Brady Wetherington c71726c83e Whoops, left in some debug lines 2023-11-28 13:52:07 +00:00
Brady Wetherington ca430ec9b3 Modified re-crypter to also work when given a CLI old-key 2023-11-28 13:49:58 +00:00
snipe 9d786d9386 Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:43:33 +00:00
snipe 4723cfd4ba More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe f9d5c451bc Committing this for now - not done 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe 5574218966 More FAFO - cleanup needed, but model_id works now 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe c997ae44c2 FAFO troubleshooting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-28 13:33:32 +00:00
snipe 1217bff4b6
Merge pull request #13947 from snipe/fixes/refactor_checkout_with_bad_category 
Refactored checkout for items with bad or missing category
 2023-11-23 16:59:51 +00:00
Brady Wetherington 8916c976e1 Merge branch 'develop' into scim_active_flag 2023-11-23 16:36:17 +00:00
Brady Wetherington 7b12d511f8 Force active flag to be returned as true or false 2023-11-23 16:34:03 +00:00
snipe 81b2273c37 Refactored checkout screen to redirect if invalid category 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:18:28 +00:00
snipe 31f429e1c4
Merge pull request #13934 from snipe/fixes/escaped_asset_tag_in_return_msg 
Escape the asset tag before passing it to the view
 2023-11-22 23:21:54 +00:00
snipe 1307ef19cf Escape the asset tag before passing it to the view 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:20:47 +00:00
snipe aed6b531cb Derp. Extra return statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:05:38 +00:00
snipe ba127be344 Use saveQuietly to prevent double entries 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:00:30 +00:00
snipe f922d0518e Added allow list - quiet the observer down for magical laravel things 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:35:34 +00:00
snipe 45d9119733 Removed debugging/comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 22:32:34 +00:00
snipe e269415fec Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:55:44 +00:00
snipe 8481768c3d Save quietly for login methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:42:21 +00:00
snipe d3175b2ca4 Removed remember token from changed 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:39:06 +00:00
snipe a8123db4fb Fixed comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:35:12 +00:00
snipe b1e782d2f0 Small nits picked to make Brady happy 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:34:39 +00:00
snipe 58679a13eb Use updated icons for activity report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 21:07:07 +00:00
snipe 22246dd099 Unset the specific arrays we don’t want to keep 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:50:46 +00:00
snipe a7f76f9860 Hide certain fields from changelog 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:28:58 +00:00
snipe 8b79a8afdf Added user observer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:22:05 +00:00
snipe 20c0f687e9 Added restored to asset observer, removed manual logging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:09:10 +00:00
snipe d06cfe6502 Changed verb to “restore” from “restored” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 20:08:41 +00:00
snipe e2d0136336 Fixed goofy translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:14:44 +00:00
snipe 6a3ab526de Refactorer API controller restore methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:04:24 +00:00
snipe 19877244cd Added/refactorerd isDeletable() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:03:26 +00:00
snipe f7ccef16e7 Refactorer controller restore methods 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 18:02:47 +00:00
snipe 2353c8199c Set qty mutators 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 15:25:22 +00:00
snipe 0d29ac9856 Fixded gate return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 13:48:20 +00:00
snipe a08dcbdfdb Quick revert for #13830 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 12:25:42 +00:00
snipe d6a337a584 English hard 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:23:17 +00:00
snipe 83ee07cca1 Created mutator on category checkin_email 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 11:14:04 +00:00
snipe 68ac1aaae0 Additional comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:36:11 +00:00
snipe 6a2ab2cfb2 Removed line break 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:10:19 +00:00
snipe 590cd0c71f Added Validator::replace() for friendlier interpretation of validation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 15:03:59 +00:00
snipe 766eee78b2 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 13:47:49 +00:00
snipe 2b9e4110bc Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 13:37:56 +00:00
snipe 4eb435e148 Use unique_undeleted instead of unique_serial 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-21 12:36:11 +00:00
snipe b02c60c2ce
Merge pull request #13898 from Azooz2014/develop 
Fixed #13850: Too few arguments to function in App\Importer\UserImporter::fetchManager()
 2023-11-20 15:41:04 +00:00
snipe 01fec1d6bb Redirect back to the specific consumable for correction 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:39:39 +00:00
snipe 7c88601066 Grab the API 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:31:39 +00:00
snipe fe2cfa0d38 Redirect if category is missing or invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-20 15:28:44 +00:00
Abdelaziz Faki 2c62a7e78d
Fixing #13850 UserImporter bug 2023-11-19 19:59:01 +03:00
Godfrey Martinez 5569c2ba4a
Merge branch 'develop' into ldap_sync_bug 2023-11-16 10:02:56 -08:00
Godfrey M 2f12a9cfe2 add a conditional around location_id to fix bug 2023-11-16 09:52:44 -08:00
spencerrlongg b1f75a3bb3 remove unused import 2023-11-15 13:20:17 -06:00
spencerrlongg c7f90ad86d tested, working 2023-11-15 12:50:40 -06:00
spencerrlongg 0924a53789 quick fix 2023-11-15 12:28:30 -06:00
snipe 73ebd9017f Added default map back to the importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-14 14:37:48 +00:00
snipe 4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769 
Changed data source input to select in new label engine
 2023-11-13 20:38:42 +00:00
snipe 9dc9834bcb
Merge pull request #13859 from inietov/fixes/attempt_to_read_id_on_boolean 
Fixed ErrorExemption: Attempt to read property "id" on bool [sc-23945]
 2023-11-13 20:22:52 +00:00
snipe 4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations 
Added multi location sync for ldap
 2023-11-13 20:20:45 +00:00
snipe 000a28d648
Merge pull request #13830 from spencerrlongg/bug/sc-23921 
Resolves Exceptions When An Array is Submitted and Exception Occurs Before Validation
 2023-11-13 20:19:44 +00:00
snipe 0bae1a1f5e
Merge pull request #13853 from snipe/features/link_back_to_asset_on_create 
Link back to asset on create
 2023-11-13 16:37:35 +00:00
snipe 9e1cfac995
Merge pull request #13857 from akemidx/bug/sc-20532 
Bug Fix:  Undefined array key 266
 2023-11-09 09:39:04 +00:00
Ivan Nieto Vivanco 7d30001ff8 Ignore the importer checkout if user is not found 2023-11-08 15:32:33 -06:00
Marcus Moore 49136a4d67 Add tests for color helper 2023-11-08 12:35:42 -08:00
akemidx 4382adce85 typo in error log message 2023-11-08 15:29:29 -05:00
akemidx 2051ac785d adding in error logging and code comments 2023-11-08 13:44:46 -05:00
akemidx 9cc89911f7 possibilitieeeeeeeeessss 2023-11-08 13:29:32 -05:00
akemidx 495521b70e adjusting for less than 0 possibility 2023-11-08 12:51:51 -05:00
snipe ef10f2e50e Use more correct route in redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:38 +00:00
snipe 08153d418f Use new alert box and linked string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:40:18 +00:00
snipe b3a6cc633b
Merge pull request #13769 from Godmartinz/location-dropdown-duplication 
clarifies an address column under locations
 2023-11-08 08:59:07 +00:00
snipe bc9545ca96
Merge pull request #13823 from spencerrlongg/chore/sc-23922 
New Translation Strings for Custom Asset Export
 2023-11-08 08:57:20 +00:00
snipe 44d064f094
Merge pull request #13842 from marcusmoore/bug/sc-23932 
Fixed notes not saving to action log when licenses are checked in/out
 2023-11-08 08:53:00 +00:00
snipe 1171141904
Merge pull request #13848 from marcusmoore/bug/sc-23949 
Fixed missing import
 2023-11-08 08:50:31 +00:00
Marcus Moore eceb69122c Add missing import 2023-11-07 16:03:28 -08:00
akemidx 154e71de74 shifting wrap around logic back into 0-265 2023-11-07 17:43:51 -05:00
Marcus Moore a08e0bd547 Ensure notes are saved to the action log when licenses are checked in and out 2023-11-06 12:20:13 -08:00
snipe 7a638e4a65 RB-17457 - Object of class Illuminate\Database\Eloquent\Collection could not be converted to int 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-03 14:06:27 +00:00
Godfrey M 3b6a0d6525 allows multi location sync for ldap 2023-11-02 16:50:19 -07:00
snipe 4d65d09306 Removed trim on manager ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-02 14:50:40 +00:00
Godfrey M 13d3f85c62 fixes ldap location sync 2023-11-01 12:26:58 -07:00
spencerrlongg 938ec75aa7 clarifying note 2023-11-01 14:09:03 -05:00
spencerrlongg c9604b896a nevermind 2023-11-01 13:46:32 -05:00
spencerrlongg d167ec6dc0 unique undeleted recreated with laravel rule 2023-11-01 13:36:35 -05:00
spencerrlongg e05af5216e formatting 2023-11-01 12:14:46 -05:00
spencerrlongg 3f834cb88f authorization tested in request 2023-11-01 11:43:53 -05:00
spencerrlongg d971172cf3 rm unnecessary import 2023-11-01 11:34:15 -05:00
spencerrlongg 53bd5626c9 this works, need to write up pr 2023-11-01 11:33:29 -05:00
spencerrlongg 8f75bb8706 fix translation strings 2023-10-31 21:38:52 -05:00
spencerrlongg b67b00dd82 this is a start, something up with asset_tag unique rule 2023-10-31 21:06:44 -05:00
spencerrlongg d4b9f6a2a4 add not_array (not ready, doesn't catch for specific exception) 2023-10-31 21:00:22 -05:00
snipe f822f8b186 More graceful failure if ldap_results JSON decode isn’t set 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-31 17:09:18 +00:00