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 14 Packages Projects Releases Wiki Activity
8808 commits 95 branches 267 tags 294 MiB
Commit graph

8808 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 9b5790b7e6
Merge pull request #11072 from snipe/fixes/support_apache_24 
YOLO
 2022-09-12 14:26:43 -07:00
snipe a8a00f0a79 Updated prod JS assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-12 11:08:29 -07:00
snipe cbd16174d8
Merge pull request #11810 from snipe/maintenance/updated_dev_assets 
Updated compiled assets
 2022-09-12 10:55:40 -07:00
snipe 448aefac28 Updated compiled assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-12 10:54:54 -07:00
snipe b23cd6d4f0
Merge pull request #11808 from snipe/snyk-upgrade-390057161cf95c21d9a4b53f57207321 
[Snyk] Upgrade bootstrap-table from 1.20.2 to 1.21.0
 2022-09-11 16:56:22 -07:00
snyk-bot b0ea1a31dc
fix: upgrade bootstrap-table from 1.20.2 to 1.21.0 
Snyk has created this PR to upgrade bootstrap-table from 1.20.2 to 1.21.0.

See this package in npm:
https://www.npmjs.com/package/bootstrap-table

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
 2022-09-11 23:55:26 +00:00
snipe 11a2f96b4f
Merge pull request #11806 from snipe/snyk-upgrade-390057161cf95c21d9a4b53f57207321 
[Snyk] Upgrade bootstrap-table from 1.20.2 to 1.21.0
 2022-09-11 01:30:34 -07:00
snyk-bot 7361977cdc
fix: upgrade bootstrap-table from 1.20.2 to 1.21.0 
Snyk has created this PR to upgrade bootstrap-table from 1.20.2 to 1.21.0.

See this package in npm:
https://www.npmjs.com/package/bootstrap-table

See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
 2022-09-10 23:32:02 +00:00
snipe 659703bd7d
Merge pull request #11790 from inietov/fixes/double_login_issue_when_switching_users 
Fixed Double login when switching users
 2022-09-06 17:03:21 -07:00
Ivan Nieto Vivanco 3aff97ace1 Remove the previous user hashed password 2022-09-06 18:43:35 -05:00
Rick Nelson 6e82de2f47 Fixed #11769: PAT Test hardcoded text 2022-09-01 11:21:02 -04:00
snipe e86e96e159
Merge pull request #11765 from snipe/fixes/colspan_for_delete_checkboxes 
Increased colspan for checkboxes
 2022-08-31 13:35:21 -07:00
snipe 93428e1ed4 Increased colspan for checkboxes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-31 13:34:27 -07:00
BasO12 61e1650542
Add files via upload 2022-08-31 13:08:09 +02:00
BasO12 ab54ac9408
Add files via upload 2022-08-31 13:07:05 +02:00
snipe dcbd407698
Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance 
Send notifications when Acceptance Assets actions occur [sc-9917]
 2022-08-30 12:14:58 -07:00
geo-chen 4e7fea3468
correcting default mysql port from 3309 to 3306 
installation breaks using default config and manual edits to correct the port is currently required
 2022-08-30 20:40:49 +08:00
geo-chen 3ef25c3a4d
correcting default mysql port from 3309 to 3306 
installation breaks using default config and manual edits to correct the port is currently required
 2022-08-30 20:40:35 +08:00
geo-chen 22596f4bb8
correcting default mysql port from 3309 to 3306 
installation breaks using default config and manual edits to correct the port is currently required
 2022-08-30 20:40:19 +08:00
geo-chen 8fdca7f42b
correcting default mysql port from 3309 to 3306 
installation breaks using default config and manual edits to correct the port is currently required
 2022-08-30 20:40:04 +08:00
geo-chen 1f04cfdb44
correcting default mysql port from 3309 to 3306 
installation breaks using default config and manual edits to correct the port is currently required
 2022-08-30 20:39:50 +08:00
geo-chen 04c130e596
correcting default mysql port from 3309 to 3306 
installation breaks using default config and manual edits to correct the port is currently required
 2022-08-30 20:39:34 +08:00
snipe 7fa9214beb
Merge pull request #11489 from Godmartinz/bug/sc-19333/expiring-assets-report-email-content-ordering 
Fixed the order expiring assets are listed in notifications
 2022-08-29 12:37:01 -07:00
Godfrey M ea63049b4b removed redundancy with raw query 2022-08-29 12:33:51 -07:00
snipe e94b5ac435
Merge pull request #11758 from snipe/security/xss_on_dashboard_note 
Fixed possible XSS on dashboard note
 2022-08-29 11:50:48 -07:00
snipe 9cf5f30c77 Set safeMode to true and use helper for all parsedown 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-29 11:26:47 -07:00
snipe e8f2e50ada Add @dsferruzza as a contributor 2022-08-29 10:10:13 -07:00
snipe 3527902ba3
Merge pull request #11752 from dsferruzza/fixes/s3-file-size 
Fixed #11742: display correct file sizes when using S3(-like) storage
 2022-08-29 10:08:10 -07:00
David Sferruzza f60ea9581d
Fixed #11742: display correct file sizes when using S3(-like) storage 2022-08-28 12:07:14 +02:00
Chris Hartjes 74fe3dc733 Updated testing-related documentation 2022-08-26 13:55:12 -04:00
snipe 96ec96ff7f
Merge pull request #11737 from inietov/fixes/validation_error_still_without_required_rule 
Fixed Validation error when empty default customfield values
 2022-08-25 17:54:04 -07:00
snipe 4fd1827576
Merge pull request #11738 from inietov/fixes/problem_checkin_and_delete_users 
Fixed #11695 Problem with checkin all and delete user.
 2022-08-25 17:52:51 -07:00
Ivan Nieto Vivanco 0d4e9c183b Save correct id in action log if the bulk-checkin is of type license 2022-08-25 19:16:48 -05:00
Ivan Nieto Vivanco 1ff2d15c4a Replace 'required' rule with 'nullable' to allow blank default customfields values 2022-08-25 18:16:50 -05:00
snipe 482a7b2a3a
Merge pull request #11700 from inietov/fixes/unaccepted_assets_reminder_500 
Fixed 500 error when sending unaccepted assets reminder
 2022-08-25 14:00:00 -07:00
snipe 6f0f6c8042 Don’t prevent deletion if user has consumables checked out 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-25 12:51:02 -07:00
snipe 4cc9b5a5a2 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-08-25 12:34:38 -07:00
snipe 8720a58b51 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-25 12:34:02 -07:00
snipe 22710afee3 Merge remote-tracking branch 'origin/develop' 2022-08-25 12:28:06 -07:00
snipe 968f8fb554
Merge pull request #11735 from snipe/security/logout_other_devices 
Fixed: Log user out of other devices when they change their password
 2022-08-25 12:26:13 -07:00
snipe 6fde72a693 Log user out of other devices when they change their password 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-25 12:24:26 -07:00
snipe afb7fa2e81 Merge remote-tracking branch 'origin/develop' 2022-08-24 18:12:26 -07:00
snipe c9ef49ec65
Merge pull request #11731 from snipe/fixes/add_sig_column_to_user_history 
Fixed #10593 - added signature column to user history
 2022-08-24 18:08:41 -07:00
snipe 36ab794adc Added signature field to user history 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 18:05:43 -07:00
snipe 2ad9c39090
Merge pull request #11730 from inietov/fixes/importing_licenses_field_mismatch 
Fixed #11679 Importing Licenses - Field Mismatch
 2022-08-24 17:31:12 -07:00
Ivan Nieto Vivanco c59fd7b8da Fix importer field mapping for command line 2022-08-24 19:20:23 -05:00
snipe 44e598b0dc Updated branch name in version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 17:17:38 -07:00
snipe ffd38292cf
Merge pull request #11729 from uberbrady/improve_docker_assetmodels_restore 
Fixed #11708 - pre-create private_storage directories for Docker restores
 2022-08-24 17:16:21 -07:00
snipe 660c1429b2
Merge pull request #11728 from snipe/fixes/adds_style_to_readonly_date_fields 
Added style to readonly date fields
 2022-08-24 17:14:16 -07:00
Brady Wetherington 8ad5fb34d3 Fixed #11708 - pre-create private_storage directories for Docker restores 2022-08-24 17:11:21 -07:00