 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 |
|
|
Marcus Moore
|
27022954b1
|
Inline icon
|
2025-09-03 10:44:19 -07:00 |
|
|
Marcus Moore
|
30362c924f
|
Upload log as artifact
|
2025-09-03 10:13:01 -07:00 |
|
|
snipe
|
bf63b15b46
|
Merge pull request #17799 from grokability/#17798-adds-require-serial-to-importer
Fixed #17798 - added `require_serial` to model importer
|
2025-09-03 15:32:42 +01:00 |
|
|
snipe
|
19aea4bd6c
|
Fixed #17798 - added require_serial to model importer
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 15:25:56 +01:00 |
|
|
snipe
|
090890e9c6
|
Fixed #17796 - search on model name and number on importer
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 15:15:29 +01:00 |
|
|
snipe
|
605022a9e3
|
Merge pull request #17795 from grokability/#17791-larger-currency-field
Fixed #17791 - increase size of purchase cost field
|
2025-09-03 15:09:28 +01:00 |
|
|
snipe
|
b06c58fe7b
|
Switch to older style rules for consistency
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 15:06:27 +01:00 |
|
|
snipe
|
f5c8b3eb04
|
Fixed #17791 - increase size of purchase cost field
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 15:03:49 +01: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
|
afde5943e3
|
Fixed typo - #17784
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 14:39:59 +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
|
a18fb10b5a
|
Merge pull request #17783 from marcusmoore/fixes/company-in-location-print
Fixed company name reference in location print
|
2025-09-03 08:44:40 +01:00 |
|
|
snipe
|
52140dbe06
|
Log upload deletion
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-03 08:37:42 +01:00 |
|
|
Marcus Moore
|
db5bb1928e
|
Merge branch 'develop' into fixes/existing-assets-report
# Conflicts:
# resources/views/notifications/markdown/report-expiring-assets.blade.php
|
2025-09-02 15:07:23 -07:00 |
|
|
Marcus Moore
|
65b66beb07
|
Make icon more prominent
|
2025-09-02 14:55:46 -07:00 |
|
|
Marcus Moore
|
c83504b4e7
|
Use display_name in place of presenter
|
2025-09-02 12:57:40 -07:00 |
|
|
Godfrey M
|
cd2e7ee31d
|
fix google and slack notifications
|
2025-09-02 10:53:42 -07:00 |
|
|
Godfrey M
|
c3a0a0415a
|
fix MS Teams Notifications
|
2025-09-02 10:48:02 -07:00 |
|
|
snipe
|
709f4672b7
|
Merge pull request #17771 from grokability/#10107-remember-checkout-to-type
Fixed #10107 - remember checkout to type
|
2025-09-02 13:46:13 +01:00 |
|
|
snipe
|
e6c030b050
|
Merge pull request #17781 from grokability/#17780-add-withtrashed-to-files
Fixed #17780 - Added `withTrashed()` to allow viewing files on deleted objects
|
2025-09-02 13:45:18 +01:00 |
|
|
snipe
|
7bd3a791a1
|
Added withTrashed() to allow viewing files on deleted objects
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-02 13:39:35 +01:00 |
|
|
snipe
|
b9cfc03b4f
|
display name fix
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-02 11:30:34 +01:00 |
|
|
snipe
|
131327a64d
|
Fixed “undefined” error on status labels in BS tables
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 20:32:42 +01:00 |
|
|
snipe
|
77d002a158
|
Use null for role as well
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 16:43:05 +01:00 |
|
|
snipe
|
94699893ac
|
Updated fieldname in user API request
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 16:17:39 +01:00 |
|
|
snipe
|
9f81989bdd
|
Return null instead of blank for display_name in API
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 16:06:28 +01:00 |
|
|
snipe
|
15abe36c53
|
More tweaks to display
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 13:58:02 +01:00 |
|
|
snipe
|
3094e007ee
|
Set session to remember checkout type
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 13:28:07 +01:00 |
|
|
snipe
|
eb259aee22
|
Set asset selector to true for components since it will always be required
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 13:18:58 +01:00 |
|
|
snipe
|
c05c8defb9
|
Merge pull request #17769 from grokability/#9978-add-pivot-to-accessories-api
Fixes #9978 - Added payload to accessories API
|
2025-09-01 12:28:08 +01:00 |
|
|
snipe
|
bf5668a42e
|
Added payload to accessories API
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 12:23:39 +01:00 |
|
|
snipe
|
ec310bc8fb
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 11:56:01 +01:00 |
|
|
snipe
|
db477421b2
|
Bumped to 8.3.1
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 11:54:53 +01:00 |
|
|
snipe
|
30a9496cf5
|
Merge pull request #17748 from Godmartinz/parent-location-in-asset-view
Adds #10969 Parent location to Asset Checked out to info
|
2025-09-01 11:49:42 +01:00 |
|
|
snipe
|
6cefa0d0b3
|
Merge pull request #17745 from Godmartinz/dropdown-link-color-fix
Fixes #17488 (Part 2) Nav dropdown link color and skin names
|
2025-09-01 11:48:29 +01:00 |
|
|
snipe
|
9284984265
|
Merge pull request #17768 from Speedyduck300000/develop
Fixed #17742: don't delete random actionlog when trying to delete a file
|
2025-09-01 11:40:06 +01:00 |
|
|
Speedyduck300000
|
53b96168a9
|
fixed uploadfilescontroller to use the file_id to delete the correct
entry.
|
2025-09-01 07:34:18 +02:00 |
|
|
Godfrey M
|
eadce51f10
|
fixes check in check out translations for assets in notiications
|
2025-08-29 11:12:05 -07:00 |
|
|
snipe
|
b3c583b6dc
|
Few more ->display_name
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-29 10:17:16 +01:00 |
|
|
snipe
|
28abeab31d
|
Fixed a few more display_name instances
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-29 10:06:58 +01:00 |
|
|
snipe
|
12a649ec4b
|
Merge pull request #17751 from marcusmoore/fixes/name-in-expiring-assets
Fixed user display name in expiring asset notification
|
2025-08-29 01:11:05 +01:00 |
|
|
Marcus Moore
|
35b79e4d14
|
Remove old comments
|
2025-08-28 16:56:40 -07:00 |
|
|
Marcus Moore
|
751dad7f2e
|
Inline days
|
2025-08-28 16:56:12 -07:00 |
|
|
Marcus Moore
|
b08d86220a
|
First pass at moving to table structure
|
2025-08-28 16:53:13 -07:00 |
|
|
Marcus Moore
|
3a27ecc475
|
Use display_name in place of name()
|
2025-08-28 16:22:24 -07:00 |
|
|
Godfrey M
|
da6fab5d43
|
adds parent location to checked out to location
|
2025-08-28 13:37:40 -07:00 |
|
|
snipe
|
ca95b29cd6
|
Add telescope tables to the excepted tables
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 19:52:56 +01:00 |
|