7112 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	9ae03f21dc	Adds condition to only charge custom field's livewire when the model is updated	2022-01-15 12:14:34 -06:00
Ivan Nieto Vivanco	92b3576395	Fixes a route definition to correctly populate the deprecation report	2022-01-15 12:02:43 -06:00
snipe	6d96f96615	Merge pull request #10520 from inietov/fixes/sc-14356/importer_creating_duplicate_asset_models ... Fixes an issue where importer is creating duplicate asset models	2022-01-15 07:47:36 -08: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
Ivan Nieto Vivanco	d5f6f6cafe	Fixes duplicate API endpoint that returns fieldsets instead of customfields	2022-01-15 03:46:28 -06:00
snipe	b9cc0c9d4c	Merge pull request #10519 from uberbrady/request_pending_assets ... Make 'pending' assets properly requestable; use requestable scope	2022-01-14 13:07:16 -08:00
Brady Wetherington	ef463a37d8	Make 'pending' assets properly requestable; use requestable scope	2022-01-14 12:48:33 -08:00
snipe	cfb64be9a4	More specific RC version number ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:41:04 -08:00
snipe	91017aed52	Bumped to RC-1 ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:38:10 -08:00
snipe	af2e407543	Normalize array format in en language to the new shitty way ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:30:35 -08:00
snipe	ddfa5776c5	Updated language strings ... This absolutely sucks. Something changed in CrowdIn or something else, which results in this push being *thousands* of files because someone somewhere decided that `return [];` was vastly inferior to `return array();` I'll try to fix it. :( FML Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:27:29 -08:00
snipe	da47f62d17	Added strings ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 21:20:38 -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	591e1c6a9d	Merge pull request #10512 from uberbrady/fix_asset_acceptance_routing_bug ... Duplicate route meant overwrite of route-name	2022-01-13 17:08:26 -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
Brady Wetherington	4e8ae8a162	Fix extraneous wildcard query in requestable asset search	2022-01-13 16:32:40 -08:00
Brady Wetherington	c527a5c6e7	Duplicate route meant overwrite of route-name	2022-01-13 16:03:32 -08:00
snipe	4e3fd6bfaf	Merge pull request #10509 from misilot/fix-10176 ... Adding .my.cnf to disable column-statistics backup	2022-01-13 13:13:54 -08:00
Thomas Misilo	930666ffa0	Adding .my.cnf to disable column-statistics backup ... Fixes #10176 The ```.my.cnf``` file is copied to ```/root/.my.cnf``` for each Dockerfile that exists	2022-01-13 14:36:00 -06:00
snipe	0e5ef53c35	Merge pull request #10504 from snipe/fixes/auth_controls_on_api_key_creation ... Fixes auth controls on api key creation	2022-01-13 01:36:52 -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	67ba8a6281	Removed extra spaces ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 23:18:39 -08:00
snipe	9368ddeaf0	Added badge count on requestable assets ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 23:17:54 -08:00
snipe	f206d4ed4e	Fixed double div in current purchase value ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 22:26:56 -08:00
snipe	224d0b2fd2	Small language file additions ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 22:21:00 -08:00
snipe	ae50f86c39	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 20:52:30 -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
snipe	ba5b835933	Lock seeder to english ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 13:10:29 -08:00
Brady Wetherington	a063806bcc	Permit DONT_REQ_PREAUTH AD users to log in	2022-01-12 12:50:39 -08:00
snipe	df0da0f3bc	Fixed escaped string ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 11:20:31 -08:00
snipe	181dc5127f	Add @UniversalSuperBox as a contributor	2022-01-11 15:03:08 -08:00
snipe	303fc39966	Regenerated assets to pikc up #10089 changes ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-11 14:38:17 -08:00
snipe	730c2a6821	Merge pull request #10496 from UniversalSuperBox/fix/improve-asset-card-view ... Fixed #10089 (partially): Back to master: Added some BS tables style overrides for mobile	2022-01-11 14:10:18 -08:00
snipe	bc10761b49	Bumped version ... Signed-off-by: snipe <snipe@snipe.net>	2022-01-11 12:44:16 -08:00
snipe	2262176a60	Merge pull request #10449 from adagioajanes/features/lock_logins_to_saml ... Added #10436: Restricted Logins to SAML controlled via environment variable	2022-01-11 12:37:54 -08:00
Alex Janes	edef640d35	Merge branch 'develop' into features/lock_logins_to_saml	2022-01-11 09:05:14 -05:00
snipe	cf14a0222c	Merge pull request #10498 from Haxatron/master ... Fix access control	2022-01-10 19:24:31 -08:00
snipe	23a2700178	Merge pull request #10491 from snipe/fixes/migration_licenses_table_issue ... Fixed - v6 migration licenses table issue	2022-01-10 15:51:18 -08:00
snipe	ea83567e7d	Merge pull request #10494 from exula/fix/increase_max_licenses ... Fixed #7824	2022-01-10 15:04:47 -08:00
snipe	dcc199835b	Add @nuraeil as a contributor	2022-01-10 14:56:22 -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
snipe	b98c97b00e	Merge pull request #10265 from uberbrady/remove_old_ldap ... Remove old ldap	2022-01-10 14:34:34 -08:00
snipe	b18b3812df	Back to master: Added some BS tables style overrides for mobile ... This repeats 06e8e826, which alone improves the mobile view immensely, on master.	2022-01-10 15:23:43 -06: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