DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
9743 commits 101 branches 268 tags 320 MiB
Commit graph

2617 commits

Author SHA1 Message Date
snipe 9ac4efb912 Better commenting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:24:38 -07:00
snipe 30cf7eb750 Disallow action in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:42:50 -07:00
snipe 0dd11575c5 Added merge controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:19:16 -07:00
snipe b374834999 Added extra order by switch for first_name and last_name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:07:51 -07:00
snipe 5e4455f042 Deleted duplicate statement 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 16:07:36 -07:00
snipe e9601bcf13 Handle already-deleted license files more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-15 13:05:51 -07:00
snipe a0617edaf0 Fixed missing variable in Slack hook test 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 19:02:38 -07:00
snipe 4c66267f3b
Merge pull request #12668 from inietov/fixes/undefined_array_key_0 
Fixed ErrorException: Undefined array key 0 [sc-20424]
 2023-03-14 17:10:04 -07:00
slong753 60b70a4074 catch and redirect back with error 2023-03-14 16:07:09 -05:00
snipe dfd9fcc5e0
Merge pull request #12599 from inietov/fixes/unknown_column_0_in_field_list 
Fixed Column not found: 1054 Unknown column '0' in 'field list' [sc-20004]
 2023-03-14 09:51:42 -07:00
Ivan Nieto Vivanco 67471a3a77 Evaluate if the collection is empty before access the array index 2023-03-13 21:44:06 -06:00
Godfrey M 1bd37b49e9 adds translations for webhook names 2023-03-13 16:13:02 -07:00
Ivan Nieto Vivanco d224f3177e Delete a rule that was breaking validation 2023-03-13 16:43:10 -06:00
Godfrey M 6474249ea8 uppercased names 2023-03-13 15:29:53 -07:00
Godfrey M 7612c5d852 lowercases variables 2023-03-13 15:26:51 -07:00
Ivan Nieto Vivanco e7b3daa80c Adjust validator to only receive valid groups id's 2023-03-13 16:10:08 -06:00
Ivan Nieto Vivanco e4204a6dd1 Adds validator to PATCH request in the API UsersController 2023-03-13 15:49:05 -06:00
Godfrey M 542332ea0c removes discord from rules 2023-03-13 10:54:18 -07:00
Godfrey M 27a2ed5c79 Merge branch 'develop' into generalize_webhooks 2023-03-13 10:41:08 -07:00
snipe dccd6fd4b1 Duplicate withCount 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:06:14 -08:00
snipe 7f8bdbd252 Added showableAssets() relationship to Category model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:01:38 -08:00
Godfrey M 15c19a7ab7 silenced Discord option and validation, more translations 2023-03-08 10:35:45 -08:00
Godfrey M 69944853f9 more translations 2023-03-07 15:57:58 -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
Godfrey M 35dd0d8def adds generalized webhooks, updates settings page, translations, validation 2023-03-07 15:48:21 -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 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 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 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
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
Ivan Nieto Vivanco 95f568b934 Remove unnecessary try/catch 2023-03-02 19:50:47 -06:00
Ivan Nieto Vivanco 8a5d426ccd Use correct LicenseSeat property 2023-03-02 19:33:32 -06:00
Ivan Nieto Vivanco e0b2dc043a Adds try/catch to users API 2023-03-02 11:13:56 -06:00
Godfrey M aae178a606 gets select working, placeholders update dynamically 2023-03-01 17:10:10 -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 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
Godfrey M 354f04534e add multi array, migration, still having issues 2023-03-01 12:30:32 -08:00
Brady Wetherington ca849db316 The 'download activity report' displayed the wrong value for 'admin' 2023-03-01 12:23:13 -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 463ef02fae
Merge pull request #12578 from inietov/fixes/undefined_variable_total 
Fixed Undefined variable `$total`
 2023-02-28 20:50:00 -08:00
snipe 1f7ae08d76
Merge branch 'develop' into features/make_eol_sortable 2023-02-28 18:05:09 -08:00
Ivan Nieto Vivanco 1be0a8d911 Declare variable as an empty array 2023-02-28 10:22:49 -06:00
Ivan Nieto Vivanco 9d94bd6567 Validate if the license seat is not checked out, it can't be checked in 2023-02-27 18:57:38 -06:00