ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,122 Commits 84 Branches 293 Tags
62b16339a94997ecde2ba3020ae861f4b8564de0
Commit Graph

18122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe 62b16339a9 Merge remote-tracking branch 'origin/develop' 2025-05-13 20:44:34 +02:00
snipe 6b56929a06 Null operator for missing created_by record 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-13 20:44:25 +02:00
snipe ac6d964e28 Merge pull request #16920 from marcusmoore/fixes/remove-outline-from-label 
Remove logo outline from L7162_B
 2025-05-12 23:04:49 +01:00
Marcus Moore e2772c816d Remove label logo outline from L7162_B label 2025-05-12 13:58:13 -07:00
snipe 9e3e04521e Merge pull request #16900 from marcusmoore/fixes/user-full-name-accessor 
Handle settings not being available in full name accessor
 2025-05-10 12:26:19 +01:00
snipe 95cc4d3a73 Merge remote-tracking branch 'origin/develop' 2025-05-09 21:16:58 +01:00
snipe 65dfbd02fe Use develop branch 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 21:00:55 +01:00
snipe 649ab53320 Updated codacy link 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 21:00:18 +01:00
snipe 497eeeb2e0 Merge remote-tracking branch 'origin/develop' 2025-05-09 19:29:01 +01:00
snipe 9250624f79 Merge pull request #16909 from grokability/fixes-#16554-category-delete 
Fixed #16554 - Added models to deletable check
 2025-05-09 19:23:35 +01:00
snipe 995e2090f5 Added/updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 19:17:53 +01:00
snipe 9b91584776 Added models to deletable check 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 19:17:48 +01:00
snipe 4be21ca249 Merge remote-tracking branch 'origin/develop' 2025-05-09 18:03:38 +01:00
snipe 8fd97ea501 Merge pull request #16908 from grokability/bug/sc-28724 
Fixed #16535 - more info to side rail in accessories
 2025-05-09 18:03:05 +01:00
snipe a80b9ab362 Fixed #16535 - more info to side rail in accessories 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 17:48:02 +01:00
snipe e8598e214e Merge remote-tracking branch 'origin/develop' 2025-05-09 17:23:22 +01:00
snipe 556e1081b3 Added two more selectors for byod 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 17:23:08 +01:00
snipe b070916f0b Merge pull request #16907 from grokability/add_ids_to_menus 
Fixed #16456 - added ids to sidenav options and bod
 2025-05-09 17:22:19 +01:00
snipe 940caf14b0 Added ids to menu items 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 17:09:59 +01:00
snipe 76da1d6663 Added class to checkbox 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 17:04:19 +01:00
snipe bafff9020a Merge pull request #16611 from Godmartinz/MS_teams_deprecation_update 
Reworked MS Teams deprecation warnings and notifications visibility
 2025-05-09 16:38:25 +01:00
snipe 54b1d65e3c Merge remote-tracking branch 'origin/develop' 2025-05-09 14:46:37 +01:00
snipe 0d5dca6456 Fixed #16690 - fallback to category image if no model image is present 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 14:46:27 +01:00
snipe 0f9b7119c0 Merge pull request #16905 from grokability/fixes_#16901 
Fixed #16901 - use default currency for asset maintenance cost
 2025-05-09 12:45:46 +01:00
snipe d4181549e8 Fixes #16901 - use default currency for maintenance cost display 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-09 12:43:49 +01:00
Marcus Moore d57f56e44f Handle settings not being available 2025-05-08 16:20:26 -07: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 f7648496d3 Merge remote-tracking branch 'origin/develop' 2025-05-08 16:26:02 +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 59a57c7197 Merge remote-tracking branch 'origin/develop' 2025-05-08 15:43:53 +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 5659b26827 Merge remote-tracking branch 'origin/develop' 2025-05-08 15:22:43 +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 ee4443aaf0 Merge remote-tracking branch 'origin/develop' 2025-05-08 15:09: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