DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 11:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
10373 commits 96 branches 267 tags 296 MiB
Commit graph

10373 commits

This branch
This branch
All branches
Author SHA1 Message Date
akemidx 25f3e4d41a Adding ability to see boolean values when using normal export 2023-02-28 16:01:23 -05:00
Marcus Moore 589a5d0d8b
Merge branch 'develop' into fix/test-suite 2023-02-28 09:48:48 -08:00
Godfrey M e8fbb0608f adjusts the sidebar margin top 2023-02-28 09:30:02 -08:00
Marcus Moore d707f2d391
Add GitHub Action to push translation sources to Crowdin 2023-02-28 09:07:34 -08:00
Ivan Nieto Vivanco 1be0a8d911 Declare variable as an empty array 2023-02-28 10:22:49 -06:00
Ivan Nieto Vivanco 0d860c0b72 Check if target is not null to retrieve the proper data 2023-02-27 19:01:37 -06:00
Ivan Nieto Vivanco 9d94bd6567 Validate if the license seat is not checked out, it can't be checked in 2023-02-27 18:57:38 -06:00
snipe 23fe11c71e
Merge pull request #12574 from inietov/fixes/address_in_mailbox_not_comply_rfc 
Fixed Address in mailbox given does not comply with RFC 2822, 3.6.2. [sc-202022]
 2023-02-27 15:55:31 -08:00
Ivan Nieto Vivanco b4e578c95e Convert the alert_email setting from string to array 2023-02-27 17:34:29 -06:00
Brady Wetherington 53db266b69 WIP: cleaning up extraneous gunk and trying to standardize on one single Livewire Select2 implementation 2023-02-27 14:29:02 -08:00
Brady Wetherington fb201e61f3 More wiring up Livewire to the back-end. 2023-02-27 14:29:02 -08:00
Brady Wetherington e1c8f155bb Wiring up more bits to Livewire 2023-02-27 14:29:02 -08:00
Brady Wetherington 5c97e45d00 WIP - trying to get select2 wired up for importer 2023-02-27 14:29:02 -08:00
Brady Wetherington 8009ee79db I think I have, now, full parity on the base Importer level 
Meaning that you can upload new files, delete old files, have error
messages, have status updates - and all of them seem to work.
 2023-02-27 14:29:02 -08:00
Brady Wetherington 0a085af0a0 Getting the basic wiring of the importer over into Livewire 
WIP: Wiring up more and more of the actions on the importer

Files now upload okay, a little glitchy on the display-side though

add to readmes so i dont forget
 2023-02-27 14:28:59 -08:00
snipe 23ca124e94
Merge pull request #12573 from snipe/fixes/ambiguous_model_clause 
Added table aliases to fix ambiguous SQL clause
 2023-02-27 13:33:52 -08:00
snipe c7106a1df2 Added table aliases to fix ambiguous SQL clause 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-27 13:24:09 -08:00
snipe b78aba787f
Merge pull request #12572 from snipe/fixes/add_max_results_limit_to_acitivity_report 
Added max results limit to report index
 2023-02-27 12:16:57 -08:00
snipe 96c851468c Added max results limit to report index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-27 12:04:46 -08:00
Godfrey M e8fc895e51 "adds variables, but still not working" 2023-02-27 09:19:59 -08:00
snipe a5ccef5e96
Merge pull request #12564 from uberbrady/upgrade_acorn 
Upgrade Acorn
 2023-02-26 12:12:21 -08:00
Brady Wetherington 059190f002 Upgrade Acorn 2023-02-26 11:29:10 -08:00
snipe cb0b234b80
Merge pull request #12561 from inietov/fixes/unable_to_import_purchase_date 
Fixed #12559 Unable to import Purchase Date field
 2023-02-24 10:02:25 -08:00
snipe 95501bf57c Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-24 09:57:25 -08:00
snipe 75a73d095f
Merge pull request #12560 from snipe/fixes/bulk_checkout_nulles_asset_name 
Pass the existing asset name to the bulk checkout form
 2023-02-24 09:56:13 -08:00
snipe 3e47d9e689 Pass the existing asset name to the bulk checkout form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-24 09:54:46 -08:00
Ivan Nieto Vivanco 51efd9b413 Adjust the date format for purchase_date field 2023-02-24 10:59:31 -06:00
snipe bd0b00e361
Merge pull request #12558 from inietov/fixes/non_numeric_value_in_license_seat 
Fixed ErrorException: A non-numeric value encountered in app/Models/License [sc-20187]
 2023-02-24 00:29:26 -08:00
Ivan Nieto Vivanco 6bd72125bd Deletes problematic cast 2023-02-23 22:31:41 -06:00
snipe 41253b2680
Merge pull request #12556 from marcusmoore/fixes/asset-seeder 
Fix purchase date field in asset seeder
 2023-02-23 14:05:45 -08:00
Marcus Moore bdac0f16ce
Set purchase date field to the correct format in asset factory 2023-02-23 13:39:05 -08:00
snipe dde2b946da
Merge pull request #12555 from snipe/security/upgrade_dompdf 
Update dompdf
 2023-02-23 13:00:46 -08:00
snipe 0b408218b0 Update dompdf 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-23 12:59:04 -08:00
snipe 5e6ebb9a65
Merge pull request #12410 from uberbrady/paginate_accessories_report 
Paginate accessories report
 2023-02-23 12:26:17 -08:00
snipe 8e72da42e8
Merge pull request #12406 from akemidx/vip_tag 
Added a checkbox to notate VIP status
 2023-02-23 12:23:29 -08:00
snipe eb6357636a
Merge pull request #12467 from marcusmoore/fix/scope-people-with-full-multiple-companies 
Fix full company scoping in user selects
 2023-02-23 10:36:33 -08:00
snipe 4a9ced192b
Merge pull request #12550 from marcusmoore/fixes/closing-tag-in-mail-template 
Properly close tag in mail template
 2023-02-22 17:59:20 -08:00
Marcus Moore 6c8de181cf
Properly close tag in mail template 2023-02-22 17:52:47 -08:00
snipe 5a1e5f740d
Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation 
Fixed #12531 Expected Checkin Date on Asset Checkout throws an error
 2023-02-22 16:03:51 -08:00
akemidx 690970b4aa fixing ff error 2023-02-22 18:18:20 -05:00
Marcus Moore f63710fb5c
Remove unused import 2023-02-22 12:34:56 -08:00
Marcus Moore 7667b0a216
Remove extra line 2023-02-22 12:34:35 -08:00
Marcus Moore 931ca98c02
Remove middleware bypass 2023-02-22 12:33:55 -08:00
snipe 13ed2a05a3 Add @AndrewSav as a contributor 2023-02-22 12:24:13 -08:00
Marcus Moore aae2106658
Use existing language translation string 2023-02-22 12:02:14 -08:00
snipe 81cb29db5e
Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report 
Added images to emailed user inventory report [sc-19801]
 2023-02-22 10:38:07 -08:00
snipe 05f6d0bd5e
Merge pull request #11984 from nh314/Correct-assignedusers-relation 
Correct assignedusers relation setting
 2023-02-21 20:15:20 -08:00
snipe 4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during 
Adds Boolean to Users Table for Auto Assigning Licenses
 2023-02-21 20:10:46 -08:00
snipe 0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
Brady Wetherington aadfa9aa9c Back out Laravel Vite stuff - we're so far away from that right now 2023-02-21 19:54:14 -08:00