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
snipe
99000fada1
Merge pull request #14127 from snipe/jerm/upgrade-deps-file
...
Add php version requirements file for future-proofing upgrades
2024-01-17 13:15:56 +00: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
Jeremy Price
58b2f8ca17
typo
2024-01-11 19:12:24 -08:00
Jeremy Price
8be3c1aaf2
Quit the script when we hit hard errors
...
a found a few other points where we talk about exiting and re-running
the script once fixed, but never actually exit. So i'm adding-in the
missing exits, and updating any existing exits to make sure we return a
failing return code to the shell
2024-01-11 18:20:09 -08:00
Jeremy Price
2ee8639eaf
Check to make sure there's a .env file
...
While i was testing this, i noticed that it ran right by the .env check,
even though i don't have a .env file at all. The script checks for a
_bad_ .env, but not a missing one.
Now it does
2024-01-11 18:18:41 -08:00
Jeremy Price
32605578dd
Add remote requirements checking to upgrade.php
...
quoted from https://github.com/snipe/snipe-it/pull/14127
There is a race condition in the upgrade.php file where it can't
currently know the hard requirements for the version it's upgrading to
until it does a git pull. By that time, it will have pulled new source
code that possibly relies on an incompatible version of php, leaving you
with a broken installation.
Example: You're running v6.2.x on PHP 7.4, which is fine. v7 requires
PHP 8.1 or 8.2, but we couldn't know that when we released v6. or v5 for
that matter. We could change the requirements in the most-recent v6
version of upgrade.php, but that doesn't help anyone who doesn't upgrade
first to the most recent v6.
With this change, we implement fetching and incorporating the
requirements data from the remote file.
It's just fetching/decoding a couple of json values that replace the
hard-coded version requirements.
We move the branch checking higher than the php version checking so that
we can use the defined/overridden $branch to decide what branch to pull
the requirements from.
2024-01-11 18:13:59 -08:00
Jeremy Price
fe0bba6df6
rename upgrade requirements file and add snipeit version differentiation
...
the latter mostly for testing and san checking.. but it doesn't really
matter because it's just json.. if we don't use it we don't use it
2024-01-11 16:52:39 -08:00
Jeremy Price
5fdcd6298f
rename php_max_major, because it's not.. it's major_minor, even if it sounds ridiculous
2024-01-11 16:50:16 -08:00
Jeremy Price
55943dbff6
add comments and php_max_wontwork because that's what we use rigth now and MVP, dammit
2024-01-11 16:47:47 -08:00
Jeremy Price
d12e571b20
undoing versioning.. doesn't make sense
2024-01-11 16:32:17 -08:00
Jeremy Price
0c15f05316
Initial upgrade_requirements.json file
...
for fetching before upgrades, to check major prereqs -- mainly php -- before
pulling down new, possibly breaking, code.
2024-01-11 16:27:03 -08: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
