DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
7021 commits 101 branches 268 tags 288 MiB
Commit graph

7021 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe cae62fd4c7
Merge pull request #9902 from SidingsMedia/sum_cost_by_quantity 
Fixed #5676: Sum cost by quantity
 2021-12-02 12:13:04 -08:00
snipe 44b6907919 Updated phpunit.xml 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 11:44:32 -08:00
snipe 406211d2fe Move mockery to require-dev 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 11:22:46 -08:00
snipe fb06c136b9 Added mockery (because reasons?) 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 11:11:14 -08:00
snipe 957d092844 Upgraded phpunit to v9 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-02 11:04:04 -08:00
snipe ed2797afdd Small fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-01 23:33:20 -08:00
snipe ad6d70b86f Removed unused Str 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-01 23:30:48 -08:00
snipe 17bd6d71e7 Fixed location unit test 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-01 22:45:39 -08:00
snipe d96e95abd6 Small mods to configs, removed old faker, added new 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-01 13:46:21 -08:00
snipe bc355e1f26 Remve unused use Hash statements 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:47:02 -08:00
snipe d8234d5a0b Trying to unfuck the TestCase 
A lot has changed between versions

Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:46:44 -08:00
snipe f3f6a04c43 Use hash:: 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:46:20 -08:00
snipe fe2cd8b708 Switched back to sqlite for unit 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:45:54 -08:00
snipe e73373a75a Removed empty tests 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:45:42 -08:00
snipe d08c1787a1 First steps at getting dusk working 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-30 20:09:29 -08:00
Nuraeil d3972888dc
Merge pull request #6 from snipe/develop 
Develop
 2021-11-30 06:37:17 +01:00
snipe a579353198 Add @bestlong as a contributor 2021-11-24 20:04:26 -08:00
snipe 7360e15d4e Add @sneak-it as a contributor 2021-11-24 20:04:05 -08:00
snipe 9dc2fa61b8 Add @adamboutcher as a contributor 2021-11-24 20:03:52 -08:00
snipe 80fd49a59e Add @leitwerk-ag as a contributor 2021-11-24 20:03:40 -08:00
snipe d30fa9199c Merge branch 'master' of https://github.com/snipe/snipe-it 2021-11-24 19:58:52 -08:00
snipe 8028b39b43 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-24 19:58:43 -08:00
snipe ff81e6d536
Merge pull request #10361 from snipe/fixes/xss_in_accessories_checkout_notes 
Escape notes in transformCheckedOutAccessory
 2021-11-24 19:56:36 -08:00
snipe 00fad35c2a Escape notes in transformCheckedOutAccessory 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-24 19:54:45 -08:00
snipe 3b68a6f1be
Merge pull request #10345 from leitwerk-ag/master 
Fixed #10344 and #9135: don't prepand fields with a whitespace in text based export formats
 2021-11-24 19:43:21 -08:00
snipe bc91aef47d
Merge pull request #10352 from adamboutcher/install_rocky 
Improved Installer: Added Rocky Linux Support
 2021-11-24 19:42:37 -08:00
snipe 3debe78574
Merge pull request #10350 from inietov/fixes/trim_custom_fields_names 
Apply trim() function when storing Custom Fields names
 2021-11-24 19:42:04 -08:00
snipe 4c2d47e7c6
Merge pull request #10354 from inietov/fixes/customfields_with_date_format_doesnt_display_default_value 
Fixes Default Values - Date not applying
 2021-11-24 19:41:51 -08:00
snipe fc1b3b31b5
Merge pull request #10358 from sneak-it/bullseye 
Improved Installer: Add Debian 11 (Bullseye) install script support
 2021-11-24 19:41:37 -08:00
snipe 4afd598df7
Merge pull request #10356 from bestlong/fix_modal_dialog_html_typo 
fix modal-title html tag unpaired.
 2021-11-24 19:39:58 -08:00
snipe 29bbfad693 Applied escaping fix from master to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-24 19:38:27 -08:00
snipe d1d3f893ac
Merge pull request #10360 from snipe/fixes/escaped_characters_on_asset_create_checkout 
Removed escaping on input save for asset checkout on creation
 2021-11-24 19:20:54 -08:00
snipe 830d07f84f Removed escaping on input save for asset checkout on creation 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-24 19:19:32 -08:00
snipe 0e30b9aef7
Merge pull request #10355 from inietov/fixes/customfields_with_date_format_doesnt_display_default_value_master 
Fixes Default Values - Date not applying for master branch
 2021-11-24 18:22:02 -08:00
sneaK b937aedc30 Add Debian 11 (Bullseye) install script support 2021-11-24 10:24:05 -05:00
Shao Yu-Lung 55d05eeae3 fix modal-title html tag unpaired. 2021-11-24 10:28:10 +08:00
Ivan Nieto Vivanco d95d3dc282 Add the call to defaultValue() function in custom fields with date format 2021-11-23 17:21:46 -06:00
Ivan Nieto Vivanco 741eb28622 Add the call to defaultValue() function in custom fields with date format 2021-11-23 17:11:21 -06:00
Adam ab06c26527
Rocky Linux Support 
Addition to enable Rocky Linux installation.
 2021-11-23 16:13:38 +00:00
Ivan Nieto Vivanco 1ca770895a Apply trim() function when storing Custom Fields names 2021-11-22 18:43:21 -06:00
snipe ef8f646ab2
Merge pull request #10349 from snipe/chore/sc-17719/add-sodium-as-a-requirement-in-upgrade-php 
Update upgrade.php with newer requires
 2021-11-22 15:32:51 -08:00
snipe 686e58806f Update upgrade.php with newer requires 
Signed-off-by: snipe <snipe@snipe.net>
 2021-11-22 15:31:23 -08:00
Klaus J. Mueller a85fa14f9c fix #10344 and #9135 2021-11-22 17:58:26 +01:00
Matthew Nickson 9381ba2404
Merge branch 'develop' into sum_cost_by_quantity 2021-11-21 18:59:34 +00:00
Wächtler, Yannick 1b76185798 Added TODO: comments to pages, where there are non-localized strings, in order to keep track of them 2021-11-19 15:32:13 +01:00
Wächtler, Yannick 9164daf5bc Added localized strings for admin/settings 2021-11-19 15:23:48 +01:00
Wächtler, Yannick 6917d59185 Added localized strings for reports 2021-11-19 12:39:19 +01:00
Wächtler, Yannick 04fec144a0 Added localization strings for partials, added file structure 2021-11-19 12:12:11 +01:00
Nuraeil 6eb120d101
Merge pull request #5 from snipe/develop 
Develop
 2021-11-19 11:51:16 +01:00
snipe df0b240a05
Merge pull request #10288 from uberbrady/composer_install_under_phpv8 
[sc-17645] Composer install under phpv8
 2021-11-18 15:28:54 -08:00