Commit graph

12422 commits

Author SHA1 Message Date
snipe 8ca4c51186 Updated strings
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 15:29:39 +00:00
snipe f247661f07
Merge pull request #14159 from snipe/fixes/not_array_typo
Fixed english and attribute placeholder
2024-01-24 14:59:57 +00:00
snipe f73a55f9ab Fixed english and attribute placeholder
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 14:58:06 +00:00
snipe 7668a6767d
Merge pull request #14102 from Godmartinz/seat-id-is-zero
Fixed license seats id turning to zero when sorting by department
2024-01-24 14:49:33 +00:00
snipe 684264dac7
Merge pull request #14158 from snipe/fixes/moved_url_string_again
Moved URL string to general
2024-01-24 14:48:26 +00:00
snipe e6f94cfebf Missed one
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 14:47:54 +00:00
snipe c54eb22754 Moved URL string to general
Signed-off-by: snipe <snipe@snipe.net>
2024-01-24 14:46:52 +00:00
snipe 661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations
Adds translations for Label example
2024-01-24 13:36:40 +00:00
snipe 49dc1dd37a
Merge pull request #14132 from marcusmoore/chore/sc-24501
Improved radio button values in custom report form
2024-01-24 13:22:48 +00:00
snipe bfc9be6b97
Merge pull request #14149 from snipe/dependabot/github_actions/develop/actions/cache-4
Bump actions/cache from 3 to 4
2024-01-24 13:22:08 +00:00
snipe 1b7885677a
Merge pull request #14155 from uberbrady/ldap_location_fixes
Fix for LDAP syncing with base_dn and location_id and location [FD-39651]
2024-01-24 13:21:46 +00:00
Brady Wetherington 3bc1b9038d Fix for LDAP syncing with base_dn and location_id and location 2024-01-24 11:54:29 +00:00
dependabot[bot] a1ccea4e34
Bump actions/cache from 3 to 4
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-01-22 08:50:37 +00:00
snipe 2fa5eb4365
Merge pull request #14144 from snipe/fixes/updated_apple_url
Updated URL for apple manufacturer
2024-01-18 11:53:28 +00:00
snipe aceb072a1b Updated URL for apple manufacturer
Signed-off-by: snipe <snipe@snipe.net>
2024-01-18 11:49:30 +00:00
snipe 2a7be4dfd5
Merge pull request #14143 from fe80/feat/redis-database
feat(config): add REDIS_DATABASE support
2024-01-18 10:49:32 +00:00
fe80 f52b17cca6
feat(config): add REDIS_DATABASE support
Add the possibility to set the redis database to use.
The default value is still 0
2024-01-18 11:32:51 +01:00
Marcus Moore 8aa5cf530b
Improve radio button values in custom report form 2024-01-16 12:33:16 -08:00
Godfrey M 6be8c063a9 added moar translations 2024-01-16 12:05:09 -08:00
Godfrey M 74dc17b4b9 adds translations for Label example 2024-01-16 10:47:45 -08:00
snipe adba2d5b6c Remove 7 day padding for expected assets
Signed-off-by: snipe <snipe@snipe.net>
2024-01-15 16:11:31 +00:00
snipe 66c24e152f
Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation
Fixed [FD-39640]: preserve sort order when generating asset labels
2024-01-11 21:46:01 +00:00
snipe f610afb1b8
Merge pull request #14121 from Godmartinz/checkout_bug_fix
Fixed multiple click checkouts for consumables, accessories and components
2024-01-11 11:15:48 +00:00
Godfrey M 1f7f9717c5 fixes checkout bug 2024-01-10 11:35:32 -08:00
snipe f151de2adc
Merge pull request #14118 from snipe/fixes/_supplier_searchable_on_maintenances
Search on supplier name attached to maintenance
2024-01-10 13:18:47 +00:00
snipe b94aaad9b5 Search on supplier name attached to maintenance
Signed-off-by: snipe <snipe@snipe.net>
2024-01-10 13:16:07 +00:00
snipe 1a48790dfe
Merge pull request #14116 from marcusmoore/bug/sc-24475
Guard against passing non-integer for company_id when creating asset
2024-01-09 19:08:14 +00:00
Marcus Moore 423b636db9
Guard against non-integers being passed for company_id 2024-01-09 10:57:43 -08:00
snipe 824c3e6ecf
Merge pull request #14087 from ubc-cpsc/bugfix/CVE-2023-51651
Fixes CVE-2023-51651 Potential URI resolution path traversal in the AWS SDK for PHP
2024-01-09 17:44:04 +00:00
snipe 4053b75f49 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-01-09 17:43:11 +00:00
snipe ea4a0c2293 docs: add @mauro-miatello as a contributor 2024-01-09 17:43:03 +00:00
snipe 10ee6ee5c4
Merge pull request #14115 from mauro-miatello/develop
Added license expiration date in "view asset"
2024-01-09 17:38:51 +00:00
MrM 9d16eacad5
Added license expiration date in "view asset"
I've added the expiration date of the license associated with an asset in hardware/ID#software, it is useful to see all of them on the asset page instead of having to open the license details page. I've also fixed a space formatting issue.
2024-01-09 18:30:51 +01:00
Brady Wetherington 4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
snipe eaf6d56253
Merge pull request #14109 from marcusmoore/chore/sc-24397
Moved contributors to dedicated file
2024-01-08 22:28:52 +00:00
snipe 8541a342cb
Merge pull request #14108 from Godmartinz/asset_maintenance_scope
Added supplier name as a searchable relation on the asset maintenance report
2024-01-08 22:25:55 +00:00
Godfrey M 4184b271f7 adds Supplier as a searchable relation on the asset maintenance report 2024-01-08 14:22:35 -08:00
Marcus Moore 6b105ba8f0
Move link 2024-01-08 14:17:42 -08:00
Marcus Moore 348ed1e555
Add link to contributors file 2024-01-08 14:16:15 -08:00
Marcus Moore 8314047bfb
Add newline to start of contributors file 2024-01-08 14:02:09 -08:00
Marcus Moore 1bd4b3827d
Add missing comma 2024-01-08 13:47:43 -08:00
Marcus Moore a2463c2a71
Reference correct file 2024-01-08 13:43:26 -08:00
Marcus Moore f4d568bf89
Add missing config key 2024-01-08 13:40:57 -08:00
Marcus Moore eb862c27b8
Add config keys 2024-01-08 13:31:30 -08:00
Marcus Moore 18f79ad924
Move contributors from readme to dedicated files 2024-01-08 13:29:18 -08:00
Marcus Moore afb396ed65
Add contributor commands to package.json 2024-01-08 13:26:58 -08:00
Marcus Moore 8ea15fc6aa
Run generate command to migrate to new style
(from markdown style tables and images to html style)

./node_modules/.bin/all-contributors generate
2024-01-08 12:42:45 -08:00
Marcus Moore 064ec1c22d
Add missing markers 2024-01-08 12:39:40 -08:00
Marcus Moore 2f47217003
Add all-contributors-cli as dev dependency 2024-01-08 12:26:52 -08:00
snipe 4f8defb67d
Merge pull request #14107 from snipe/bug/sc-24471
Check that the asset exists before trying to get properties
2024-01-08 12:43:13 +00:00