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
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
d71a04e489
Merge remote-tracking branch 'origin/develop'
2024-01-08 17:24:47 +00: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
snipe
2707c399ea
Check that the asset exists before trying to get properties
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-08 12:42:05 +00:00
snipe
012fe57ca1
Updated assets
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-05 15:16:14 +00:00
snipe
f5960388f1
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
2024-01-05 15:05:22 +00:00
snipe
6ebbd2dc30
Merge pull request #14104 from snipe/feature/google_login_more_prominent
...
Move Google Login prompt higher, made it bigger
2024-01-05 15:03:12 +00:00
snipe
7c5d29ccd9
Move Google Login prompt higher, made it bigger
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-05 14:56:34 +00:00
snipe
93712ec417
Merge pull request #14103 from snipe/bug/user_api_limit_offset_order
...
Moved limit and offset in user API to after additional qualifiers
2024-01-05 12:02:18 +00:00
snipe
f8a21bdb2d
Moved limit and offset to after additional qualifiers
...
Signed-off-by: snipe <snipe@snipe.net>
2024-01-05 11:59:31 +00:00