snipe
|
9670ca3b8a
|
Merge remote-tracking branch 'origin/develop'
|
2022-07-01 11:26:46 -07:00 |
|
snipe
|
d4476cb10b
|
Merge pull request #11445 from snipe/fixes/11444
Replicates #11444
|
2022-07-01 11:26:25 -07:00 |
|
snipe
|
45c616639c
|
Replicates #11444
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-01 11:21:02 -07:00 |
|
snipe
|
eedd646c28
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-30 21:10:46 -07:00 |
|
snipe
|
acbd4deb1b
|
Merge pull request #11440 from snipe/fixes/check_for_image_on_signing
Fixed #11393 - reject acceptance if no file is present
|
2022-06-30 21:09:16 -07:00 |
|
snipe
|
4e547a3639
|
Fixed typos :(
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 21:06:36 -07:00 |
|
snipe
|
b910db0617
|
Fixed #11393 - reject acceptance if no file is present
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 21:01:58 -07:00 |
|
snipe
|
bb382f3d2a
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-30 18:52:02 -07:00 |
|
snipe
|
25cb32ca6a
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 18:51:44 -07:00 |
|
snipe
|
6a13a7e096
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-30 18:38:25 -07:00 |
|
snipe
|
e366caf3d1
|
Merge pull request #11438 from uberbrady/backout_linear_depreciation_math
Revert a change in our Linear Depreciation math
|
2022-06-30 18:38:03 -07:00 |
|
naveen
|
cfa301f5ae
|
chore: Included githubactions in the dependabot config
This should help with keeping the GitHub actions updated on new releases. This will also help with keeping it secure.
Dependabot helps in keeping the supply chain secure https://docs.github.com/en/code-security/dependabot
GitHub actions up to date https://docs.github.com/en/code-security/dependabot/working-with-dependabot/keeping-your-actions-up-to-date-with-dependabot
https://github.com/ossf/scorecard/blob/main/docs/checks.md#dependency-update-tool
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
|
2022-07-01 01:33:50 +00:00 |
|
Brady Wetherington
|
f72aa2415f
|
Revert a change in our Linear Depreciation math; I think the old algorithm was correct
|
2022-06-30 18:24:45 -07:00 |
|
snipe
|
7969a66552
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-30 18:17:51 -07:00 |
|
snipe
|
4edba064d5
|
Removed duplicate model column in depreciation report
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 18:17:30 -07:00 |
|
snipe
|
f3a3c59b7b
|
Fixed branch name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 18:05:46 -07:00 |
|
snipe
|
aa54c23f98
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 18:04:53 -07:00 |
|
snipe
|
df1e2687d6
|
Updated languages
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 17:35:02 -07:00 |
|
snipe
|
4f07e77bf9
|
Add @naveensrinivasan as a contributor
|
2022-06-30 17:35:02 -07:00 |
|
snipe
|
a10f570350
|
Merge pull request #11436 from turrisxyz/Pinned-Dependencies-GitHub
chore: Set permissions for GitHub actions
|
2022-06-30 17:30:17 -07:00 |
|
naveen
|
ac94aa8e46
|
chore: Set permissions for GitHub actions
Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.
- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions
https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions
https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs
[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)
Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>
|
2022-07-01 00:29:21 +00:00 |
|
snipe
|
7ebf125dae
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-30 15:44:51 -07:00 |
|
snipe
|
9a361d573f
|
Merge pull request #11435 from snipe/features/ldap_warnings
Added warnings for common LDAP misconfigs
|
2022-06-30 15:44:33 -07:00 |
|
snipe
|
1a423a252b
|
Derp
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 15:22:58 -07:00 |
|
snipe
|
7591f3f092
|
Added auth filter check regex
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 15:15:49 -07:00 |
|
snipe
|
2cace3c73a
|
Added LDAP warnings on page load
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 15:08:12 -07:00 |
|
snipe
|
97afafdd48
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-30 14:20:34 -07:00 |
|
snipe
|
656efc5f92
|
Fixed missing trans()
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 14:20:15 -07:00 |
|
snipe
|
46d055cf74
|
Fixed weird extra padding on crown
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 14:17:53 -07:00 |
|
snipe
|
423e7439ee
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-30 14:09:19 -07:00 |
|
snipe
|
2262ef818e
|
Merge pull request #11427 from Godmartinz/email_users_list
[feature] adds button to email user list of assets from profile
|
2022-06-29 15:25:18 -07:00 |
|
snipe
|
02459aad26
|
Merge pull request #11430 from uberbrady/scim_more_tolerant
Make SCIM be more tolerant of missing fields
|
2022-06-29 15:24:25 -07:00 |
|
Brady Wetherington
|
2451bb9a2b
|
Make SCIM be more tolerant of missing fields
|
2022-06-29 14:48:59 -07:00 |
|
Godfrey M
|
cd9d2d0cec
|
adds docblock
|
2022-06-29 13:01:29 -07:00 |
|
Godfrey M
|
fc636ea888
|
removed redundant header
|
2022-06-29 12:01:56 -07:00 |
|
Godfrey M
|
e471aa8639
|
adds button to email user list of assets from profile
|
2022-06-29 11:15:15 -07:00 |
|
snipe
|
180f36d145
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-29 05:04:21 -07:00 |
|
snipe
|
f8fd87b896
|
Add @ntbutler-nbcs as a contributor
|
2022-06-29 05:04:07 -07:00 |
|
snipe
|
130c8ea1b0
|
Add @ntbutler-nbcs as a contributor
|
2022-06-29 05:03:22 -07:00 |
|
snipe
|
5af6330398
|
Merge pull request #11417 from ntbutler-nbcs/master
[Feature] - Add checkoutByTag API endpoint for assets
|
2022-06-29 05:03:01 -07:00 |
|
snipe
|
daaf8713d8
|
Merge branch 'dampfklon-9813-duplicate-accept-asset' into develop
|
2022-06-29 04:58:26 -07:00 |
|
snipe
|
5b02d9ed06
|
Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/account/accept/create.blade.php
|
2022-06-29 04:58:13 -07:00 |
|
snipe
|
b04cf20735
|
Merge pull request #10758 from inietov/fixes/badmethodcallexception_undefined_method_Asset.unaccepted_develop
Fixes BadMethodCallException Call to undefined method App\Models\Asset::unaccepted() for master [ch-17636]
|
2022-06-29 04:34:51 -07:00 |
|
Nathan Butler
|
6531657ee0
|
Revert version to dev for pull request
|
2022-06-29 18:00:15 +10:00 |
|
Nathan Butler
|
e28e7e37b8
|
Removed unneeded checks when searching for asset
|
2022-06-29 17:49:50 +10:00 |
|
snipe
|
467f59e193
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-29 00:25:00 -07:00 |
|
snipe
|
be9e6fe847
|
Another typo
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-29 00:24:33 -07:00 |
|
snipe
|
b0e13611f7
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-29 00:24:08 -07:00 |
|
snipe
|
f3887aef33
|
Merge remote-tracking branch 'origin/develop'
|
2022-06-29 00:10:38 -07:00 |
|
snipe
|
7b3f891edd
|
Merge pull request #11418 from snipe/features/api_backup_download
Download backup via API
|
2022-06-29 00:07:09 -07:00 |
|