DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
6809 commits 101 branches 268 tags 320 MiB
Commit graph

6809 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe bdabbbd4e9 Logout user when their activated status is switched to off 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-29 13:44:53 +01:00
snipe ab18ceb2f9 Add @QveenSi as a contributor 2022-03-29 11:54:51 +01:00
snipe e046db6d1e
Merge pull request #10874 from QveenSi/patch-1 
Fix problem with static paths
 2022-03-29 11:52:32 +01:00
Yevhenii Huzii 863ea62551
Fix problem with static paths 2022-03-27 23:12:38 +03:00
snipe 70059f6f80
Merge pull request #10873 from uberbrady/fix_dashboard 
Don't crash JS when there are no data-export-options (as is true in Dashboard) Fixes #10872
 2022-03-27 07:21:34 +01:00
Brady Wetherington e50ad8a442 Don't crash JS when there are no data-export-options (as is true in Dashboard) 2022-03-27 07:18:12 +01:00
snipe 639409fb3f Backporting #10829 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-25 13:00:16 +00:00
snipe 20e65804ef Removed comment 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-22 18:12:08 +00:00
snipe 729b23c0cf
Merge pull request #10857 from uberbrady/fix_bs_tables_export_options 
Fix bs tables export options
 2022-03-22 17:03:18 +00:00
Brady Wetherington af9f3d5e1e Clean up the bootstrap table export options 2022-03-22 16:05:08 +00:00
Brady Wetherington 00ca30a205 WIP: fix bootstrap table export options 2022-03-22 15:12:11 +00:00
snipe 8c92198636 Possible fix for boolean field check 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-22 13:47:43 +00:00
snipe 169973e697
Merge pull request #10853 from inietov/fixes/customfields_boolean_format_not_saving_master 
Fixes Customfields with boolean format not saving master[sc-9973]
 2022-03-22 00:57:41 +00:00
Ivan Nieto Vivanco 7571c0b850 Add support for boolean type customfields 2022-03-21 18:48:42 -06:00
snipe 7cbcd2d95c
Merge pull request #10814 from snipe/features/add_clear_sessions_artisan_command 
Added session killer artisan command
 2022-03-10 13:35:55 -08:00
snipe 1ac293a12a Add a force override 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-10 13:30:03 -08:00
snipe 3e3c277a3f Better phrasing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-10 13:29:52 -08:00
snipe 93d6ce1a6a Added session killer artisan command 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-10 13:20:23 -08:00
snipe dadc80d558
Merge pull request #10811 from inietov/fixes/CarbonExceptions_InvalidFormatException_DateTime 
Fixes Carbon\Exceptions\InvalidFormatException: DateTime::__construct(): Failed to parse time string
 2022-03-10 10:40:46 -08:00
Ivan Nieto Vivanco 9caf27ce60 Sanitize dates input in the importer before saving 2022-03-10 11:48:57 -06:00
snipe 968de7e469
Merge pull request #10804 from inietov/fixes/date_localization_not_working_custom_fields 
Fixes #8143 Date localization not work in custom fields
 2022-03-08 20:11:49 -08:00
Ivan Nieto Vivanco 2410b1a146 Add a condition to show customfields as the user wants in localization settings 2022-03-08 18:25:15 -06:00
snipe ed39df349f
Merge pull request #10799 from snipe/fixes/check_if_tables_exist_before_trying_to_create 
Check if table exists before trying to create in migrations
 2022-03-07 20:22:28 -08:00
snipe 86a2312a31 Check if table exists before trying to create 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-07 20:13:10 -08:00
snipe e30d814ece
Merge pull request #10798 from snipe/features/add_qr_and_barcode_urls_to_asset_transformer 
Added QR and alt barcode urls to asset transformer
 2022-03-07 19:53:08 -08:00
snipe e9d297e97d Added cache comment 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-07 19:37:06 -08:00
snipe 9269d5945e Added QR and alt barcode urls to asset transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-03-07 19:32:18 -08:00