DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12890 commits 96 branches 267 tags 295 MiB
Commit graph

12890 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey Martinez b797795d37
Merge pull request #11 from Godmartinz/license_checkable 
adds consumable checkout  ms notification
 2024-01-23 11:22:02 -08:00
Godfrey M 7c529df49b adds consumable checkout ms notification 2024-01-23 11:21:20 -08:00
Godfrey Martinez 81e92228f3
Merge pull request #10 from Godmartinz/license_checkable 
adds licenses ms notifications
 2024-01-23 11:12:02 -08:00
Godfrey M e969f8808c adds licenses ms notifications 2024-01-23 11:10:04 -08:00
Godfrey M 5a46ef5d5b adds Accessory Check in out Notifcations, 2024-01-22 15:30:15 -08:00
Godfrey M f049cf5b06 adds Asset Check Out Notification 2024-01-22 10:57:22 -08: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 0fbf154187 Merge remote-tracking branch 'origin/develop' 2024-01-18 10:50:12 +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
Godfrey M befab608f2 cha cha cha changes 2024-01-17 17:59:20 -08:00
Godfrey M cdcd868162 formats check in message for MS Teams 2024-01-17 17:31:23 -08:00
Godfrey M ce02e43ab2 fixed integration link, added some conditionals 2024-01-17 16:30:27 -08:00
Godfrey M 9f2af40ef2 adds MS teams integration test 2024-01-17 13:41:45 -08:00
Godfrey M 93ef8317e8 added payload, new MS webhook test method 2024-01-17 11:49:31 -08: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 2ae5029bc4 Merge remote-tracking branch 'origin/develop' 2024-01-15 16:11:59 +00: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 73ddc0f669 Merge remote-tracking branch 'origin/develop' 2024-01-11 21:46:20 +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 5beeaa237b Merge remote-tracking branch 'origin/develop' 2024-01-10 13:20:36 +00: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 9c9af12e83 Merge remote-tracking branch 'origin/develop' 2024-01-10 13:06:38 +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 be32152394 Merge remote-tracking branch 'origin/develop' 2024-01-09 17:44:19 +00: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 8001ed8436 Merge remote-tracking branch 'origin/develop' 2024-01-08 22:30:05 +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