|
|
be4ace293e
|
Use trans_choice for user acceptance
|
2025-09-18 13:51:57 +01:00 |
|
|
|
764b363bbc
|
A few small tweaks to acceptance screen design
|
2025-09-18 13:38:37 +01:00 |
|
|
|
8ea339f0ef
|
More small tweaks
|
2025-09-17 22:00:49 +01:00 |
|
|
|
1d3dfa1fa4
|
Pull the acceptance stuff into the model
|
2025-09-17 21:43:17 +01:00 |
|
|
|
ca567eec8a
|
Small adjustments for layout
|
2025-09-17 21:08:13 +01:00 |
|
|
|
ade03e4827
|
Merge pull request #17882 from Godmartinz/add-total-cost-columns
Adds total cost to Accessories, Consumables, Components
|
2025-09-17 13:56:08 +01:00 |
|
|
|
33a4c88c3a
|
Added table to deleted_at clauses to resolve ambiguity
|
2025-09-17 11:44:28 +01:00 |
|
|
|
14b829aa30
|
add total cost to components and consumables
|
2025-09-16 10:37:32 -07:00 |
|
|
|
384652b3df
|
add total cost to accessories
|
2025-09-16 10:10:49 -07:00 |
|
|
|
e977771fe4
|
One more query tweak
|
2025-09-16 11:50:50 +01:00 |
|
|
|
4339e4552e
|
Fixed nesting in orWhere
|
2025-09-16 11:50:50 +01:00 |
|
|
|
74b98083e2
|
Override the getEula() method at the SnipeModel level
|
2025-09-15 20:05:35 +01:00 |
|
|
|
01f7b5d709
|
Added CJK and Arabic font support
|
2025-09-15 14:46:11 +01:00 |
|
|
|
7062962cc8
|
Show warnings on the dates if expired or terminated
|
2025-09-15 13:43:08 +01:00 |
|
|
|
58cda5ae6d
|
Added scopes
|
2025-09-15 13:22:25 +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 |
|
|
|
21ef87ef09
|
Merge branch 'develop' into fix_client_tls_ldap
|
2025-09-12 18:52:43 +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 |
|
|
|
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 |
|
|
|
e796c0da4a
|
disallows checkout of expired or terminated licenses
|
2025-09-10 12:08:14 -07:00 |
|
|
|
082bff2fa8
|
Add and use query scope helper
|
2025-09-09 13:04:14 -07:00 |
|
|
|
2eb727bd0c
|
Added tests
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-09 13:51:56 +01:00 |
|
|
|
57af507170
|
Added deleted button to locations, check for additional relations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-09 12:20:34 +01:00 |
|
|
|
9604ecebad
|
Fixed jobtitle in advanced search
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-08 12:01:59 +01:00 |
|
|
|
f340390fc8
|
Merge pull request #17703 from marcusmoore/17369-accessory-checkout-qty-scaffold
Fixed issues around accessory acceptance
|
2025-09-08 09:09:26 +01:00 |
|
|
|
c5bede8594
|
More small display_name fixes
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-04 17:15:06 +01:00 |
|
|
|
d29e09a3ff
|
Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold
# Conflicts:
# resources/views/account/accept/create.blade.php
# resources/views/account/accept/index.blade.php
|
2025-09-03 12:26:43 -07:00 |
|
|
|
db9f85e9da
|
Merge branch 'develop' into checkin_non_reassignable_license
# Conflicts:
# app/Models/License.php
# resources/views/licenses/view.blade.php
# tests/Feature/Checkins/Api/LicenseCheckInTest.php
|
2025-09-03 11:09:51 -07:00 |
|
|
|
b06c58fe7b
|
Switch to older style rules for consistency
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 15:06:27 +01:00 |
|
|
|
f5c8b3eb04
|
Fixed #17791 - increase size of purchase cost field
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 15:03:49 +01:00 |
|
|
|
739980aa09
|
Merge pull request #16947 from Godmartinz/add-require-serial-to-models
Adds require serial as Asset Model option
|
2025-09-03 14:53:15 +01:00 |
|
|
|
52140dbe06
|
Log upload deletion
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 08:37:42 +01:00 |
|
|
|
7b5d90dd81
|
Moved model traits into proper directory
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 18:23:26 +01:00 |
|
|
|
cfc979acf0
|
Merge pull request #17432 from oolivero45/patch-1
Fixed #17431: EULA not displaying on asset acceptance page
|
2025-08-28 16:09:36 +01:00 |
|
|
|
95be847d87
|
renamed attribute
|
2025-08-27 14:10:51 -07:00 |
|
|
|
648c25a0a7
|
adds item type to Accept asset index
|
2025-08-27 14:06:10 -07:00 |
|
|
|
4298aad008
|
Merge branch 'develop' into 17369-accessory-checkout-qty-scaffold
# Conflicts:
# app/Http/Controllers/Account/AcceptanceController.php
# resources/views/notifications/markdown/asset-acceptance.blade.php
|
2025-08-26 11:39:52 -07:00 |
|
|
|
e74460aefc
|
Merge branch 'develop' into improve_ldap_certifcate_ignoring
|
2025-08-26 15:01:11 +01:00 |
|
|
|
55a5a12b30
|
Formalize the 'double-barrel' method of setting TLS cert ignores
|
2025-08-26 15:00:33 +01:00 |
|
|
|
15e64155b5
|
Add version checking to LDAP troubleshooter, clean up ldap model
|
2025-08-26 13:57:25 +01:00 |
|
|
|
47b2b30455
|
Merge pull request #17710 from akaspeh1/develop
Adds support for label sheets Avery L4736 & L6009
|
2025-08-26 12:42:02 +01:00 |
|
|
|
be0f3910bb
|
Fixed: Old computation
|
2025-08-25 16:57:32 +02:00 |
|
|
|
07dbc6842c
|
Are you KIDDING ME, Github??
This reverts commit c8e79aa5ca, reversing
changes made to e60f2b2332.
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-25 15:56:28 +01:00 |
|
|
|
5a16b59462
|
Adds support for label sheets Avery L4736 & L6009
|
2025-08-25 16:47:52 +02:00 |
|
|
|
13cd7071b8
|
WIP improving some LDAP stuff
|
2025-08-25 15:41:01 +01:00 |
|
|
|
c8e79aa5ca
|
Merge branch 'develop' into add-display-name-to-users-fixed
|
2025-08-25 15:28:20 +01:00 |
|
|
|
e60f2b2332
|
Tightened up accessor code for better inheritence
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-25 15:00:10 +01:00 |
|
