gavin/snipe-it
1
0
Fork 0
mirror of https://github.com/grokability/snipe-it.git synced 2026-03-12 17:52:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,664 Commits 93 Branches 295 Tags
master
Commit Graph

21664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe
28f493d84d Escape pivot notes 2026-03-09 09:06:58 +00:00
dependabot[bot]
a87e862148 Bump docker/build-push-action from 6 to 7 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6 to 7.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v6...v7)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-09 08:42:34 +00:00
dependabot[bot]
6e264bfee0 Bump docker/metadata-action from 5 to 6 
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 5 to 6.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Commits](https://github.com/docker/metadata-action/compare/v5...v6)

---
updated-dependencies:
- dependency-name: docker/metadata-action
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-09 08:42:27 +00:00
dependabot[bot]
1ecf862f2d Bump docker/setup-buildx-action from 3 to 4 
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3 to 4.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v3...v4)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-version: '4'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2026-03-09 08:42:22 +00:00
snipe
338fc88095 Merge pull request #18647 from grokability/revert-18601-chore/security-upgrade-passport13-socialite-jwt7 
Revert "Upgrade Passport to v13 and move php-jwt to v7 to remediate JWT advisory"
 2026-03-08 12:32:31 +00:00
snipe
0a724cc49a Revert "Upgrade Passport to v13 and move php-jwt to v7 to remediate JWT advisory" 2026-03-08 12:29:56 +00:00
snipe
a2efcf1ca9 Merge pull request #18601 from ubc-cpsc/chore/security-upgrade-passport13-socialite-jwt7 
Upgrade Passport to v13 and move php-jwt to v7 to remediate JWT advisory
 2026-03-08 11:51:15 +00:00
snipe
ffc9e882d7 Merge remote-tracking branch 'origin/develop' 2026-03-08 11:37:38 +00:00
snipe
c9d73e85e1 Fixed RB-4083 2026-03-08 11:37:19 +00:00
Joël Pittet
a956676745 Move Passport 13 key permission normalization to upgrade.php to cover existing installs with incorrect permissions 2026-03-07 22:22:46 -08:00
Joël Pittet
5800d08202 normalize key permissions 2026-03-07 21:59:07 -08:00
Joël Pittet
b8958bad72 Test failure fixes from 'Key Files Permissions Validation' from https://github.com/laravel/passport/blob/13.x/UPGRADE.md#key-files-permissions-validation 2026-03-07 21:59:00 -08:00
Joël Pittet
0508d7558e OAuth Client Table Changes (Optional) from https://github.com/laravel/passport/blob/13.x/UPGRADE.md#oauth-client-table-changes-optional 2026-03-07 21:59:00 -08:00
Joël Pittet
98c3192a13 Bump laravel/socialite to latest patch release, upgrade laravel/passport to 13 which is compatible with Laravel 11, and security release for firebase/php-jwt 2026-03-07 21:59:00 -08:00
snipe
6e7ff15e78 Merge remote-tracking branch 'origin/develop' 2026-03-07 20:50:31 +00:00
snipe
b886e11670 Fixed user API tests 2026-03-07 20:50:18 +00:00
snipe
b0c45c7179 Merge remote-tracking branch 'origin/develop' 2026-03-07 11:05:48 +00:00
snipe
92bb1df82e Removed error log in test 2026-03-07 11:05:33 +00:00
snipe
1c4549dd8e Added word break on history 2026-03-07 11:04:25 +00:00
snipe
83e61ec8cd Unset admin if auth user is not admin 2026-03-07 10:45:57 +00:00
snipe
7ea549df4a Added .journal to gitignore 2026-03-06 21:57:23 +00:00
snipe
0fabc5d88d Merge remote-tracking branch 'origin/develop' 2026-03-06 21:55:59 +00:00
snipe
af1c55cd7e Small code re-org for clarity 2026-03-06 21:55:46 +00:00
snipe
7822c0bc3e Merge pull request #18644 from uberbrady/fix_location_observer 
Re-add Location Observer with null-safe companyable check
 2026-03-06 21:47:58 +00:00
Brady Wetherington
2b7ed1f7fa Re-add Location Observer with null-safe companyable check 2026-03-06 21:43:19 +00:00
snipe
33ae9f1d5b Merge remote-tracking branch 'origin/develop' 2026-03-06 20:15:11 +00:00
snipe
45ddaf1b72 Temp comment out location observer 2026-03-06 20:14:56 +00:00
snipe
f27aae5e31 Merge remote-tracking branch 'origin/develop' 2026-03-06 14:03:50 +00:00
snipe
7595c922fa Fixed #18043 - added location logging 2026-03-06 14:03:37 +00:00
snipe
ff6a6407f5 Merge remote-tracking branch 'origin/develop' 2026-03-06 13:40:16 +00:00
snipe
4d4513d936 Fixed #18642 - view-assets mobile 2026-03-06 13:40:01 +00:00
snipe
e378c99923 Layout tweakas 2026-03-06 13:29:38 +00:00
snipe
32a6c8edbe Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	public/js/dist/all.js
#	public/js/dist/all.js.map
#	public/mix-manifest.json
 2026-03-06 10:48:34 +00:00
snipe
078c870970 Merge pull request #18162 from Godmartinz/status_bulk_select_fix 
Adds #17685 better warning for bulk status change to undeployable type
 2026-03-06 09:58:41 +01:00
snipe
4a91d37423 Merge pull request #17666 from akemidx/xxdays-since-last-update 
Feature: Added xx days since last update to Custom Report
 2026-03-06 09:54:32 +01:00
snipe
96befb2aef Merge branch 'develop' into xxdays-since-last-update 2026-03-06 09:54:01 +01:00
snipe
925452e106 Merge pull request #18248 from iryadifarhan/fix/depreciation-report-displays-incorrect-monthly-depreciation-value 
Fixes inaccurate monthly depreciation value displayed at depreciation report when using a floor value
 2026-03-06 09:40:39 +01:00
snipe
1678330f0c Merge pull request #18426 from akemidx/global-report-templates 
Fixed: Added global report templates
 2026-03-06 09:30:15 +01:00
snipe
58cf3fc2ea Dev assets 2026-03-06 08:17:48 +00:00
snipe
13ce17ffc6 Merge pull request #18494 from marcusmoore/livewire4 
Upgraded Livewire to v4
 2026-03-06 09:16:25 +01:00
snipe
70e020ee0c Merge pull request #18637 from marcusmoore/test-updates 
Fixed some minor issues in tests
 2026-03-06 09:16:00 +01:00
snipe
c6a167ef40 Removed min-height (this might go badly) 2026-03-06 07:42:28 +00:00
snipe
f0d1697108 Merge remote-tracking branch 'origin/develop' 2026-03-06 06:46:08 +00:00
snipe
420ba5f261 Fixed #18341 - remove action button from user profile view 2026-03-06 06:45:46 +00:00
snipe
90cb53566c Merge remote-tracking branch 'origin/develop' 2026-03-06 06:24:38 +00:00
snipe
7aa1f3ae1d Merge pull request #18639 from grokability/#18282-add-user-notes-to-custom-export 
Fixed #18282 - added original notes to checkout target in custom report
 2026-03-06 07:23:58 +01:00
snipe
556d638136 Fixed #18282 - added original notes to checkout target in custom report 2026-03-06 06:19:16 +00:00
snipe
64982d01cf Merge remote-tracking branch 'origin/develop' 2026-03-06 05:59:23 +00:00
snipe
c4aa10baf8 Added user company to custom asset report 2026-03-06 05:59:11 +00:00
snipe
b6cad58917 Merge remote-tracking branch 'origin/develop' 2026-03-06 05:39:20 +00:00