|
|
8a46579588
|
Merge pull request #17887 from marcusmoore/fixes/17404-prevent-bulk-checkout-across-companies
Fixed #17404 - Disallow bulk checkout of assets across companies
|
2025-09-22 18:57:43 +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 |
|
|
|
d9399534ce
|
Merge pull request #17909 from spacjalex/17908-fix-typo
Fix #17908: typo in storage location of backups
|
2025-09-22 14:28:05 +01:00 |
|
|
|
17a749bbed
|
fix typo
|
2025-09-22 15:23:14 +02:00 |
|
|
|
25ce63f00b
|
Merge pull request #17904 from grokability/#17804-searchable-columns
Fixed #17804 - make columns searchable in column picker
|
2025-09-19 12:43:46 +01:00 |
|
|
|
2462bc05b3
|
Added column search to additional views
|
2025-09-19 12:41:30 +01:00 |
|
|
|
c3748da0b1
|
Fixed #17804 - make columns searchable in column picker
|
2025-09-19 12:16:56 +01: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 |
|
|
|
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 |
|
|
|
ac8a9e38f0
|
Implement fix
|
2025-09-18 17:18: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 |
|
|
|
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 |
|
|
|
5216dd75bf
|
Bumped version
|
2025-09-18 14:49:15 +01:00 |
|
|
|
b8b45d2d81
|
Merge pull request #17892 from grokability/#17891-fixes-maintenance-file-route
Fixed #17891 - missing maintenance file deletion route
|
2025-09-18 13:59:10 +01:00 |
|
|
|
4b2b2cb68e
|
Fixed #17891 - missing maintenance file deletion route
|
2025-09-18 13:58:30 +01:00 |
|
|
|
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 |
|
|
|
e639d7726b
|
Disallow bulk checkout across companies
|
2025-09-17 14:32:27 -07:00 |
|
|
|
9da9166442
|
Merge pull request #17886 from grokability/small-tweaks-to-acceptance-pdf
Small adjustments for acceptance PDF layout
|
2025-09-17 22:01:41 +01:00 |
|
|
|
8ea339f0ef
|
More small tweaks
|
2025-09-17 22:00:49 +01:00 |
|
|
|
e29b0aa6a4
|
Add todo
|
2025-09-17 13:55:54 -07:00 |
|
|
|
d2157868f2
|
Populate failing test
|
2025-09-17 13:49:32 -07: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 |
|
|
|
89cfafd933
|
Scaffold test
|
2025-09-17 13:40:34 -07:00 |
|
|
|
ca567eec8a
|
Small adjustments for layout
|
2025-09-17 21:08:13 +01:00 |
|
|
|
41da31c379
|
Merge pull request #17885 from grokability/#8859-show-cost-footer-on-models
Fixed #8859 - adds purchase sums on model view
|
2025-09-17 14:04:38 +01:00 |
|
|
|
e81f63f46b
|
Fixed #8859 - adds purchase sums on model view
|
2025-09-17 14:03:48 +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 |
|
|
|
1f79776b8f
|
Pull HTML tags out before converting markdown
|
2025-09-16 19:21:39 +01:00 |
|
|
|
11e5f851f0
|
typo
|
2025-09-16 10:49:33 -07:00 |
|
|
|
4ca1db8a1b
|
remove footer formatter from consumable purchase cost
|
2025-09-16 10:43:02 -07: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 |
|
|
|
9db65c6ae9
|
Merge pull request #17881 from grokability/#17873-eula-tab-on-users
Fixed #17873 - Added EULA tab to user view
|
2025-09-16 14:28:50 +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 |
|
|
|
fe9e0444b4
|
Added EULA tab to user view
|
2025-09-16 13:20:50 +01:00 |
|
|
|
a18957dbe9
|
Include output even if there is nothing to send
|
2025-09-16 12:33:06 +01:00 |
|
|
|
13d5b724ee
|
Fixed tests
|
2025-09-16 12:16:18 +01:00 |
|
