DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9179 commits 102 branches 268 tags 288 MiB
Commit graph

9179 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Godfrey M fc6fefdb4e adds migration, variables, checkbox,working on groups 2022-08-25 15:19:38 -07: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
snipe a5fd9ebbb1 Added style to readonly datetime picker field 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 17:10:15 -07:00
snipe 49d2aef831
Merge pull request #11726 from inietov/fixes/customfields_date_format_issue 
Fixed #11709 Dates in custom fields not always stored in the correct format
 2022-08-24 16:46:35 -07:00
snipe 74f5980af7
Merge pull request #11724 from inietov/fixes/remove_required_rule_for_default_custom_values 
Fixed Validation error when creating custom fields' default values
 2022-08-24 16:44:46 -07:00
snipe 1a47e1000d
Merge pull request #11727 from snipe/security/updated_compiled_assets 
Updated compiled assets
 2022-08-24 16:43:08 -07:00
snipe ab60fa08df Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 16:38:11 -07:00
snipe 8a312f69a6 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 16:37:22 -07:00
Ivan Nieto Vivanco 581cae94ab Add readonly property to datepickers 2022-08-24 18:21:54 -05:00
Ivan Nieto Vivanco 6e85c2e5cb Delete unused import 2022-08-24 16:30:25 -05:00
Ivan Nieto Vivanco 30d0125cbd Remove the rule 'required' for default values, if custom field is obligatory 2022-08-24 16:18:11 -05:00
snipe e2dec5d5d7
Merge pull request #11723 from snipe/fixes/fail_with_error_when_uploaded_file_does_not_exist 
Fixed crash on Asset View if file doesn’t exist on server
 2022-08-24 13:50:26 -07:00
snipe af34fc207c Suppress error output if file doesn’t exist on server 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-24 13:47:56 -07:00
snipe cca531f8ca Add @sunflowerbofh as a contributor 2022-08-22 16:32:30 -07:00
snipe 45f17fea8a
Merge pull request #11510 from sunflowerbofh/tmp-ldap 
Fixed #11509 allow-ldap-anonymous-bind
 2022-08-22 16:32:07 -07:00
snipe 3ac84eab58
Merge pull request #11651 from inietov/fixes/activity_report_search 
Fixed Search in activity report for full name in relation
 2022-08-22 16:23:50 -07:00
snipe 15af4ea56e Add @kylegordon as a contributor 2022-08-22 16:21:20 -07:00
snipe d649c65508
Merge pull request #11669 from kylegordon/master 
Declare DB_PORT in all .env files
 2022-08-22 16:20:40 -07:00
snipe 0965ac9592
Merge pull request #11680 from snipe/snyk-upgrade-3dd3b8528a5a6c5104f99fc833e3820e 
[Snyk] Upgrade @fortawesome/fontawesome-free from 6.1.1 to 6.1.2
 2022-08-22 16:18:15 -07:00
snipe bfadc69d73
Merge pull request #11681 from snipe/snyk-upgrade-ce70c2a6ece4c881ee4f6267e992332c 
[Snyk] Upgrade webpack from 5.73.0 to 5.74.0
 2022-08-22 16:17:53 -07:00
snipe 41be3f7208 Add @julian-piehl as a contributor 2022-08-22 16:17:24 -07:00
snipe 906a36dc1a
Merge pull request #11703 from julian-piehl/fixes/wrong-trans-string 
Fixed Translation String: wrong key at request canceled message
 2022-08-22 16:16:10 -07:00
snipe aba8449dc6
Merge pull request #11707 from wewhite/manager_name 
Fixed #11706 Manager name
 2022-08-22 16:15:52 -07:00
snipe 861283b874
Merge pull request #11712 from Godmartinz/gh11711Admin_options_disappear 
Fixed #11711 clearfix missing on admin settings page  to prevent blanking divs
 2022-08-22 16:15:06 -07:00
Godfrey M 2994c3613a adds clearfix to settings page 2022-08-22 10:46:15 -07:00
Warren White ba7d6dde3f Fixed #11706: changes the display of managers username to First Last name 2022-08-19 10:17:25 -07:00
Warren White 4b9a91f55b Fixed #10565, #11086: correctly looks up Manager DN from AD Manager attribute and sets manager id 2022-08-19 09:09:03 -07:00
Peace 94bbf2bf2f fixed translation string for canceled requests 2022-08-19 13:59:01 +02:00
Ivan Nieto Vivanco e5cc6ec972 Fixes error 500 if checkout_acceptances table have a created_at null column 2022-08-17 22:02:13 -05:00
snyk-bot e97c526050
fix: upgrade webpack from 5.73.0 to 5.74.0 
Snyk has created this PR to upgrade webpack from 5.73.0 to 5.74.0.

See this package in npm:
https://www.npmjs.com/package/webpack

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-08-15 23:41:31 +00:00
snyk-bot 7b45328fcc
fix: upgrade @fortawesome/fontawesome-free from 6.1.1 to 6.1.2 
Snyk has created this PR to upgrade @fortawesome/fontawesome-free from 6.1.1 to 6.1.2.

See this package in npm:
https://www.npmjs.com/package/@fortawesome/fontawesome-free

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-08-15 23:41:27 +00:00
snipe 40bc13a946
Merge pull request #11676 from snipe/fixes/added_category_to_model_info 
Adds the category in the side info on Models > View
 2022-08-14 14:03:09 -07:00