snipe
|
2137c4e897
|
Back to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-04 10:12:25 -07:00 |
|
snipe
|
4a0e51bf34
|
Merge remote-tracking branch 'origin/develop'
|
2022-07-04 10:11:05 -07:00 |
|
snipe
|
9f581a7677
|
Merge pull request #11460 from mikeroq/fix_missing_use_statement
Fixes #11459 Missing import for Setting model in AcceptanceController
|
2022-07-04 10:07:54 -07:00 |
|
mikeroq
|
be8869978d
|
Added import for Setting model
|
2022-07-04 07:29:01 -05:00 |
|
snipe
|
e550fb1a52
|
Merge pull request #11447 from snipe/dependabot/github_actions/docker/metadata-action-4
Bump docker/metadata-action from 3 to 4
|
2022-07-03 20:04:15 -07:00 |
|
snipe
|
fc65bb020f
|
Merge pull request #11446 from snipe/dependabot/github_actions/docker/login-action-2
Bump docker/login-action from 1 to 2
|
2022-07-03 20:03:50 -07:00 |
|
snipe
|
a4dfdcd90d
|
Merge pull request #11450 from snipe/dependabot/github_actions/docker/build-push-action-3
Bump docker/build-push-action from 2 to 3
|
2022-07-03 20:03:32 -07:00 |
|
snipe
|
16d2e34148
|
Merge pull request #11448 from snipe/dependabot/github_actions/docker/setup-buildx-action-2
Bump docker/setup-buildx-action from 1 to 2
|
2022-07-03 20:03:08 -07:00 |
|
snipe
|
567eefab1a
|
Merge pull request #11449 from snipe/dependabot/github_actions/github/codeql-action-2
Bump github/codeql-action from 1 to 2
|
2022-07-03 20:02:31 -07:00 |
|
snipe
|
1ef20ec622
|
Merge remote-tracking branch 'origin/develop'
|
2022-07-02 13:08:59 -07:00 |
|
snipe
|
afab167e8c
|
Fixed restore button in listings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-02 13:08:46 -07:00 |
|
snipe
|
af14ee0d47
|
Merge pull request #11453 from mikeroq/fixes/asset_restore_not_working
Fixes #11452 - Asset Restore routes/buttons also asset models/users restore as well
|
2022-07-02 13:07:29 -07:00 |
|
Mike Roquemore
|
0a5ca6eb25
|
Change restore route to POST instead of GET
|
2022-07-02 14:34:43 -05:00 |
|
Mike Roquemore
|
6e9f24c08f
|
Change restore route to POST instead of GET
|
2022-07-02 14:34:23 -05:00 |
|
Mike Roquemore
|
07ac4087a3
|
Remove link from alert since there is already a restore button on the side
|
2022-07-02 14:34:22 -05:00 |
|
Mike Roquemore
|
1650c9f878
|
Remove duplicate users routes
|
2022-07-02 14:34:22 -05:00 |
|
Mike Roquemore
|
123963c14c
|
Modify genericActionsFormatter restore link to be a button instead since it's in a form.
Changed user restore route to POST
|
2022-07-02 14:34:22 -05:00 |
|
snipe
|
9a0b677dac
|
Merge remote-tracking branch 'origin/develop'
|
2022-07-01 14:31:29 -07:00 |
|
snipe
|
b44f27dafa
|
Add @mikeroq as a contributor
|
2022-07-01 14:31:07 -07:00 |
|
snipe
|
92d46edca3
|
Cleaned up logging output
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-01 13:33:58 -07:00 |
|
dependabot[bot]
|
471cf117ab
|
Bump docker/build-push-action from 2 to 3
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 2 to 3.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v2...v3)
---
updated-dependencies:
- dependency-name: docker/build-push-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-07-01 18:36:55 +00:00 |
|
dependabot[bot]
|
bf78bd4b8b
|
Bump github/codeql-action from 1 to 2
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 1 to 2.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v1...v2)
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-07-01 18:36:50 +00:00 |
|
dependabot[bot]
|
a0a0d7e344
|
Bump docker/setup-buildx-action from 1 to 2
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 1 to 2.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v1...v2)
---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-07-01 18:36:45 +00:00 |
|
dependabot[bot]
|
a9361571d6
|
Bump docker/metadata-action from 3 to 4
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 3 to 4.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Upgrade guide](https://github.com/docker/metadata-action/blob/master/UPGRADE.md)
- [Commits](https://github.com/docker/metadata-action/compare/v3...v4)
---
updated-dependencies:
- dependency-name: docker/metadata-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-07-01 18:36:41 +00:00 |
|
dependabot[bot]
|
1a13be9b5d
|
Bump docker/login-action from 1 to 2
Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](https://github.com/docker/login-action/compare/v1...v2)
---
updated-dependencies:
- dependency-name: docker/login-action
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-07-01 18:36:36 +00:00 |
|
snipe
|
0ed84c83c8
|
Merge pull request #11437 from turrisxyz/Dependabot-GitHub-Actions
chore: Included githubactions in the dependabot config
|
2022-07-01 11:35:58 -07:00 |
|
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 |
|