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
13034 commits 97 branches 266 tags 291 MiB
Commit graph

13034 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M 4327653d70 remove db cleaner for encrypted selections 2024-04-03 10:57:41 -07:00
Godfrey M aa8af2220c trying to remove an encrypted field but not all fields 2024-03-26 16:10:08 -07:00
Godfrey M 040f826c52 removes encrypted fields as a selectable option for labels 2024-03-26 08:57:18 -07:00
snipe df49e8350f
Merge pull request #14498 from snipe/features/limit_report_by_admin 
Fixed #14495 - Allow user_id to be passed to limit to only specific admins
 2024-03-26 14:52:03 +00:00
snipe 3ced85080a Fixed #14495 - Allow user_id to be passed to limit to only specific admins 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 14:45:20 +00:00
snipe f450cafe3e Fixed missing div 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:29:25 +00:00
snipe 1f29eb1875
Merge pull request #14494 from snipe/features/add_supplier_address_to_licenses 
Added supplier details to license view
 2024-03-26 12:20:57 +00:00
snipe a4e5ae0938 Removed duplicates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:20:27 +00:00
snipe 77dacfcc30 Show if deleted supplier 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:19:29 +00:00
snipe 0d9b6eaf71 Added supplier details to license view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 12:18:04 +00:00
snipe 02a37e2f89 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 10:16:46 +00:00
snipe 9c1b1bc2b5 Removed fre-order columns - it’s not currently used 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 10:15:46 +00:00
snipe 61bdb57b5d
Merge pull request #14492 from snipe/feature/sc-25142/deeplink_search_urls 
Fixed #14483 - adds deeplinking to search/sort/pagination
 2024-03-26 09:55:50 +00:00
snipe 9df84e235c Check for config variable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 09:54:40 +00:00
snipe 566ba4783e Fixed #14483 - adds deeplinking to search/sort/pagination 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 09:50:01 +00:00
snipe ccf9457c45
Merge pull request #14491 from PP-JN-RL/patch-1 
Added Dymo Labelwriter 1933081
 2024-03-26 08:46:03 +00:00
snipe 8ff85c952e Fixed labelwriter 2112283 namespace 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 08:33:30 +00:00
Phil J R afe1cb8234
Create LabelWriter_1933081.php 
Added a longer version of the existing label (25 x 54mm vs. 25 x 89mm) due to better availability and to support longer asset names.
 2024-03-26 08:29:47 +00:00
snipe 6c735c97c6
Merge pull request #14490 from snipe/bug/sc-25141/bad_method_call_model_restore_from_view 
Fixed #14482 - bad method call model restore from view
 2024-03-26 08:21:27 +00:00
snipe 31a57cdf14 Fixed #14482 - bad method call on restore from view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 08:18:59 +00:00
snipe 7ebbef25e7 Standardize button styling 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 08:18:36 +00:00
Phil J R f836342194
Rename Label_Writer_2112283.php to LabelWriter_2112283.php 
Fix the name of LabelWWriter_2112283 to be consistent with the existing one.
 2024-03-26 08:16:00 +00:00
snipe 67b5e9093e
Merge pull request #14488 from marcusmoore/bug/pass-last-audit-date-through-for-validation 
Handle badly formatted `last_audit_date` in `StoreAssetRequest`
 2024-03-25 20:57:20 +00:00
Marcus Moore 57d1c036ec
Improve method name 2024-03-25 13:53:30 -07:00
Marcus Moore 71722b753d
Little bit of clean up 2024-03-25 13:49:03 -07:00
Marcus Moore a2625c889a
Improve comment 2024-03-25 13:48:32 -07:00
Marcus Moore c98b9da612
Pass last_audit_date through for model level validation if not a date 2024-03-25 13:47:24 -07:00
Marcus Moore 675717ff82
Add failing test 2024-03-25 13:46:22 -07:00
snipe 83ef7c6fe8
Merge pull request #14486 from marcusmoore/bug/sc-25139 
Fixes `last_audit_date` not being stored via API correctly
 2024-03-25 19:49:54 +00:00
Marcus Moore 5f4c964309
Account for last_audit_date not being provided 2024-03-25 12:45:11 -07:00
Marcus Moore 66ba96d531
Set last_audit_date to valid format in StoreAssetRequest 2024-03-25 12:38:12 -07:00
snipe d67b2da064
Merge pull request #14485 from PP-JN-RL/patch-1 
Created Dymo LabelWriter Label 2112283
 2024-03-25 16:50:10 +00:00
Phil J R e45fd4088f
Created Dymo LabelWriter Label 2112283 
I have added the layout for the Dymo LabelWriter 2112283 Labels.
They are: DYMO 2112283 DURABLE SMALL MULTI PURPOSE LABELS (160 LABELS) - 25 X 54MM
 2024-03-25 16:31:20 +00:00
snipe 3f812f696d
Merge pull request #14472 from snipe/fixes/last_audit_date_via_api 
Added validation for last_audit_date and next_audit_date
 2024-03-25 14:35:42 +00:00
snipe e9e6f925bf Updated validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-21 18:34:39 +00:00
snipe 828b84084d Added validation for last_audit_date and next_audit_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-21 18:29:38 +00:00
snipe c4b7e77498
Merge pull request #14089 from spencerrlongg/bug/escaped_quotes_in_listbox 
Use `htmlentities()` instead of `htmlspecialcharacters()` on Custom Field Listbox Values
 2024-03-21 12:55:25 +00:00
snipe 91c7180bfd
Merge pull request #14469 from snipe/feature/sc-19515/2fa_reset_log 
Added 2FA reset log entry
 2024-03-21 12:52:22 +00:00
snipe 7c39f516b9
Merge pull request #14421 from marcusmoore/fixes/add-minimal-validation-around-asset-tags 
Adds a minimal amount of validation around asset_tags in AssetsController
 2024-03-21 00:04:44 +00:00
snipe ce1ddcfcee
Merge pull request #14438 from marcusmoore/chore/sc-25071 
Removed the need to add `InteractsWithSettings` to each test case
 2024-03-21 00:03:34 +00:00
snipe 945e8b402f Only offer the 2FA reset if the user already has 2FA set up 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:52:51 +00:00
snipe 5ed2bd0fb7 Skip the normal edit observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:52:22 +00:00
snipe bc908b854d Added icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:44:47 +00:00
snipe 2067b1138a Added the log item 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:58 +00:00
snipe 1ffbdee156 Updated 2FA text to not be google authenticator specific 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:30 +00:00
snipe bd2812cac1 Added new string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:12 +00:00
snipe f2a5eac256 Tightened up 2FA text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:05 +00:00
snipe de18e449a6
Merge pull request #14464 from snipe/features/toggle_all_columns 
Added "toggle all" to column selector
 2024-03-20 21:26:23 +00:00
snipe dce19e0bea Set names and actions to switchable = false 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 21:25:50 +00:00
snipe 1f586d3102 Removed data-show-columns-toggle-all data attribute 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 21:25:16 +00:00