DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
6836 commits 95 branches 267 tags 294 MiB
Commit graph

6836 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 5fbafb8a6a Possible fix for logout session not being flushed 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 13:06:58 -07:00
snipe cab29745e7 More small tweaks to feature request template 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 11:17:31 -07:00
snipe 41fa42f7d8 FR updates 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 11:14:55 -07:00
snipe eb49c33e1b Reverting feature request YAML 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-05 11:10:11 -07:00
snipe c838354b74
Merge pull request #11016 from benwa/patch-1 
Update feature_request.yml
 2022-05-05 10:19:37 -07:00
Bennett Blodinger 46c4d1a3d6
Update feature_request.yml 
Correcting the label/description fields
 2022-05-05 09:49:41 -05:00
snipe 57ed3afcc4 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-04 16:50:50 -07:00
snipe fd71b48489
Merge pull request #11000 from inietov/fixes/download_all_triggers_getDisplayNameAttribute_on_null 
Fixes Activity Report Download all action fails creating the CSV report.
 2022-05-03 20:52:42 +01:00
Ivan Nieto Vivanco 1cbbf8f976 Evaluate if an item still exists before trying to get its name in the report 2022-05-01 13:11:05 -05:00
snipe 5a8c3444e2
Merge pull request #10994 from snipe/fixes/use_str_slug_for_fileName_export 
Fixed model export filename to use str_slug for filename for JS export (like we do elsewhere)
 2022-04-28 21:58:28 +01:00
snipe edab4e1371 Uses str_slug for filename for JS export (like we do elsewhere) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-28 21:55:26 +01:00
snipe 173ec44b9e
Merge pull request #10991 from snipe/fixes/added_gate_to_requested_assets 
Added access gate to the requested assets index
 2022-04-28 15:47:54 +01:00
snipe 2e9cf8fa87 Added access gate to the requested assets index 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-28 15:45:37 +01:00
snipe 126bb486b5 Add @chrisweirich as a contributor 2022-04-28 15:30:12 +01:00
snipe 0abc108686
Merge pull request #10971 from snipe/fixes/potential_xss_in_depreciation 
Escape checkout target name
 2022-04-24 15:27:58 +01:00
snipe f623d05d0c Escape checkout target name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-24 15:27:11 +01:00
snipe ef7f21e3ba
Merge pull request #10952 from Godmartinz/fixes_double_updates 
fixes double updates from action log and history
 2022-04-21 21:25:29 +01:00
Godfrey M 91694064fb fixes double updates from action log and history 2022-04-18 11:30:24 -07:00
snipe 9a0219eff7
Merge pull request #10943 from snipe/fixes/add_status_id_to_checkout_api 
Added status_id to asset checkout API
 2022-04-15 14:38:44 +01:00
snipe b2087a9947 Adds validator to make sure the status ID is deployable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 13:06:55 +01:00
snipe 6b1329133b Adds status ID to asset checkout API endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 13:06:35 +01:00
snipe e4ef970934 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 12:26:58 +01:00
snipe f211c11034
Merge pull request #10942 from snipe/fixes/xss_user_requested 
Fixes potential XSS vuln in user requestable results
 2022-04-15 12:25:56 +01:00
snipe 698c7f4904 Fixes potential XSS vuln in user requestable results 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-15 12:22:20 +01:00
snipe 7479f5f12d
Merge pull request #10936 from snipe/fixes/backport_licenses_loading 
Ports #10494 to master
 2022-04-12 21:31:19 +01:00
snipe 161c6b7d31 Removed security-advisories package for now 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-12 21:17:29 +01:00
snipe 1441cf9f4f Ports #10494 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-12 21:04:57 +01:00
snipe 270143bb46
Merge pull request #10935 from uberbrady/backport_license_index_master 
Backport the license index fix from Develop onto the v5 branch
 2022-04-12 20:14:00 +01:00
Brady Wetherington 6b0a1ab3fb Backport the license index fix from Develop onto the v5 branch 2022-04-12 20:11:25 +01:00
snipe 5fba8202d6 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-11 15:40:58 +01:00
snipe 61f5825c69 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-11 15:37:38 +01:00
snipe 5314ef97e5 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-11 15:08:39 +01:00
snipe b7fbc5d018
Merge pull request #10927 from uberbrady/fix_columns_master 
Fixes #10482 - Downgrade bootstrap-table so columns stay remembered
 2022-04-11 15:03:08 +01:00
Brady Wetherington 211a0820e5 Downgrade bootstrap-table so columns stay remembered 2022-04-11 14:29:59 +01:00
snipe 7b891f0952
Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations 
Fixes Bulk user edit not updating checked out asset locations
 2022-04-07 19:41:01 +01:00
snipe 6c1bb89776
Merge pull request #10920 from Godmartinz/Fixed_#10866_-_Checkin_time_always_shows_12am-master 
Fixed #10866 - action_date for check-in not including H:i:s
 2022-04-07 19:39:59 +01:00
Godfrey M 3eb7a87a66 fixes action_date for check-in not including H:i:s 2022-04-07 11:24:12 -07:00
snipe 0cb4caa4cf
Merge pull request #10918 from uberbrady/bs_tables_export_without_html_master 
This disables the display of HTML content during exports (cherry-picked for master)
 2022-04-07 16:44:21 +01:00
Brady Wetherington 4db7cb0e21 This disables the display of HTML content during exports, without enabling XSS attacks 2022-04-07 16:37:32 +01:00
Ivan Nieto Vivanco 6529a75683 Update Assets locations when user's location changes whey they got bulk-edited 2022-04-06 19:12:02 -05:00
snipe 4b255ada70 Removed first() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-06 12:08:51 +01:00
snipe 01342ca266 Fixed activity report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 22:58:25 +01:00
snipe 87fc856361
Merge pull request #10902 from snipe/fixes/added_primary_key_to_custom_fields_pivot 
Fixed #10892 - MySQL 8 compatibilty requires primary key
 2022-04-05 20:35:14 +01:00
snipe 3dd7c00a0b Update migration back in time 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 20:31:17 +01:00
snipe 0c31e840c4
Merge pull request #10903 from inietov/fixes/erroneous_checkout_date_in_print_all_assigned_report 
Fixes Dates in Print All Assigned report doesn't match to history
 2022-04-05 20:19:10 +01:00
snipe c12ef19fcc Fixed #10892 - MySQL 8 compatibilty requires primary key 
Signed-off-by: snipe <snipe@snipe.net>
 2022-04-05 18:58:14 +01:00
Ivan Nieto Vivanco 2d213a9c77 Make the report take the dates of pivot table instead of asset log 2022-04-05 12:57:49 -05:00
snipe 0882cfede2
Merge pull request #10895 from ubc-cpsc/master 
Security fixes to master branch
 2022-04-05 18:29:25 +01:00
Joël Pittet 96cd90f842 Security fixes to master branch 2022-04-04 11:04:06 -07:00
snipe d56552a8af
Merge pull request #10876 from snipe/fixes/huntr_ebc26354_logout_user_when_deactivated 
Logout user when their activated status is switched to off
 2022-03-29 15:57:24 +01:00