3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-05 16:45:32 +00:00
Commit Graph

1464 Commits

Author SHA1 Message Date
06f313febe Merge pull request #17869 from marcusmoore/api-components-assigned-to-asset
Added api endpoint for retrieving components checked out to asset
2025-09-29 15:47:53 +01:00
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
52239a88b5 Improve test name 2025-09-18 17:27:17 -07:00
7a3596c86d Test against other types 2025-09-18 17:21:27 -07:00
5c08f3a27e Add failing test 2025-09-18 17:14:33 -07:00
2dc11a84bf Fix test name 2025-09-18 17:05:08 -07:00
2960ea15f5 Consolidate to data provider 2025-09-18 14:29:12 -07:00
17aab4c490 Implement test 2025-09-18 14:20:05 -07:00
59d0f0d292 Re-order assertions 2025-09-18 14:05:13 -07:00
27d13a113a Implement test 2025-09-18 14:01:44 -07:00
c58e999fbb Scaffold tests 2025-09-18 13:11:06 -07:00
e639d7726b Disallow bulk checkout across companies 2025-09-17 14:32:27 -07:00
e29b0aa6a4 Add todo 2025-09-17 13:55:54 -07:00
d2157868f2 Populate failing test 2025-09-17 13:49:32 -07:00
89cfafd933 Scaffold test 2025-09-17 13:40:34 -07:00
13d5b724ee Fixed tests 2025-09-16 12:16:18 +01:00
73e0628124 Populate test 2025-09-15 15:26:30 -07:00
7393c4170b Apply first pass and scaffold additional test 2025-09-15 15:22:35 -07:00
73e185bf9d Scaffold route and tests 2025-09-15 15:12:05 -07:00
01f7b5d709 Added CJK and Arabic font support 2025-09-15 14:46:11 +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
7171247cdc Updated tests 2025-09-12 17:37:36 +01:00
6bc9a82a7a Formatting 2025-09-09 14:51:22 -07:00
6504ee37bd Remove dump 2025-09-09 13:09:52 -07:00
ab7bd86336 Improve assertions 2025-09-09 13:01:59 -07:00
eada0b0bb5 Implement test 2025-09-09 11:58:43 -07:00
f221f9f22a Implement test 2025-09-09 11:50:41 -07:00
a7c5899c16 Implement test 2025-09-09 11:33:54 -07:00
80b02635a9 Add test stub 2025-09-09 10:10:53 -07:00
2eb727bd0c Added tests
Signed-off-by: snipe <snipe@snipe.net>
2025-09-09 13:51:56 +01:00
324070f345 Begin to build out test 2025-09-08 17:20:22 -07:00
e1aa843b6d Scaffold test 2025-09-08 17:05:14 -07:00
e652a7fd61 fix tests 2025-09-08 14:56:15 -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
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
b1b390febf Removed flaky test
Signed-off-by: snipe <snipe@snipe.net>
2025-09-04 16:30:02 +01:00
be451fa0c0 Removed asset model from original factory
Signed-off-by: snipe <snipe@snipe.net>
2025-09-04 16:14:27 +01:00
905f61371d Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
2025-09-04 16:02:40 +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
d1129081df Asset nothing is sent if send_welcome is not checked/passed
Signed-off-by: snipe <snipe@snipe.net>
2025-08-28 18:05:40 +01:00
8ccd2e97a8 Improved user create tests
Signed-off-by: snipe <snipe@snipe.net>
2025-08-28 13:27:08 +01:00
cad6cc3007 Renamed the test for consistency
Signed-off-by: snipe <snipe@snipe.net>
2025-08-28 13:02:01 +01:00
745fc515f1 Merge pull request #17713 from Godmartinz/fix-localization-for-email-notifications
Adds #5554 locale for acceptance notifications and checkin/out emails
2025-08-28 05:29:28 +01:00
f2ec7f2975 fix tests 2025-08-27 13:22:35 -07:00
60604c3481 With the new SSL stuff, we are calling ldap_set_option() one more time now 2025-08-27 12:25:39 +01: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
3160d1064d Remove unused import 2025-08-26 11:32:38 -07:00
b702e3e2de Merge pull request #17492 from ischooluw/17448-feature-notes-api-endpoints
Fixes #17448: feat(api) - API endpoint for Adding Ad-Hoc Notes to Assets
2025-08-26 12:40:52 +01:00