ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,965 Commits 84 Branches 293 Tags
a3e35e0c991f83fc35fc6926c04e7a5baa09782c
Commit Graph

17965 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe a3e35e0c99 Added form request 
Signed-off-by: snipe <snipe@snipe.net>
 2025-06-25 16:29:42 +01:00
snipe 2e8c51be9c First steps for #16883 - bulk asset auduting via API 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 11:35:30 +01:00
snipe 7d9b87f059 Merge pull request #16898 from marcusmoore/chore/form-radio-replacement 
Replaced Form::radio helpers
 2025-05-08 20:50:29 +01:00
Marcus Moore c157f4190e Replace Form::radio in location partial 2025-05-08 12:25:48 -07:00
Marcus Moore 9357eca1cd Replace Form::radio on asset checkin page 2025-05-08 12:16:55 -07:00
snipe 40c65a07a4 Merge pull request #16896 from grokability/removed_seat_number 
Removed seat "name" from licenses seats API/UI response
 2025-05-08 17:57:40 +01:00
snipe 13521bcf75 Removed seat “name” from license seats API/UI 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 17:37:27 +01:00
snipe 1c09dc139a Undo previous change 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 16:40:24 +01:00
snipe d5f955b1e0 License seats are not numbered correctly [sc-29113] 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 16:25:49 +01:00
snipe 9e6e8f0931 Moved incomplete test marker 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 16:22:09 +01:00
snipe c93ef30801 Ignore flaky test 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 15:43:40 +01:00
snipe 3e0dec4856 Fixed #16893 - more specific upload failure text 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 15:38:38 +01:00
snipe 0b167f5f6f Grab location uploads from backup 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 15:22:26 +01:00
snipe f6b21fdb82 Merge pull request #16895 from grokability/fixed_#16863_custom_fields_validation 
Fixed #16863 - better handle custom fields validation when unique but not required
 2025-05-08 15:09:04 +01:00
snipe f151628808 Merge pull request #16894 from grokability/resolve-webserver-permissions 
Fix webserver/user file permissions issue
 2025-05-08 15:08:40 +01:00
snipe e44aad0328 Fixed typeos 2025-05-08 15:08:14 +01:00
snipe 1881054c92 Fixed #16863 - better handle unique not required custom field redirects 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 15:00:43 +01:00
Jeremy Price f7533c5e41 Fix webserver/user file permissions issue 
Fixes https://github.com/grokability/snipe-it/issues/16777

We weren't adding the webserver user to the app-user's group, which was
a problem for the webserver trying to write to the log file if it had
been created by a user-owned process (like a cron) or the installation
script chown-ing everything... even though the log file was created 664

This would often present in mysterious ways. In the linked case, trying
to upload a cvs for import would fail with an unhelpful message, because
the actual error is swallowed in the generic error handler for the page.

I've filed an issue to hopefully help with that: https://github.com/grokability/snipe-it/issues/16893

Used this opportunity to condense some logic that was
identical between architectures,
 2025-05-08 13:55:23 +02:00
snipe f181e0fa55 Merge pull request #16877 from marcusmoore/bug/sc-29012 
Allow updating asset model image via api
 2025-05-08 06:27:49 +01:00
snipe b04efdfefc Merge pull request #16889 from grokability/add_updated_range_to_custom_report 
Added #16887 - last updated date range for custom report
 2025-05-08 06:27:32 +01:00
snipe 352b935dee Merge pull request #16884 from marcusmoore/bug/sc-29097 
Removed `2fa_authed` from session upon logout
 2025-05-08 06:23:26 +01:00
snipe 0ba3b9975a Added #16887 - last updated date range for custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-08 06:21:06 +01:00
Marcus Moore cc06187f31 Remove 2fa_authed from session upon logout 2025-05-07 14:04:33 -07:00
snipe a916767392 Show the QR code on the asset page regardless of label settings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-07 11:34:21 +01:00
snipe 1c57bfaa39 Small cosmetic change to offset 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-07 11:28:01 +01:00
snipe 4a5adeb661 Fixed #16866 - use singular translation for custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-07 10:55:28 +01:00
snipe 01f9772291 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-07 10:37:10 +01:00
snipe 960b3aebed Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-07 10:24:07 +01:00
Marcus Moore d75de73867 Allow updating asset model image via api 2025-05-06 17:13:23 -07:00
snipe e75df97902 Merge pull request #16876 from grokability/switch-back-to-multiarch-docker-with-emulation 
Move back to multiarch builds with emulation (for now)
 2025-05-06 21:39:23 +01:00
Jeremy Price 5be14ec750 Move back to multiarch builds with emulation (for now) 
Turns out it's not straightforward to have multiarchitecture images
within the same namespace, if you want to run each architecture's build
on native runners.

While we work on getting that going, we're moving back to
build-everything-on-intel-runners-with-emulation-for-arm

it means slowwwww arm builds, but it also means we should get our images
straightened out
 2025-05-06 22:27:53 +02:00
snipe 717a82f46a Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-06 21:27:02 +01:00
snipe e40038900b Merge pull request #16875 from ubc-cpsc/bugfix/CVE-2025-46734 
Fixes CVE-2025-46734: league/commonmark contains a XSS vulnerability in Attributes extension
 2025-05-06 19:19:09 +01:00
Joël Pittet 099eabc240 Fixes CVE-2025-46734 2025-05-06 11:01:45 -07:00
snipe 3a4fa35398 Merge pull request #16874 from grokability/clone_breadcrumb_fix 
Fixed breadcrumbs for cloning
 2025-05-06 16:42:52 +01:00
snipe 500d6a0cc2 Merge pull request #16873 from grokability/redirect_on_audit 
Redirect options on audit
 2025-05-06 16:39:29 +01:00
snipe 38e5bf71bc Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-06 16:36:09 +01:00
snipe 45ff195f11 Fixed breadcrumbs for cloning 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-06 16:17:02 +01:00
snipe ce543c8179 Use consistent icon 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-06 16:12:15 +01:00
snipe 5c11a8c1e0 Modified helper 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-06 16:12:06 +01:00
snipe f013a4c5ea Merge pull request #16871 from grokability/one-more-docker-fix 
One more docker repo name fix
 2025-05-06 15:16:48 +01:00
Jeremy Price 194a22452e stop building intel image in arm server 2025-05-06 16:10:44 +02:00
Jeremy Price 930a6a2ac8 One more docker repo name fix 
i feel like i'm taking crazy pills

also right-naming the arm builds again
 2025-05-06 16:06:13 +02:00
snipe 444dea8b42 Merge pull request #16868 from grokability/fix-dockerhub-references 
OMG fix 2 more (only 1 active) dockerhub repo references
 2025-05-06 10:15:28 +01:00
Jeremy Price 6cc3f69c2a OMG fix 2 more (only 1 active) dockerhub repo references 2025-05-06 07:54:20 +02:00
snipe 36f3834ca5 Merge pull request #16865 from ntaylor-86/fixes/alerts-enabled-new-install 
Fixed #16815: Avoids potential error when settings table is empty
 2025-05-06 00:59:52 +01:00
Nathan Taylor d4b73b4fb9 Avoids potential error when alerts table is empty 
Updates the Kernel to use the null-safe operator
when accessing the alerts_enabled setting. This prevents
a potential error if the settings object is null.
 2025-05-06 09:47:33 +10:00
snipe b37f488117 Merge pull request #16864 from marcusmoore/update-contributors 
Added missing contributors
 2025-05-05 22:18:11 +01:00
snipe ee0a9e834a Fixed BulkDeleteAssetsTest test 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-05 22:12:08 +01:00
snipe c776e0e7e9 Merge pull request #16851 from grokability/fix-dockerhub-repo 
Fix dockerhub repo we're pushing to, and arm build names
 2025-05-05 22:03:58 +01:00