DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 07:47:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
9602 commits 89 branches 265 tags 290 MiB
Commit graph

9602 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
snipe 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
snipe 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
snipe 191f955333
Merge pull request #12610 from veenone/feat/sortable_group_id 
enable sortable for ID column
 2023-03-06 09:26:52 -08:00
Manuel Rodríguez Guimeráns 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
Manuel Rodríguez Guimeráns 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
Achmad Fienan Rahardianto 0b3becee7a enable sortable for ID column 2023-03-04 11:27:00 +07:00
snipe 95bd58487a
Merge pull request #12602 from inietov/fixes/error_checkin_license_seat 
Fixed #12601 Error checkin license seats
 2023-03-02 17:48:22 -08:00
Ivan Nieto Vivanco 8a5d426ccd Use correct LicenseSeat property 2023-03-02 19:33:32 -06:00
snipe f817027fc2
Merge pull request #12593 from snipe/features/add_clone_to_locations 
Added ability to clone location
 2023-03-02 13:15:38 -08:00
snipe 778787db3c Rip out jquery for location parent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 15:36:01 -08:00
snipe b8231f420b Remove name from blanking paroperties 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 14:12:33 -08:00
snipe 9b522006f3 Usew route group for locations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 14:05:53 -08:00
snipe 84a14918bb Updated comments 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 14:03:33 -08:00
snipe 473553c464 Moved gate 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 14:01:40 -08:00
snipe dac877f184 Added location clone 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 13:51:35 -08:00
snipe 78b36c7886
Merge pull request #12592 from uberbrady/fix_accessories_report 
The 'download activity report' displayed the wrong value for 'admin' (fixes FD-33368)
 2023-03-01 12:28:03 -08:00
Brady Wetherington ca849db316 The 'download activity report' displayed the wrong value for 'admin' 2023-03-01 12:23:13 -08:00
snipe c1b57064d4
Merge pull request #12591 from uberbrady/accessories_report_companies 
Actually display name of company in Accessories Report
 2023-03-01 11:52:10 -08:00
Brady Wetherington 9b80e86306 Actually display name of company in Accessories Report 2023-03-01 11:34:30 -08:00
snipe d954c841e6
Merge pull request #12590 from snipe/fixes/check_for_array_in_linux_setup 
Fixes/check for array in linux setup
 2023-03-01 11:06:31 -08:00
snipe 562546a853 Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 23:37:30 -08:00
snipe 4860440306 Check that it’s an array (versus checking that it’s not a bool) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 23:32:10 -08:00
snipe b72a9cc6fd Check if the $owner is boolean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 23:31:26 -08:00
snipe b2fe3c36e9
Merge pull request #12589 from snipe/security/update_font_awesome_to_6_3_0 
Updated font-awesome to ^6.3.0
 2023-02-28 23:16:54 -08:00
snipe 1911480d3a Updated font-awesome to ^6.3.0 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 23:15:50 -08:00
snipe 463ef02fae
Merge pull request #12578 from inietov/fixes/undefined_variable_total 
Fixed Undefined variable `$total`
 2023-02-28 20:50:00 -08:00
snipe 6fec3f4303
Merge pull request #12586 from snipe/assets/compiled_dev_assets 
Compiled dev assets
 2023-02-28 20:32:41 -08:00
snipe f9b5a67dc2 Compiled dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 20:32:08 -08:00
snipe 2189a74d6a Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 20:32:00 -08:00
snipe 44e2796645
Merge pull request #12579 from Godmartinz/gh12571_sidebar_adjustment 
Fixes the sidebar margin top
 2023-02-28 20:30:07 -08:00
snipe 70d0347fe9
Merge pull request #12580 from marcusmoore/feature/crowdin-source-upload 
Add GitHub Action to push translation sources to Crowdin
 2023-02-28 20:28:04 -08:00
snipe 34f13eaa8a
Merge pull request #12393 from snipe/features/make_eol_sortable 
Added EOL as de-normed and sortable on assets
 2023-02-28 18:22:00 -08:00
snipe 1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable 2023-02-28 18:05:09 -08:00
snipe 2ab0abc8a1
Merge pull request #12575 from inietov/fixes/typeError_get_class_argument_must_be_object_null_given 
Fixed: TypeError: get_class(): Argument #1 ($object) must be of type object, null given
 2023-02-28 16:45:53 -08:00
snipe d838662f48
Merge pull request #12585 from marcusmoore/fixes/fix-license-seeder 
Fix license seeder
 2023-02-28 16:03:15 -08:00
snipe 5e626e75ad
Merge pull request #12584 from snipe/fixes/error_on_datepicker 
Convert string to date object for formatting
 2023-02-28 15:55:59 -08:00
Marcus Moore a7a26bb154
Fix License Factory 2023-02-28 15:55:28 -08:00
snipe af9f9d2523 Convert string to date object for formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 15:48:45 -08:00
snipe d13e1b32e7
Merge pull request #12583 from inietov/fixes/user_start_and_end_date_error 
Fixed User start and end date throws error [sc-20228]
 2023-02-28 15:30:46 -08:00
Ivan Nieto Vivanco ad598425ef Adds format to the dates cast 2023-02-28 17:24:14 -06:00
snipe 5194711a6a
Merge pull request #12582 from akemidx/bug/sc-20065/license-export-does-not-show-info-of-boolean 2023-02-28 15:13:04 -08:00
akemidx 25f3e4d41a Adding ability to see boolean values when using normal export 2023-02-28 16:01:23 -05:00
Godfrey M e8fbb0608f adjusts the sidebar margin top 2023-02-28 09:30:02 -08:00