942bedaf06
Re-add VIP and BYOD to importer, but in Livewire
2023-03-07 18:53:32 -08:00
09c1298e03
Merge branch 'develop' into livewire_importer_2_squashed_and_rebased
...
I'll be taking in the changes to the importer front-end elsewhere
2023-03-07 18:51:05 -08:00
fe699737eb
Add improved field-guessing logic; make sure 'do not map' fields work
2023-03-07 18:26:59 -08:00
dd9c00195b
Remove old $tester variable and usused imports
2023-03-07 17:04:46 -08:00
e60fa15414
Nicer layout, but it kinda dosn’t work :(
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 17:02:52 -08:00
43ff7261b2
Remove redundant base test case
2023-03-07 16:57:55 -08:00
8c13a4c5c9
Use LazilyRefreshDatabase instead of RefreshDatabase
2023-03-07 16:43:18 -08:00
69944853f9
more translations
2023-03-07 15:57:58 -08:00
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
35dd0d8def
adds generalized webhooks, updates settings page, translations, validation
2023-03-07 15:48:21 -08:00
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
ea54f540de
Dynamically determine target route for expected checkin emails
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-07 13:42:51 -08:00
ec5836dab4
cloning accessories first bit
2023-03-07 16:41:48 -05:00
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
c80595e05c
Ensure asset name is maintained when importing assets that are checked out
2023-03-07 11:09:25 -08:00
8fad377114
Remove helper methods by inlining where needed
2023-03-07 10:28:33 -08:00
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
a3c8c3757a
Remove unused method
2023-03-06 17:50:44 -08:00
ddcb8d8dd9
Remove commited .env.testing file
2023-03-06 17:37:08 -08:00
245f0aff72
Ignore the correct env file
2023-03-06 17:35:49 -08:00
ba92501670
Add .env.testing.example file
2023-03-06 17:34:43 -08:00
9aad981895
Update phpunit schema location and remove unneeded environment variable
2023-03-06 17:25:03 -08:00
a24d734ee9
Alphabetize keys in phpunit.xml
2023-03-06 17:24:09 -08:00
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
a34cb8b862
Check for boolean on requestable
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 17:11:08 -08:00
d27fe7d4b9
Merge branch 'develop' into fix/test-suite
2023-03-06 17:04:00 -08:00
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
ef27c35d1d
Update array keys to set asset location properly
2023-03-06 16:33:40 -08:00
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
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
dd3c3a1428
Suppress SCIMExceptions from cluttering up Rollbar
2023-03-06 15:24:16 -08:00
16bd2cde0f
Updated string for file not found
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:09:45 -08:00
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
8b6e8898c1
Fixed hardcoded string
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:09:12 -08:00
2cb06165c4
Added missing vip field to transformer and request
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 15:00:04 -08:00
b46c455e0a
Updated mappings.md with byod and vip fields
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:28:34 -08:00
304ccaa30e
Added byod to asset importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:28:24 -08:00
f672bdd3b7
Added vip to user importer
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:28:14 -08:00
eec5163e7f
Updated vue assets
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:28:04 -08:00
f460d881da
Updated vue
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:27:53 -08:00
27a495223d
Updated sample CSVs
...
Signed-off-by: snipe <snipe@snipe.net >
2023-03-06 14:27:45 -08:00
bc54144284
Fix test by passing proper user
2023-03-06 12:40:47 -08:00
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
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
e5deb4b413
doesn't allow months to be zero
2023-03-06 09:41:14 -08:00
f54d83ed59
Merge pull request #12612 from manuteleco/add_path_in_preflight_url_message
...
Fixed #11800 : Include path in the expected URL during Pre-Flight
2023-03-06 09:36:15 -08:00
39193a71b7
Merge pull request #12611 from manuteleco/add_reverse_proxy_support_in_preflight
...
Fixed #10779 : Add Reverse Proxy support to Pre-Flight URL check
2023-03-06 09:35:34 -08:00
191f955333
Merge pull request #12610 from veenone/feat/sortable_group_id
...
enable sortable for ID column
2023-03-06 09:26:52 -08:00
548ae7ad22
Add Reverse Proxy support to Pre-Flight URL check
...
Before this change, the Pre-Flight URL check would inevitably fail
whenever Snipe-IT was running behind a reverse proxy or load balancer.
The URL check tries to ensure that the configured application URL
matches the URL that is actually used to reach the application. However,
when running behind an HTTP intermediary (like a reverse proxy or a load
balancer) the HTTP connection that Snipe-IT receives is not the _real_
connection from the user anymore, but a connection from the HTTP
intermediary. The scheme, host and port that Snipe-IT would obtain from
that incoming intermediary connection wouldn't match what is configured
as application URL and, therefore, the URL check would fail.
This commit solves the situation by making Snipe-IT's Pre-Flight URL
check aware of the `X-Forwarded-Proto` and `X-Forwarded-Host` HTTP
headers. These headers represent the _de-facto_ standard used by reverse
proxies and other HTTP intermediary components to convey information
about the incoming HTTP connection to the upstream application. Being
the upstream application, Snipe-IT can then make use of this information
to correctly evaluate the validity of the configured application URL.
2023-03-05 18:15:16 +01:00
1d4f4b92de
Include path in the expected URL during Pre-Flight
...
So that the message displayed to the user when the URL Pre-Flight check
fails is:
> Snipe-IT thinks your URL is SCHEME://DOMAIN, but your real
URL is SCHEME://DOMAIN/setup
instead of:
> Snipe-IT thinks your URL is SCHEME://DOMAIN/setup, but your real
URL is SCHEME://DOMAIN/setup
Having a missing "/setup" in the expected URL might confuse the user
into thinking that it is an additional configuration problem they need
to fix.
With this change, the comparison between the expected and actual URL
will not contain any accidental difference anymore. Only those that the
user really needs to be aware of and fix in their setup.
2023-03-05 17:52:45 +01:00
Brady Wetherington