3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-04 18:15:43 +00:00
Commit Graph

19463 Commits

Author SHA1 Message Date
73e185bf9d Scaffold route and tests 2025-09-15 15:12:05 -07:00
ec47ee3573 Merge pull request #17850 from Godmartinz/change-purchase-cost-to-unit
Rewords Purchase cost to Unit Cost for Accessories, Components, Consumables
2025-09-15 14:20:04 +01:00
7062962cc8 Show warnings on the dates if expired or terminated 2025-09-15 13:43:08 +01:00
fde447846a Merge pull request #17865 from grokability/show-inactive-licenses
Show inactive licenses
2025-09-15 13:42:22 +01:00
319cb1bd1e Removed logging 2025-09-15 13:23:44 +01:00
58cda5ae6d Added scopes 2025-09-15 13:22:25 +01:00
251a3db880 Fixed factory 2025-09-15 13:20:34 +01:00
30b6dcd767 Added status to breadcrumbs 2025-09-15 13:13:50 +01:00
05f6622912 Added status to URL 2025-09-15 13:13:32 +01:00
36183ac19d Fixed url and tooltip text 2025-09-15 13:13:18 +01:00
f6a823e0a8 Escape text 2025-09-15 13:13:04 +01:00
312353551d Changed button color 2025-09-15 13:11:58 +01:00
fd5c9cee38 Merge pull request #17863 from grokability/added-status-label-to-asset-view
Added status label to asset view
2025-09-15 10:31:54 +01:00
84bf71802c Added status label to asset view 2025-09-15 10:31:06 +01:00
35739c2eef Merge pull request #17835 from marcusmoore/feature/10052-assigned-assets-via-api
Fixed #10052 - Added api endpoint for retrieving assets checked out to asset
2025-09-15 08:38:35 +01:00
1914a71623 Merge pull request #17851 from marcusmoore/fixes/qty-in-component-email
Fixed potentially incorrect qty in component checkout email
2025-09-15 08:37:48 +01:00
dcc53886d9 Merge pull request #17857 from uberbrady/fix_client_tls_ldap
Fixed #17414 - client-side TLS certificate didn't work in Google LDAP
2025-09-15 08:37:14 +01:00
21ef87ef09 Merge branch 'develop' into fix_client_tls_ldap 2025-09-12 18:52:43 +01:00
b67f808da9 Fixed fieldname 2025-09-12 18:07:40 +01:00
ad69447b53 Merge pull request #17858 from grokability/ignore-expiring-licenses-with-past-termination-date
Ignore expiring licenses with past termination date
2025-09-12 17:55:14 +01:00
b4614df88c Removed awkward period 2025-09-12 17:39:52 +01:00
7171247cdc Updated tests 2025-09-12 17:37:36 +01:00
6d0084f108 Nicer alert layout for expiring asset report 2025-09-12 17:37:27 +01:00
29359f42ae Added table printout 2025-09-12 17:37:12 +01:00
cf875bf872 Changed verbiage 2025-09-12 17:37:03 +01:00
13c0d335d3 Refactor alert query 2025-09-12 17:36:51 +01:00
ceb33409b5 Removed duplicate array key 2025-09-12 17:36:33 +01:00
83597d4a8b Possible fix to client-side TLS certificate issue for google LDAP 2025-09-12 17:12:35 +01:00
81eefc5448 Merge branch 'develop' into fixes/qty-in-component-email 2025-09-11 14:14:42 -07:00
082bc3ece4 Use correct qty in component checkout email 2025-09-11 14:10:31 -07:00
b2406b61fb Merge pull request #17826 from marcusmoore/fixes/17585-accessory-checkout-amount-in-subject
Fixed #17585 - Display accessory checkout qty in subject line and intro text
2025-09-11 21:55:20 +01:00
15698d7694 Update introduction lines with qty 2025-09-11 13:50:48 -07:00
990cd82f97 change purchase cost to unit cost in several places 2025-09-11 10:46:20 -07:00
c87829b3e8 Merge pull request #17849 from Godmartinz/rollbar-unreassignablecount-fix
Fixed typo in UnreassignableCount
2025-09-11 18:43:07 +01:00
6799c41d65 fixed typo 2025-09-11 10:23:53 -07:00
80c059be58 Skip terminated licenses in alert 2025-09-11 13:14:53 +01:00
aa3f896538 Merge pull request #17842 from Godmartinz/expiration-and-termination-license-enhancement
Adds #8799 Prevention of checkout of expired or terminated licenses
2025-09-11 11:46:15 +01:00
d8c17a8a5e One more small tweak to language 2025-09-11 11:40:15 +01:00
850939367c adds translation warning message 2025-09-10 12:59:35 -07:00
bf4fef9bf7 Merge branch 'develop' into fixes/17585-accessory-checkout-amount-in-subject 2025-09-10 12:49:41 -07:00
d5175961a4 adds a seperate formatter for checking out on license index, fix interactions 2025-09-10 12:42:10 -07:00
e7e1d6a232 Small tweaks to language 2025-09-10 20:17:33 +01:00
712345f3a0 Added link to discussions and discord 2025-09-10 20:14:19 +01:00
54c9bc3dcb Merge pull request #17840 from marcusmoore/issue-template
Made install method required in issue template
2025-09-10 20:14:10 +01:00
e796c0da4a disallows checkout of expired or terminated licenses 2025-09-10 12:08:14 -07:00
cf8ff0f43e Add note on English 2025-09-10 10:41:20 -07:00
e67ce23a7c Require installation method 2025-09-10 10:23:22 -07:00
a66bb95a81 A few more tweaks 2025-09-10 15:48:21 +01:00
c66fa33b2e Have I mentioned how much I hate YAML? 2025-09-10 15:43:09 +01:00
56eebb9db4 Small tweaks to templates 2025-09-10 15:40:12 +01:00