Marcus Moore
530ea474d1
Merge branch 'develop' into saving_custom_report_template
...
# Conflicts:
# resources/lang/en/admin/reports/general.php
# resources/views/reports/custom.blade.php
2024-01-23 13:55:07 -08:00
Marcus Moore
219540281f
Add trailing commas
2024-01-22 12:42:01 -08:00
Marcus Moore
b74115b604
Add docblocks
2024-01-18 15:42:52 -08:00
Marcus Moore
1630392953
Uncheck a couple boxes by default to match existing behavior
2024-01-18 13:30:51 -08:00
Marcus Moore
861ef6312e
Use is_iterable for checks instead of is_array
2024-01-18 13:04:41 -08:00
Marcus Moore
f64aa4dfd4
Improve variable name
2024-01-18 11:58:34 -08: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
786c41ad79
Add some type hints
2024-01-17 17:41:03 -08:00
Marcus Moore
b24d80680e
Add clarifying comments
2024-01-17 17:32:35 -08:00
Marcus Moore
1a1f417633
Change variable name to keep foreach scoped
2024-01-17 17:00:03 -08:00
Marcus Moore
bbfee27fd3
Implement test
2024-01-17 16:40:05 -08:00
Marcus Moore
691e81d827
Implement some tests
2024-01-17 16:25:28 -08:00
Marcus Moore
0ac1dd314a
Organize tests
2024-01-17 13:19:54 -08:00
Marcus Moore
82f4cc799b
Improve variable name
2024-01-17 11:54:37 -08:00
Marcus Moore
4d8d069bbc
Update placeholder
2024-01-17 11:43:34 -08:00
Marcus Moore
5a396cc997
Add assertion
2024-01-17 11:24:50 -08:00
Marcus Moore
0883321d9e
Only limit template creator scope when authenticated
2024-01-17 11:24:38 -08:00
akemidx
2768f19b7c
code cleanup
2024-01-16 18:56:29 -05: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
akemidx
20bd83232e
standardizing naming to use Template
2024-01-11 19:41:19 -05:00
Marcus Moore
d72970b5b6
Add global scope to limit template to current user
2024-01-11 13:59:51 -08:00
Marcus Moore
9c1bea00ad
Add failing test
2024-01-11 13:51:18 -08:00
Marcus Moore
8d8bf73c1b
Scaffold additional tests
2024-01-11 13:51:10 -08: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
Marcus Moore
e5fb888d67
Implement test
2024-01-11 13:34:20 -08:00
Marcus Moore
82df7a66ec
Add form label and remove info box from show and edit pages
2024-01-11 13:19:36 -08:00
Marcus Moore
0202a97e97
Add missing tag
2024-01-11 13:08:08 -08:00
Marcus Moore
b34886ead6
Move box header into box
2024-01-11 13:04:46 -08: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
akemidx
6f6341bc09
about saved reports box
2024-01-10 16:33:35 -05:00
akemidx
5f8e91455f
clarifying name box
2024-01-10 15:39:32 -05:00
akemidx
a5099b5163
translations/messages on report template controller
2024-01-10 15:23:42 -05: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
akemidx
27103124bf
messages/translations
2024-01-09 16:49:56 -05: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
