DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 03:54:16 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
13119 commits 97 branches 267 tags 296 MiB
Commit graph

13119 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brady Wetherington 059190f002 Upgrade Acorn 2023-02-26 11:29:10 -08:00
snipe 6428cc259f Merge remote-tracking branch 'origin/develop' 2023-02-24 10:02:43 -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 8caf29975f Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-02-24 09:58:19 -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 1415c8c6e2 Merge remote-tracking branch 'origin/develop' 2023-02-23 15:00:03 -08: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 309c0ff66f Merge remote-tracking branch 'origin/develop' 2023-02-23 11:41:36 -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 adb166fb8d Merge remote-tracking branch 'origin/develop' 2023-02-22 18:01:06 -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 225b6ef310 Merge remote-tracking branch 'origin/develop' 2023-02-22 12:24:52 -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
snipe 942fee4d43
Merge pull request #12447 from akemidx/user_setup_translation 
FIXED: Translations on the User Creation setup page
 2023-02-21 19:53:00 -08:00
snipe ba461d0114
Merge pull request #12538 from AndrewSav/develop 
Added #12532: add version endpoint
 2023-02-21 19:50:07 -08:00
snipe 3ae783a9c7
Merge pull request #12525 from uberbrady/add_sodium_php_shim 
Add libsodium shim, and mark the sodium extension as 'optional'
 2023-02-21 19:38:14 -08:00
Ivan Nieto Vivanco d494afcf01 Add order by clause, to ensure assets and accessories are in order in the report 2023-02-21 21:24:19 -06:00
snipe 57065b8936 Merge remote-tracking branch 'origin/develop' 2023-02-21 09:20:59 -08:00
snipe 40a38486b9
Merge pull request #12545 from snipe/localizations/more_new_translations 
Two more translations
 2023-02-21 09:20:38 -08:00
snipe 29158dece5 Two more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-21 09:19:34 -08:00
snipe f6e4e17e5c Merge remote-tracking branch 'origin/develop' 2023-02-21 09:05:50 -08:00
snipe 8185f264a4
Merge pull request #12544 from snipe/localizations/updated_general 
Updated the general translation file with new strings
 2023-02-21 09:05:24 -08:00
snipe 04d3938f0c Updated the general translation file with new strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-21 09:04:13 -08:00
snipe f109218e16 Re-added dropped translations from CrowdIn 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-21 09:00:10 -08:00
snipe 049213c3da Merge remote-tracking branch 'origin/develop' 2023-02-21 04:02:08 -08:00
snipe 9c1a71e04a
Merge pull request #12541 from snipe/localizations/new_strings 
Updated translations with new strings and new translations
 2023-02-21 03:58:25 -08:00
snipe a0b05bac8d Updated translations with new strings and new translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-21 03:54:55 -08:00
Andrew Savinykh d2ede75de8 fixes #12532 adds version endpoint 2023-02-20 22:19:18 +13:00
Ivan Nieto Vivanco 6e994c209f Adds setter to model Asset class for expected checkin 2023-02-19 12:31:10 -06:00