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

6717 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe db0a078c0b
Merge pull request #10573 from uberbrady/fix_force_root_url 
Add some guardrails around very-badly formatted APP_URL settings
 2022-01-27 11:29:29 -08:00
Brady Wetherington 1cf1278b3b Fix whitespace issues 2022-01-27 11:28:51 -08:00
Brady Wetherington 70648dedd3 Add some guardrails around very-badly formatted APP_URL settings 2022-01-27 11:21:46 -08:00
snipe 9634dde0dd
Merge pull request #10567 from inietov/fixes/importing_and_checking_out_licenses_master 
Fixes Importing licenses without product key duplicates the license
 2022-01-27 10:58:06 -08:00
snipe 077caa29f8
Merge pull request #10570 from inietov/fixes/donked_layout_required_field_error_depreciation 
Fixes donked layout required field error depreciation [sc-17111]
 2022-01-26 21:23:51 -08:00
Ivan Nieto Vivanco a87478d3ac Set the actual field we are evaluating as required (months) 2022-01-26 23:02:27 -06:00
Ivan Nieto Vivanco 44349db597 Fixes the appearance of some error messages 2022-01-26 22:58:02 -06:00
snipe c70ae19c28
Merge pull request #10529 from uberbrady/fix_insecure_host_headers 
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden (v5)
 2022-01-26 16:59:55 -08:00
Ivan Nieto Vivanco 55fdc86e02 Tweak query in the License Importer to not require a Product Key 2022-01-26 17:51:04 -06:00
snipe 0721ab8bbf Regenerated production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-20 11:01:04 -08:00
snipe 00c8a1ee21
Merge pull request #10533 from inietov/feature/add_remaining_address_field_to_user_import 
Add Zip field in the User Importer [sc-18556]
 2022-01-19 12:07:18 -08:00
Ivan Nieto Vivanco 1fc71a4111 Add Zip field in the User Importer 2022-01-19 13:35:54 -06:00
Brady Wetherington 0c4768fd2a Force UrlGenerator's Root URL to be the base of APP_URL unless overriden 
(For v5)
 2022-01-18 15:52:59 -08:00
snipe f9647614ab
Merge pull request #10527 from inietov/fixes/pdo_exception_syntax_error_when_sendexpirationalers_is_called 
Fixes PDO exeception syntax error when Expiring Alerts Threshold is not set
 2022-01-18 12:43:08 -08:00
Ivan Nieto Vivanco a05795420a Respect the default value of 60 days in expiring licenses 2022-01-18 14:34:14 -06:00
Ivan Nieto Vivanco 42d86bf57b Adds default values if the expiring alerts threshold is null 2022-01-18 14:21:49 -06:00
snipe 201b52baf8
Merge pull request #10523 from inietov/fixes/depreciation_report_shows_assets_that_not_deprecate_master 
Fixes bug where the depreciation report shows assets that not deprecate for master
 2022-01-18 10:37:21 -08:00
Ivan Nieto Vivanco f510b9c2a9 Add query to filter non-deprecable assets when the Depreciation Report is called 2022-01-15 14:21:31 -06:00
snipe 75bd365ca1
Merge pull request #10521 from inietov/fixes/sc-14356/importer_creating_duplicate_asset_models_master 
Fixes an issue where importer is creating duplicate asset models for Master Branch
 2022-01-15 07:46:39 -08:00
Ivan Nieto Vivanco 153c30eda8 Add to Importer the capacity to search Models only with Model Name since Model Number is not required 2022-01-15 04:32:47 -06:00
snipe be7e6ed847
Merge pull request #10502 from uberbrady/ldap_useraccountcontrol_dont_req_preauth 
Add new UserAccountControl to permitted UAC's for AD.
 2022-01-13 17:01:47 -08:00
snipe 115109f612
Merge pull request #10510 from misilot/fix-10176-master 
Looks great, thanks!
 2022-01-13 13:22:22 -08:00
Thomas Misilo 037a912e21 Adding .my.cnf to disable column-statistics backup 
Fixes #10176

The ```.my.cnf``` file is copied to ```/root/.my.cnf``` for each
Dockerfile that exists
 2022-01-13 15:16:59 -06:00
snipe 984db1ef44 Apply personal API token fix to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:39:56 -08:00
Brady Wetherington c8fe929e09 Add new UserAccountControl to permitted UAC's for AD. 2022-01-12 12:07:51 -08:00
snipe 181dc5127f Add @UniversalSuperBox as a contributor 2022-01-11 15:03:08 -08:00
snipe 303fc39966 Regenerated assets to pikc up #10089 changes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-11 14:38:17 -08:00
snipe 730c2a6821
Merge pull request #10496 from UniversalSuperBox/fix/improve-asset-card-view 
Fixed #10089 (partially): Back to master: Added some BS tables style overrides for mobile
 2022-01-11 14:10:18 -08:00
snipe bc10761b49 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-11 12:44:16 -08:00
snipe cf14a0222c
Merge pull request #10498 from Haxatron/master 
Fix access control
 2022-01-10 19:24:31 -08:00
snipe b18b3812df Back to master: Added some BS tables style overrides for mobile 
This repeats 06e8e826, which alone improves the mobile view immensely,
on master.
 2022-01-10 15:23:43 -06:00
Haxatron bb095641c2
Update BulkAssetModelsController.php 
https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7
 2022-01-06 09:50:11 +08:00
snipe b78e610ce3
Merge pull request #10480 from snipe/fixes/check_for_valid_custom_field 
Fixed format property on invalid custom field object when trying to edit a field that doesn't exist
 2022-01-03 19:28:25 -08:00
snipe 884b6b0270 Fixes format property on invalid custom field object 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-03 19:14:50 -08:00
snipe 7a1ab1292c
Merge pull request #10479 from adagioajanes/fixes/auto_asset_tag_phrasing 
Fixed auto asset tag phrasing
 2021-12-31 15:17:59 -08:00
Alex Janes 87bb741013
Merge branch 'snipe:master' into fixes/auto_asset_tag_phrasing 2021-12-31 16:34:57 -05:00
Alex Janes 5fe2083688 Adjusted the phrasing around auto-incrementing asset tags. 2021-12-31 16:33:30 -05:00
snipe 2ee84c2675 Added a few more comments 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-30 18:33:28 -08:00
snipe 39a5b6b426
Merge pull request #10478 from snipe/fixes/whitelist_modal_views 
Added allow list to modal view options
 2021-12-30 18:29:30 -08:00
snipe c6ce928567 Added allow list to modal view options 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-30 18:16:49 -08:00
snipe 950a23b0f4
Merge pull request #10476 from snipe/fixes/custom_fieldsets_index 
Fixed missing index for fieldsets
 2021-12-30 13:18:13 -08:00
snipe b4fac3e4ae Fixed missing index for fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-30 13:16:44 -08:00
snipe 548e483ef8
Merge pull request #10475 from snipe/fixes/wrong_default_sort_on_kits 
Fixed assets_count doesnt exist as a column on kits
 2021-12-30 13:02:12 -08:00
snipe bad6b862ca assets_count doesnt exist as a column 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-30 12:59:16 -08:00
snipe 4e336e11ee
Merge pull request #10470 from snipe/increase_address_length_for_supplier 
Fixed #10469 - increased size of supplier address field
 2021-12-27 12:29:13 -08:00
snipe 8588e9ebf1 Fixed #10469 - increased size of supplier address field 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-27 12:28:02 -08:00
snipe 11524d0f7d
Merge pull request #10463 from adagioajanes/fixes/pass_total_to_GroupsTransformer 
Fixed #10461: Groups management page did not paginate correctly
 2021-12-24 10:39:22 -08:00
Alex Janes d0bfd8dfd2 Fixed the collection of the groups total to GroupsTransformer.php. Groups page should now paginate correctly. 2021-12-23 20:54:34 -05:00
snipe 312200bf44 Removed duplicate "department" entry in importer, pulls #10460 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-21 13:37:20 -08:00
snipe 04f4bb83e9 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2021-12-16 20:37:22 -08:00