Marcus Moore
|
0be882dc35
|
Merge branch 'develop' into fix/test-suite
|
2023-03-08 12:13:53 -08:00 |
|
Marcus Moore
|
5fb18af245
|
Update testing documentation
|
2023-03-08 11:58:36 -08:00 |
|
Marcus Moore
|
697824007a
|
Move DB_CONNECTION back to .env.testing.example
|
2023-03-08 11:58:29 -08:00 |
|
snipe
|
e66b19aca0
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 19:44:06 -08:00 |
|
snipe
|
fd96ff0160
|
Add @kenchan0130 as a contributor
|
2023-03-07 19:42:52 -08:00 |
|
snipe
|
1ccedf6426
|
Merge pull request #12617 from kenchan0130/patch-12249
Fixed #12249: fix csv importer for serial_number field
|
2023-03-07 19:42:23 -08:00 |
|
snipe
|
8adeee41e6
|
Merge pull request #12633 from snipe/bug/sc-20332
Fixed 500 when admin erroneously tries to upload a tiff as logo, cleaned up logo upload layout
|
2023-03-07 19:41:10 -08:00 |
|
snipe
|
19d19a4c42
|
Updated language string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 19:18:32 -08:00 |
|
snipe
|
383b5b43bb
|
Added a few more jquery options for prevoew flexibility
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 18:54:38 -08:00 |
|
snipe
|
379c5f6790
|
Reworked the layout for logo upoloads
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 18:54:09 -08:00 |
|
snipe
|
e55d02fd59
|
Added new string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 18:53:53 -08:00 |
|
Marcus Moore
|
dd9c00195b
|
Remove old $tester variable and usused imports
|
2023-03-07 17:04:46 -08:00 |
|
snipe
|
e60fa15414
|
Nicer layout, but it kinda dosn’t work :(
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 17:02:52 -08:00 |
|
Marcus Moore
|
43ff7261b2
|
Remove redundant base test case
|
2023-03-07 16:57:55 -08:00 |
|
Marcus Moore
|
8c13a4c5c9
|
Use LazilyRefreshDatabase instead of RefreshDatabase
|
2023-03-07 16:43:18 -08:00 |
|
snipe
|
45b5a8b6ab
|
Catch exception if the file can’t be handled via Intervention
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 15:56:36 -08:00 |
|
snipe
|
182a5ea5fc
|
Merge pull request #12631 from snipe/bug/sc-20297/expected-checkin-email-report-link-back-error
Dynamically determine target route for expected checkin emails
|
2023-03-07 13:57:26 -08:00 |
|
snipe
|
ea54f540de
|
Dynamically determine target route for expected checkin emails
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 13:42:51 -08:00 |
|
snipe
|
e399015427
|
Merge pull request #12628 from marcusmoore/fixes/keep-asset-name-on-import
Maintain asset name during import with checkout
|
2023-03-07 11:22:53 -08:00 |
|
Marcus Moore
|
c80595e05c
|
Ensure asset name is maintained when importing assets that are checked out
|
2023-03-07 11:09:25 -08:00 |
|
Marcus Moore
|
8fad377114
|
Remove helper methods by inlining where needed
|
2023-03-07 10:28:33 -08:00 |
|
Tadayuki Onishi
|
f4675927a0
|
fix csv importer for serial_number filed
Signed-off-by: Tadayuki Onishi <tt.tanishi100@gmail.com>
|
2023-03-07 22:53:02 +09:00 |
|
Marcus Moore
|
a3c8c3757a
|
Remove unused method
|
2023-03-06 17:50:44 -08:00 |
|
Marcus Moore
|
ddcb8d8dd9
|
Remove commited .env.testing file
|
2023-03-06 17:37:08 -08:00 |
|
Marcus Moore
|
245f0aff72
|
Ignore the correct env file
|
2023-03-06 17:35:49 -08:00 |
|
Marcus Moore
|
ba92501670
|
Add .env.testing.example file
|
2023-03-06 17:34:43 -08:00 |
|
Marcus Moore
|
9aad981895
|
Update phpunit schema location and remove unneeded environment variable
|
2023-03-06 17:25:03 -08:00 |
|
Marcus Moore
|
a24d734ee9
|
Alphabetize keys in phpunit.xml
|
2023-03-06 17:24:09 -08:00 |
|
snipe
|
1ebbc767f1
|
Merge pull request #12624 from snipe/features/added_vip_and_byod_to_importer
Added `vip` and `byod` to importer
|
2023-03-06 17:11:28 -08:00 |
|
snipe
|
a34cb8b862
|
Check for boolean on requestable
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 17:11:08 -08:00 |
|
Marcus Moore
|
d27fe7d4b9
|
Merge branch 'develop' into fix/test-suite
|
2023-03-06 17:04:00 -08:00 |
|
snipe
|
d55393a3d9
|
Merge pull request #12626 from marcusmoore/fixes/checkouts-in-seeders
Fix seeder so assets are checked out to users
|
2023-03-06 17:01:47 -08:00 |
|
Marcus Moore
|
ef27c35d1d
|
Update array keys to set asset location properly
|
2023-03-06 16:33:40 -08:00 |
|
snipe
|
0d3388b3ae
|
Merge pull request #12623 from snipe/bug/sc-20254/errorexception-filesize-stat-failed-for-snipe
Check that the file exists before trying to stat it for filesize
|
2023-03-06 15:43:17 -08:00 |
|
snipe
|
fffe5da2e0
|
Merge pull request #12625 from uberbrady/quiet_down_scim_exceptions
Suppress SCIMExceptions from cluttering up Rollbar
|
2023-03-06 15:42:58 -08:00 |
|
Brady Wetherington
|
dd3c3a1428
|
Suppress SCIMExceptions from cluttering up Rollbar
|
2023-03-06 15:24:16 -08:00 |
|
snipe
|
16bd2cde0f
|
Updated string for file not found
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 15:09:45 -08:00 |
|
snipe
|
e1069ac234
|
Return a file not found error if it doesn’t appear on disk
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 15:09:37 -08:00 |
|
snipe
|
8b6e8898c1
|
Fixed hardcoded string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 15:09:12 -08:00 |
|
snipe
|
2cb06165c4
|
Added missing vip field to transformer and request
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 15:00:04 -08:00 |
|
snipe
|
b46c455e0a
|
Updated mappings.md with byod and vip fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:28:34 -08:00 |
|
snipe
|
304ccaa30e
|
Added byod to asset importer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:28:24 -08:00 |
|
snipe
|
f672bdd3b7
|
Added vip to user importer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:28:14 -08:00 |
|
snipe
|
eec5163e7f
|
Updated vue assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:28:04 -08:00 |
|
snipe
|
f460d881da
|
Updated vue
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:27:53 -08:00 |
|
snipe
|
27a495223d
|
Updated sample CSVs
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 14:27:45 -08:00 |
|
Marcus Moore
|
bc54144284
|
Fix test by passing proper user
|
2023-03-06 12:40:47 -08:00 |
|
snipe
|
cc7325074e
|
Check that the file exists before trying to stat it for filesize
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-06 10:47:28 -08:00 |
|
snipe
|
3a1cf26e98
|
Merge pull request #12621 from Godmartinz/bug/sc-20259/divisionbyzeroerror-division-by-zero-in-snipe
Fixes depreciation model rule for months
|
2023-03-06 10:28:39 -08:00 |
|
Godfrey M
|
e5deb4b413
|
doesn't allow months to be zero
|
2023-03-06 09:41:14 -08:00 |
|