8a4c90ade8
Check that the asset is not deleted
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 10:14:25 +00:00
1dfa1da0ee
Disable the edit button if permission is not allowed
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 10:14:10 +00:00
71ebade641
Added serial and status to searchable relations
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:59:10 +00:00
b86b05c4fc
Added serial and status fields to presenter
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:58:55 +00:00
35a70988cb
Added sorting by status label
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:58:39 +00:00
56ba26eb45
Disallow editing of deleted assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:58:07 +00:00
adb8be9345
Added bootstrap formatting to show deleted assets more clearly
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:57:57 +00:00
abc9ee22c6
Added serial and status to transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:48:02 +00:00
e5ee9760c0
I don’t think we use these anyore because of the modifiers on date
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:47:33 +00:00
7868a8c174
Added serial for API controller
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:47:13 +00:00
03df4cec45
Fixed typo
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-14 09:46:43 +00:00
a866d6b16e
Merge pull request #14261 from snipe/fixed/missing_location_string
...
Fixed incorrect string for location not existing
2024-02-13 20:29:32 +00:00
a76a69d085
Fixed incorrect string for location not existing
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-13 20:23:32 +00:00
60ba898167
Merge pull request #14255 from marcusmoore/chore/sc-24805
...
Added LDAP group tag to LDAP tests
2024-02-13 13:42:51 +00:00
2c9d5b9ea3
Merge pull request #14247 from ubc-cpsc/bugfix/CVE-2023-37260
...
Fixes CVE-2023-37260 upgrading league/oauth2-server
2024-02-13 13:40:53 +00:00
eb6e2636b5
Merge pull request #14246 from ubc-cpsc/bugfix/CVE-2022-24894
...
Fixes CVE-2022-24894 by upgrading symfony/http-kernel
2024-02-13 13:40:33 +00:00
4c1964d509
Merge pull request #14245 from ubc-cpsc/bugfix/CVE-2024-24821
...
Fixes CVE-2024-24821 by upgrading composer/composer
2024-02-13 13:39:16 +00:00
7547277352
Merge pull request #14236 from snipe/jerm/upgrade-script-enhancements
...
Change how we check forward-looking upgrade requirements
2024-02-13 13:38:35 +00:00
3e00bc49fd
Merge pull request #14250 from mauro-miatello/develop
...
Cleaned up navbar-custom-menu
2024-02-13 13:33:03 +00:00
99e0b65de7
Merge pull request #14256 from marcusmoore/bug/sc-24790
...
Fixed accessory check in emails being sent when setting disabled
2024-02-13 13:32:42 +00:00
f4c1460c2b
remove help text options until i put together the help text
2024-02-12 19:18:26 -08:00
bb2e1de0a8
Change how we check forward-looking upgrade requirements
...
In https://github.com/snipe/snipe-it/pull/14128 we added the capability
for the upgrade.php script to check version requirements _before_
downloading the new source, to help keep from breaking installations.
Turns out, `file_get_contents()` isn't a reliable way to grab a url, because
some systems have `allow_url_fopen` turned off in their PHP
configurations.
In this iteration, we swap that out for a curl function, while also
adding more error handling, the ability to entirely skip the
PHP version checks if for some reason you Just Can't query the upgrade
json correctly, as well as adding a lot of helpful text around the whole
issue.
Additionally, I've added some error checking around DB backups and
initial artisan down-ing, since shell_exec would happily march right
past any errors.
2024-02-12 19:18:26 -08:00
7154d23759
Pass the correct variable to the route helper
2024-02-12 16:45:18 -08:00
df23fd0dee
Remove usused import
2024-02-12 16:35:54 -08:00
adfb8895df
Improve factory state name
2024-02-12 16:31:32 -08:00
c8e12ddb5c
Remove bug in factory state
2024-02-12 16:30:09 -08:00
5b181ecea7
Remove old comment
2024-02-12 16:29:34 -08:00
728aaaab20
Ensure accessory check in emails are not sent when the setting is disabled
2024-02-12 16:22:59 -08:00
095a7d9b34
Scaffold tests around accessory check in
2024-02-12 12:54:48 -08:00
cf53f2778f
Add LDAP test cases to group
2024-02-12 12:28:27 -08:00
65e20282b6
Merge pull request #14251 from snipe/dependabot/github_actions/develop/codacy/codacy-analysis-cli-action-4.4.0
...
Bump codacy/codacy-analysis-cli-action from 4.3.0 to 4.4.0
2024-02-12 08:35:30 +00:00
405c5b5ad0
Bump codacy/codacy-analysis-cli-action from 4.3.0 to 4.4.0
...
Bumps [codacy/codacy-analysis-cli-action](https://github.com/codacy/codacy-analysis-cli-action ) from 4.3.0 to 4.4.0.
- [Release notes](https://github.com/codacy/codacy-analysis-cli-action/releases )
- [Commits](https://github.com/codacy/codacy-analysis-cli-action/compare/v4.3.0...v4.4.0 )
---
updated-dependencies:
- dependency-name: codacy/codacy-analysis-cli-action
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com >
2024-02-12 08:33:17 +00:00
6f0fe16b87
Update default.blade.php
...
removed some repeated attributes
2024-02-11 18:45:37 +01:00
111daffc17
Merge pull request #14188 from spencerrlongg/bug/14146
...
Fixes Default Location Being Set During Asset Creation and Checkout
2024-02-10 11:47:46 +00:00
b8a478f558
Fixes by CVE-2023-37260 upgrading league/oauth2-server
2024-02-09 17:24:07 -08:00
9f7084d077
Revert "Fixes by CVE-2022-24894 upgrading league/oauth2-server"
...
This reverts commit 0840cd3df3
2024-02-09 17:22:36 -08:00
0840cd3df3
Fixes by CVE-2022-24894 upgrading league/oauth2-server
2024-02-09 17:21:24 -08:00
cefdaf9a9b
Fixes CVE-2022-24894
2024-02-09 17:17:44 -08:00
13335b19e9
Fixes CVE-2024-24821
2024-02-09 17:04:34 -08:00
513ea67e7d
Merge pull request #14244 from snipe/fixes/null_barcode_if_hard_deleted
...
Return null if asset was hard-deleted/purged
2024-02-09 21:09:17 +00:00
3868e711f4
Return null if asset was hard-deleted/purged
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 21:08:07 +00:00
c12e1f6d6c
Merge pull request #14243 from snipe/fixes/reports_controller_when_item_is_deleted
...
Fixed ReportsController to not try to return a serial if the item doesn’t exist
2024-02-09 20:54:37 +00:00
479abd5231
Do not try to return a serial if the item doesn’t exist
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 20:53:33 +00:00
55b3050ca8
Re-applied previous withTrashed PR
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 20:37:18 +00:00
2c996a8508
Merge pull request #14241 from snipe/revert-14240-feature/sc-24786
...
Revert "Fixed barcodes crashing if asset was deleted"
2024-02-09 20:36:02 +00:00
84f8eee869
Revert "Fixed barcodes crashing if asset was deleted"
2024-02-09 20:35:45 +00:00
590c19dbd7
Merge pull request #14240 from snipe/feature/sc-24786
...
Feature/sc 24786
2024-02-09 20:28:31 +00:00
fa47707974
Use withTrashed() to get the barcode on deleted assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 20:26:49 +00:00
ca62481083
Added button and route
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-09 20:23:13 +00:00
f4fc845375
Updated dev assets
...
Signed-off-by: snipe <snipe@snipe.net >
2024-02-08 23:06:47 +00:00
