lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
9838 commits 1 branch 0 tags 220 MiB
Commit graph

3938 commits

Author SHA1 Message Date
snipe
db0a078c0b
Merge pull request #10573 from uberbrady/fix_force_root_url 
Add some guardrails around very-badly formatted APP_URL settings
 2022-01-27 11:29:29 -08:00
Brady Wetherington
44719e3dcc Fix whitespace issues 2022-01-27 11:29:20 -08:00
Brady Wetherington
1cf1278b3b Fix whitespace issues 2022-01-27 11:28:51 -08:00
Brady Wetherington
476075235a Add some guardrails around very-badly formatted APP_URL settings 2022-01-27 11:24:21 -08:00
Brady Wetherington
70648dedd3 Add some guardrails around very-badly formatted APP_URL settings 2022-01-27 11:21:46 -08:00
snipe
a65fb63b6b
Merge pull request #10511 from inietov/features/audit_date_in_importer 
Adds audit dates in the asset importer
 2022-01-27 10:58:53 -08:00
snipe
9634dde0dd
Merge pull request #10567 from inietov/fixes/importing_and_checking_out_licenses_master 
Fixes Importing licenses without product key duplicates the license
 2022-01-27 10:58:06 -08:00
snipe
c70ae19c28
Merge pull request #10529 from uberbrady/fix_insecure_host_headers 
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden (v5)
 2022-01-26 16:59:55 -08:00
snipe
b153138d1e
Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop 
Add Zip field in the User Importer for develop [sc-18556]
 2022-01-26 16:58:37 -08:00
Ivan Nieto Vivanco
55fdc86e02 Tweak query in the License Importer to not require a Product Key 2022-01-26 17:51:04 -06:00
Ivan Nieto Vivanco
450cb8f92f Tweak query in the License Importer to not require a Product Key 2022-01-26 17:49:34 -06:00
Brady Wetherington
48f1380f6e
Merge pull request #10528 from uberbrady/fix_insecure_host_headers_v6 
Force UrlGenerator's Root URL to be the base of APP_URL unless overriden
 2022-01-24 18:26:30 -08:00
Ivan Nieto Vivanco
7383ec7f1e Add an early return if the model id is not set (for new Asset Models) 2022-01-21 11:45:45 -06:00
Ivan Nieto Vivanco
c86ed892ab Add Zip field in the User Importer 2022-01-19 13:52:15 -06:00
Ivan Nieto Vivanco
1fc71a4111 Add Zip field in the User Importer 2022-01-19 13:35:54 -06:00
Brady Wetherington
0c4768fd2a Force UrlGenerator's Root URL to be the base of APP_URL unless overriden 
(For v5)
 2022-01-18 15:52:59 -08:00
Brady Wetherington
455bc736be Force UrlGenerator's Root URL to be the base of APP_URL unless overriden 2022-01-18 15:31:30 -08:00
Ivan Nieto Vivanco
a05795420a Respect the default value of 60 days in expiring licenses 2022-01-18 14:34:14 -06:00
Ivan Nieto Vivanco
42d86bf57b Adds default values if the expiring alerts threshold is null 2022-01-18 14:21:49 -06:00
Ivan Nieto Vivanco
f510b9c2a9 Add query to filter non-deprecable assets when the Depreciation Report is called 2022-01-15 14:21:31 -06:00
Ivan Nieto Vivanco
8334ed6f7e Add query to filter non-deprecable assets when the Depreciation Report is called 2022-01-15 14:01:19 -06:00
Ivan Nieto Vivanco
153c30eda8 Add to Importer the capacity to search Models only with Model Name since Model Number is not required 2022-01-15 04:32:47 -06:00
Ivan Nieto Vivanco
58b1db29e2 Adds condition to only update the Asset's Model Number if is provided by import file 2022-01-15 04:15:38 -06:00
Ivan Nieto Vivanco
8bd280b416 Add to Importer the capacity to search Models only with Model Name since Model Number is not required 2022-01-15 04:12:30 -06:00
Brady Wetherington
ef463a37d8 Make 'pending' assets properly requestable; use requestable scope 2022-01-14 12:48:33 -08:00
snipe
207ff014b1
Merge pull request #10514 from uberbrady/fix_double_wildcard_query_requestable 
Fixed extraneous wildcard query in requestable asset search
 2022-01-13 19:39:08 -08:00
Brady Wetherington
65e584c2bd Revert the unnecessary optimization for asset->count() 2022-01-13 19:37:08 -08:00
snipe
24a234ede3
Merge pull request #10503 from uberbrady/develop_fix_dont_req_preauth_uac 
Permit DONT_REQ_PREAUTH AD users to log in
 2022-01-13 17:01:59 -08:00
snipe
be7e6ed847
Merge pull request #10502 from uberbrady/ldap_useraccountcontrol_dont_req_preauth 
Add new UserAccountControl to permitted UAC's for AD.
 2022-01-13 17:01:47 -08:00
Brady Wetherington
4e8ae8a162 Fix extraneous wildcard query in requestable asset search 2022-01-13 16:32:40 -08:00
Ivan Nieto Vivanco
949fe2a14a Adds last_audit_date and next_audit_date in the asset importer 2022-01-13 15:14:20 -06:00
snipe
984db1ef44 Apply personal API token fix to master 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:39:56 -08:00
snipe
512dbfee7a Added gate to check that the user is allowed to view API keys 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:33:27 -08:00
snipe
eb8f23a888 Removed commented code 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-13 01:32:28 -08:00
snipe
8f4ec95fbb Remove assets query, since we handle that via API call now and just need the count() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 23:23:00 -08:00
snipe
224d0b2fd2 Small language file additions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-12 22:21:00 -08:00
snipe
43c57c8461 Merge master into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Http/Controllers/BulkAssetModelsController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ModalController.php
#	app/Http/Transformers/GroupsTransformer.php
#	config/version.php
#	package-lock.json
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/assets/less/overrides.less
#	resources/lang/en/admin/hardware/message.php
#	resources/lang/en/admin/settings/general.php
#	resources/views/partials/bootstrap-table.blade.php
#	routes/web.php
 2022-01-12 20:51:33 -08:00
Brady Wetherington
a063806bcc Permit DONT_REQ_PREAUTH AD users to log in 2022-01-12 12:50:39 -08:00
Brady Wetherington
c8fe929e09 Add new UserAccountControl to permitted UAC's for AD. 2022-01-12 12:07:51 -08:00
Alex Janes
d2bb3e6377
Merge branch 'develop' into features/quickscan_checkin 2022-01-11 16:40:20 -05:00
Alex Janes
edef640d35
Merge branch 'develop' into features/lock_logins_to_saml 2022-01-11 09:05:14 -05:00
snipe
ea83567e7d
Merge pull request #10494 from exula/fix/increase_max_licenses 
Fixed #7824
 2022-01-10 15:04:47 -08:00
snipe
d9624b59b4
Merge pull request #10264 from nuraeil/added-localized-strings 
Added #10242: Improved localized strings
 2022-01-10 14:48:52 -08:00
Brad
6b6a83a525 Removing something stupid PHPStorm put in the use area 2022-01-10 14:21:19 -05:00
Brad
81084fa717 Fixed #7824 
Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure.

This commit allievates those pain points

- removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index
- removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that)
- removed the 999 max seats limit from the License Model,
- reworked how new license seats are created when increasing seats or creating licenses
- Added an index the license_seats table to help speed up lookups
 2022-01-10 14:03:28 -05:00
Wächtler, Yannick
04d649122b Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO 2022-01-06 12:35:37 +01:00
Haxatron
bb095641c2
Update BulkAssetModelsController.php 
https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7
 2022-01-06 09:50:11 +08:00
snipe
884b6b0270 Fixes format property on invalid custom field object 
Signed-off-by: snipe <snipe@snipe.net>
 2022-01-03 19:14:50 -08:00
Brady Wetherington
95c30cae8d Some duplicate imports at the top of the Settings file 2022-01-03 13:53:53 -08:00
Brady Wetherington
3c7f2e89ec Merge branch 'develop' into remove_old_ldap 
Had to re-do the composer install because the conflicts were too complicated.
 2022-01-03 12:56:58 -08:00