|
|
fb9fb9c097
|
Merge branch 'develop' into fixes/17404-prevent-bulk-checkout-across-companies
# Conflicts:
# app/Http/Controllers/Assets/BulkAssetsController.php
# tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php
|
2025-09-22 10:52:04 -07:00 |
|
|
|
90c242a441
|
Merge pull request #17897 from marcusmoore/fixes/17896-prevent-bulk-checkout-of-checked-out-assets
Fixed #17896 - Prevent assigned assets from being bulk checked out
|
2025-09-19 07:03:43 +01:00 |
|
|
|
7a3596c86d
|
Test against other types
|
2025-09-18 17:21:27 -07:00 |
|
|
|
ac8a9e38f0
|
Implement fix
|
2025-09-18 17:18:27 -07:00 |
|
|
|
a02a96d5c4
|
Extract translation string
|
2025-09-18 12:57:56 -07:00 |
|
|
|
47e9e4704d
|
Improve error message
|
2025-09-18 12:56:36 -07:00 |
|
|
|
b2ad9d404e
|
Fix re-population of assets
|
2025-09-18 12:38:11 -07:00 |
|
|
|
e639d7726b
|
Disallow bulk checkout across companies
|
2025-09-17 14:32:27 -07:00 |
|
|
|
8ea339f0ef
|
More small tweaks
|
2025-09-17 22:00:49 +01:00 |
|
|
|
89b36ba63f
|
Derp. Uncomment the acceptance.
|
2025-09-17 21:43:40 +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 |
|
|
|
1346e33e99
|
Check that the person trying to download can see both the user and the target
|
2025-09-16 14:21:03 +01:00 |
|
|
|
ab9cc447aa
|
Use more specific filename
|
2025-09-16 14:20:20 +01:00 |
|
|
|
0bad75b263
|
Fixed declined asset name
|
2025-09-15 20:56:57 +01:00 |
|
|
|
74b98083e2
|
Override the getEula() method at the SnipeModel level
|
2025-09-15 20:05:35 +01:00 |
|
|
|
927f557672
|
Fixed sorting on updated/created at
|
2025-09-15 18:13:46 +01:00 |
|
|
|
630ea05e17
|
A little more cleanup
|
2025-09-15 17:16:05 +01:00 |
|
|
|
7df5196083
|
A little cleanup
|
2025-09-15 16:09:49 +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 |
|
|
|
319cb1bd1e
|
Removed logging
|
2025-09-15 13:23:44 +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 |
|
|
|
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 |
|
|
|
850939367c
|
adds translation warning message
|
2025-09-10 12:59:35 -07:00 |
|
|
|
082bff2fa8
|
Add and use query scope helper
|
2025-09-09 13:04:14 -07:00 |
|
|
|
eada0b0bb5
|
Implement test
|
2025-09-09 11:58:43 -07:00 |
|
|
|
acc37045e4
|
Implement test
|
2025-09-09 11:34:50 -07:00 |
|
|
|
0004d4936c
|
Cleaned up print view
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-09 15:18:28 +01:00 |
|
|
|
7a6fdc4e0a
|
Added parent ID to location API
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-09 15:18:09 +01: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 |
|
|
|
324070f345
|
Begin to build out test
|
2025-09-08 17:20:22 -07: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 |
|
|
|
be81e74921
|
Shifted log meta position
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-08 08:24:50 +01:00 |
|
|
|
c5bede8594
|
More small display_name fixes
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-04 17:15:06 +01:00 |
|
|
|
78704d8b85
|
Fixed #17803 - checked out to name in custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-04 16:51:10 +01:00 |
|
|
|
1109db76fe
|
Merge pull request #17797 from grokability/#17796-search-on-model-name-and-number
Fixed #17796 - search on model name and number on importer
|
2025-09-04 16:35:43 +01:00 |
|
|
|
1fa553c785
|
Use nths
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-04 16:04:16 +01:00 |
|
|
|
7da5210a01
|
Switched to nth from fetchOne in CSV reader
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-04 12:50:12 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
94699893ac
|
Updated fieldname in user API request
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 16:17:39 +01:00 |
|
|
|
3094e007ee
|
Set session to remember checkout type
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 13:28:07 +01:00 |
|
