 snipe
|
be4ace293e
|
Use trans_choice for user acceptance
|
2025-09-18 13:51:57 +01:00 |
|
|
Godfrey M
|
384652b3df
|
add total cost to accessories
|
2025-09-16 10:10:49 -07:00 |
|
|
snipe
|
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 |
|
|
snipe
|
05f6622912
|
Added status to URL
|
2025-09-15 13:13:32 +01:00 |
|
|
snipe
|
b4614df88c
|
Removed awkward period
|
2025-09-12 17:39:52 +01:00 |
|
|
snipe
|
cf875bf872
|
Changed verbiage
|
2025-09-12 17:37:03 +01:00 |
|
|
snipe
|
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 |
|
|
Marcus Moore
|
15698d7694
|
Update introduction lines with qty
|
2025-09-11 13:50:48 -07:00 |
|
|
Godfrey M
|
990cd82f97
|
change purchase cost to unit cost in several places
|
2025-09-11 10:46:20 -07:00 |
|
|
Godfrey M
|
850939367c
|
adds translation warning message
|
2025-09-10 12:59:35 -07:00 |
|
|
Marcus Moore
|
bf4fef9bf7
|
Merge branch 'develop' into fixes/17585-accessory-checkout-amount-in-subject
|
2025-09-10 12:49:41 -07:00 |
|
|
snipe
|
0004d4936c
|
Cleaned up print view
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-09 15:18:28 +01:00 |
|
|
snipe
|
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 |
|
|
Marcus Moore
|
6d8bf2c665
|
Display accessory checkout qty in subject line
|
2025-09-08 14:25:56 -07:00 |
|
|
snipe
|
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 |
|
|
Marcus Moore
|
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 |
|
|
Godfrey M
|
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 |
|
|
snipe
|
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 |
|
|
snipe
|
32300cb42c
|
Merge pull request #17788 from grokability/add-delete-log-instead-of-soft-deleting-the-log-itself
Fixed #17777 - Log upload deletion
|
2025-09-03 14:37:32 +01:00 |
|
|
snipe
|
de3b1697c8
|
Merge pull request #17760 from Godmartinz/fix-translation-string-in-notifications
Fixes #17759 translation used in asset check in/out notifications
|
2025-09-03 14:33:57 +01:00 |
|
|
snipe
|
52140dbe06
|
Log upload deletion
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 08:37:42 +01:00 |
|
|
Godfrey M
|
c3a0a0415a
|
fix MS Teams Notifications
|
2025-09-02 10:48:02 -07:00 |
|
|
Godfrey M
|
c5c68e9dd5
|
fix dropdown link color and skin names
|
2025-08-28 11:49:37 -07:00 |
|
|
snipe
|
0d7ec43262
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:19:41 +01:00 |
|
|
snipe
|
454be01a6c
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:11:23 +01:00 |
|
|
snipe
|
b11c6a5c06
|
Updated depreciation translation with more information.
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 16:35:49 +01:00 |
|
|
snipe
|
cb2ffe6b3f
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 14:02:39 +01:00 |
|
|
Godfrey M
|
671c113cd2
|
add coma to translation"
|
2025-08-26 16:07:04 -07:00 |
|
|
Godfrey M
|
75995b2109
|
fix checkout to location email
|
2025-08-26 15:34:38 -07:00 |
|
|
Marcus Moore
|
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 |
|
|
snipe
|
76374f0d5a
|
Updated text
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 15:14:22 +01:00 |
|
|
snipe
|
a6b74d56c6
|
Merge pull request #17709 from grokability/add-display-name-to-users-fixed
Added display name to users for LDAP/SCIM, added new sync fields (replaced #17650)
|
2025-08-26 12:39:25 +01:00 |
|
|
Godfrey M
|
dd742a2e4a
|
add a check for audit notification variables in MS Teams and a translation
|
2025-08-25 15:10:41 -07:00 |
|
|
snipe
|
3524e23e38
|
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-25 17:17:45 +01:00 |
|
|
snipe
|
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 |
|
|
snipe
|
6503f9c667
|
Revert "Merge pull request #17650 from grokability/add-displayName-to-users"
This reverts commit 4770e469b4, reversing
changes made to 29a18c7c8b.
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-21 20:23:47 +01:00 |
|
|
snipe
|
4770e469b4
|
Merge pull request #17650 from grokability/add-displayName-to-users
Add display name to users for LDAP/SCIM, added new sync fields
|
2025-08-21 18:22:34 +01:00 |
|
|
snipe
|
618106c103
|
Fixed #17674 - added odp, ods, odt to accepted files
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-20 14:11:20 +01:00 |
|
|
snipe
|
c2ecd20b7d
|
Updated field text
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 20:47:48 +01:00 |
|
|
snipe
|
b3f0ce4b2a
|
Use fieldsets for LDAP settings
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 18:38:47 +01:00 |
|
|
snipe
|
8b83584b67
|
Added mapping fields to LDAP
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 18:31:58 +01:00 |
|
|
snipe
|
ced30082a6
|
Added display_name as user field
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 12:10:28 +01:00 |
|
|
Godfrey M
|
1fcf5e03e7
|
adds asset tag to subject line of checkin/out
|
2025-08-18 10:16:47 -07:00 |
|
|
Marcus Moore
|
59bd6ca360
|
Update button text
|
2025-08-14 13:21:11 -07:00 |
|
|
Marcus Moore
|
22fe9a786e
|
Display number of items being accepted
|
2025-08-14 12:36:46 -07:00 |
|
|
snipe
|
4038a22093
|
Added sidenav to filter on activated vs inactive users
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 20:41:55 +01:00 |
|
|
snipe
|
ef35a0f2f1
|
Fixed #10284: Added mobile phone to users
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 18:38:22 +01:00 |
|
|
snipe
|
ead655e1db
|
Fixed translation
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 14:52:40 +01:00 |
|
|
snipe
|
9e8eead71e
|
Renamed routes and method names
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 13:29:48 +01:00 |
|
|
snipe
|
7d0c695808
|
Renamed language directories
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 13:23:52 +01:00 |
|