3
0
mirror of https://github.com/snipe/snipe-it.git synced 2025-12-01 11:30:10 +00:00

20569 Commits

Author SHA1 Message Date
9e23117f9c Merge remote-tracking branch 'origin/develop' 2025-11-26 00:35:26 +00:00
b3996f1970 In the sea, @uberbrady! (fixed missing semicolon) 2025-11-26 00:35:16 +00:00
a3bfcc962d Merge remote-tracking branch 'origin/develop' 2025-11-25 18:50:23 +00:00
ca4ed605a8 Merge pull request #18246 from Godmartinz/resize-label-fields-conditionally-L6009_A
Fixes [FD-52064] Avery `L6009_A` & `L4736_A` label field overflow with scaling
2025-11-25 18:37:06 +00:00
d3e6d7442f typo bonanza 2025-11-25 10:30:56 -08:00
b558bc5334 change variable" 2025-11-25 10:30:06 -08:00
204d7b5be6 added scaling to L4736_A 2025-11-25 10:23:08 -08:00
7dccfec332 adds notes 2025-11-25 10:12:27 -08:00
0b694bfd0b Merge remote-tracking branch 'origin/develop' 2025-11-25 18:02:23 +00:00
dfb59d8a55 Added link to rudder2snipe repo 2025-11-25 18:01:29 +00:00
56a44ad421 Merge remote-tracking branch 'origin/develop' 2025-11-25 13:38:54 +00:00
a12ee3c0da Merge pull request #18245 from uberbrady/redirect_upgrader
Add new 'git remote' management to change Snipe-IT URLs
2025-11-25 13:38:31 +00:00
a657c479be Add new 'git remote' management to change Snipe-IT URL's 2025-11-25 13:17:56 +00:00
ab82c5fd88 resizes label field box to size if needed 2025-11-24 11:04:23 -08:00
78cfb19f69 Merge remote-tracking branch 'origin/develop' 2025-11-24 17:40:26 +00:00
f2334082ee Added tag color to location query 2025-11-24 17:40:13 +00:00
58a47cb52b Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	config/version.php
2025-11-24 12:32:17 +00:00
c7cb4674f5 Bumped version 2025-11-24 12:31:50 +00:00
523df21d83 Merge remote-tracking branch 'origin/develop' 2025-11-24 12:30:22 +00:00
82314076a9 Updated translations 2025-11-24 12:30:07 +00:00
d04bf2e8f2 Merge remote-tracking branch 'origin/develop' 2025-11-24 11:37:44 +00:00
a1c67b5154 Fixed user details toggle 2025-11-24 11:37:14 +00:00
3e343fe8b7 Merge pull request #18236 from grokability/dependabot/github_actions/develop/actions/checkout-6
Bump actions/checkout from 5 to 6
2025-11-24 08:33:46 +00:00
e288c942ee Bump actions/checkout from 5 to 6
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-11-24 08:04:19 +00:00
7a1ccb0d53 Nicer query 2025-11-23 14:09:55 +00:00
89656c7e65 Merge remote-tracking branch 'origin/develop' 2025-11-23 14:05:39 +00:00
7f76198139 Fixed RB-20501 - correctly return error response when license+seat don’t match
TypeError: App\Http\Transformers\LicenseSeatsTransformer::transformLicenseSeat(): Argument #1 ($seat) must be of type App\Models\LicenseSeat, bool given, called in /snipe-it/app/Http/Controllers/Api/LicenseSeatsController.php on line 92
2025-11-23 14:05:24 +00:00
5ff813f9b7 Merge pull request #18233 from grokability/develop
Merging from dev
2025-11-22 14:24:36 +00:00
69994e0c11 Merge pull request #18232 from grokability/check-for-valid-json-on-filter
Added filter form request to validate JSON
2025-11-22 14:22:33 +00:00
aa959fbe92 Added filter form request to validate JSON 2025-11-22 14:03:58 +00:00
948b7cda15 Merge remote-tracking branch 'origin/develop' 2025-11-22 12:04:28 +00:00
644ef040d0 Merge pull request #18226 from Godmartinz/audit-notification-rb-19608
Fixes RB-19608 adds safe guards, adds Audit notification for google workspace, adds tests
2025-11-22 11:41:57 +00:00
33839d7244 Re-added the horizontal class 2025-11-22 11:14:59 +00:00
48270cb9b4 url trim 2025-11-21 10:11:28 -08:00
cd42760b68 notes 2025-11-20 14:25:13 -08:00
1116da389e add google chat to audit notification test 2025-11-20 14:24:03 -08:00
24d7ae4a2f added google chat to audit notifications" 2025-11-20 14:22:08 -08:00
e598ef6e05 adds tests, webhook enable settings 2025-11-20 13:51:14 -08:00
6601e73069 Merge remote-tracking branch 'origin/develop' 2025-11-20 20:15:44 +00:00
7f2a80552b Fixed form layout for SAML 2025-11-20 20:15:34 +00:00
eceeb4aa3b return if there is no item for the audit notification 2025-11-20 10:56:43 -08:00
b5c7f374f3 Merge remote-tracking branch 'origin/develop' 2025-11-20 13:44:19 +00:00
9d08e2d297 Clearer language 2025-11-20 13:44:09 +00:00
f2303ae2dc Merge remote-tracking branch 'origin/develop' 2025-11-20 13:28:00 +00:00
4d44fd47c3 Merge pull request #18217 from Godmartinz/unaccepted-row-null-fix
Fixes FD-52005 Adds null safe operators to unacceptable items report
2025-11-20 13:27:24 +00:00
88635cb6c3 Merge pull request #18223 from grokability/#18114-fixed-declined-notification-added-x-header
Fixed #18114 - include declined item name, added app headers
2025-11-20 13:27:01 +00:00
1687fcc035 Small subject tweaks 2025-11-20 13:23:17 +00:00
39e7937458 Fixed #18114 - include declined item name, added app headers 2025-11-20 12:58:53 +00:00
60ff2970f0 safeguard null rows by filtering rows in query 2025-11-19 11:35:24 -08:00
212cd026a3 add null safe operators to company and csv plain values 2025-11-18 12:36:07 -08:00