10355 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
snipe	37f2c7beac	Nicer bulk asset select width ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:44:16 -07:00
snipe	b5bb74b8ca	Merge remote-tracking branch 'origin/develop'	2021-08-17 22:01:23 -07:00
snipe	b5e69d6678	Merge pull request #9947 from snipe/fixes/apply_v6_currency_formatter ... Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628]	2021-08-17 22:00:39 -07:00
snipe	cce808c784	Fixed #9909 and #9714 - applies v6 currency formatter to v5 [ch16628] ... Duplicates d4e46ee41f but on v5 Signed-off-by: snipe <snipe@snipe.net>	2021-08-17 21:59:33 -07:00
snipe	d3844811b5	Updated composer lock ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-17 20:28:26 -07:00
snipe	211e0c6bd4	Dropped down to PHP 7.3 compat packages ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-17 20:21:43 -07:00
Brady Wetherington	4d4badf830	Got the client-side LDAP setup working well enough for sync!	2021-08-17 14:43:36 -07:00
snipe	4c13ddd0c5	Merge pull request #9937 from Godmartinz/depreciation_min_feature ... adds a Floor value for depreciation models	2021-08-16 18:29:48 -07:00
Godfrey M	9480709ea3	changed value to current value	2021-08-16 18:22:24 -07:00
Godfrey M	cef0e424e1	adds a Floor value for depreciation models	2021-08-16 18:14:10 -07:00
snipe	d70e4e04c0	Merge pull request #9933 from JemCdo/patch-1 ... Fixed #9934: Typo on creating Depreciation	2021-08-16 07:44:56 -07:00
James Emanuel	98285001ac	Fixing Typo on creating Depreciation	2021-08-16 15:33:17 +03:00
snipe	29c584289f	Merge remote-tracking branch 'origin/develop'	2021-08-14 14:09:31 -07:00
snipe	dc79ca94a2	Merge pull request #9931 from snipe/features/add_asset_restore_to_api ... Features/add asset restore to api	2021-08-14 14:08:36 -07:00
snipe	ef687fdc7b	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-14 14:07:04 -07:00
snipe	45caa8a90d	Added restore functionalty to asset API ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-14 14:06:15 -07:00
snipe	29008545bc	Merge pull request #9924 from snipe/chore/ch16531/update-demo-photos-of-iphones-to-be-more ... Update demo photos of iPhones to be more [ch16531]	2021-08-11 13:16:09 -07:00
Godfrey M	4c2257b67d	Update demo photos of iPhones to be more [ch16531]	2021-08-11 13:13:12 -07:00
snipe	b1e2f86871	Merge pull request #9919 from ItsGageHolland/patch-1 ... Update README.md	2021-08-11 12:39:17 -07:00
Godfrey M	01037cf9cb	initial commit: adds migration, input area and transformer modifications for depreciation minimum value [ch15358]	2021-08-10 18:26:43 -07:00
Gage K. Holland	63a5c70e8e	Update README.md	2021-08-10 09:16:51 +01:00
snyk-bot	3fedcc6766	fix: upgrade bootstrap-table from 1.18.2 to 1.18.3 ... Snyk has created this PR to upgrade bootstrap-table from 1.18.2 to 1.18.3. See this package in npm: https://www.npmjs.com/package/bootstrap-table See this project in Snyk: https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=upgrade-pr	2021-08-07 21:41:02 +00:00
snyk-bot	892ae9cf91	fix: upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26 ... Snyk has created this PR to upgrade tableexport.jquery.plugin from 1.10.21 to 1.10.26. See this package in npm: https://www.npmjs.com/package/tableexport.jquery.plugin See this project in Snyk: https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=upgrade-pr	2021-08-07 21:40:51 +00:00
snyk-bot	9ae6591aa3	fix: Dockerfile.alpine to reduce vulnerabilities ... The following vulnerabilities are fixed with an upgrade: - https://snyk.io/vuln/SNYK-ALPINE313-APKTOOLS-1533754	2021-08-07 21:38:53 +00:00
Tobias Regnery	eced1ab77f	Fix advanced search with serial and another field ... The advanced search in /hardware produces incorrect results if the serial is combined with another field like category. There is a typo as the fieldname 'product_key' doesn't exist. Change this to 'serial'. Also change the last If-Statement from ->orWhere() to ->where(). Now additional fields like custom fields can be combined with other searches in an And-Clause. I think this function could be simplified further, but this is the minimal bugfix.	2021-08-05 15:07:28 +02:00
Computroniks	8121d904e7	Licence cost calculation ... Licences use diffrent key to track quantity. sumFormatterQuantity has been modified to detect which key to use. Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-08-04 22:33:39 +01:00
Computroniks	f994af16da	Added function to calculate cost based on quantity ... sumFormatterQuantity takes the same input as sumFormatter but instead of calculating the specified columns total it calculates the total purchase cost of an item based upon its quantity. Also updated affected pressenters to use this formatter. Signed-off-by: Computroniks <mnickson@sidingsmedia.com>	2021-08-04 22:09:50 +01:00
NMC	4cfc4aec1d	fix false search in api.	2021-08-01 15:10:22 -04:00
NMC	976957ddd4	Add Maintained filed in licenses view and api. + Expires in API	2021-08-01 14:30:16 -04:00
snipe	cdc4940338	Merge pull request #9881 from inietov/fixes/integrity_constraint_violation__emailing_password_reset ... Fixes Integrity constraint violation when emailing password reset.	2021-07-30 16:01:53 -07:00
Ivan Nieto Vivanco	27cdfbc579	Edit the log message	2021-07-29 16:14:52 -05:00
Ivan Nieto Vivanco	405545cd88	Add exception handling in the ForgotPasswordController	2021-07-29 16:02:45 -05:00
Ivan Nieto Vivanco	1b8156ac7f	Add a hidden field to handle departments inside Full Company Support config	2021-07-29 13:28:57 -05:00
Tobias Regnery	1a908e361e	Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport ... locations->isDeletable() checks via gate::allows if a locations is deletable. This calls SnipePermissionsPolicy->before() and checks for !Company::isCurrentUserHasAccess($item). This returns false because locations don't have a company_id. Check for this and return true if the item don't have a company_id.	2021-07-29 10:43:01 +02:00
Jethro Nederhof	d8fdd1b408	Fix branding logo URL path ... The current method adds an additional slash to the URL which results in the logo request producing a 404 error on for Storage drivers like S3 and GCS that don't automatically collapse additional forward slashes into single slashes. E.g. with the current code my logo URL renders like `https://storage.googleapis.com/mybucketname/public//setting-logo-Al0aKMhmYz.svg` (note the double slash after "public") when instead it should render like `https://storage.googleapis.com/mybucketname/public/setting-logo-Al0aKMhmYz.svg` For a local driver this should work fine since webservers handle the additional slashes case, but for key-based storage this 404s. Thanks for your work on Snipe-It, seems like a good system so far!	2021-07-28 14:55:34 +10:00
snipe	593e1234a5	Merge pull request #9797 from markbrule/fixes/search_parameter_checkedout_api ... Fixed #9671: wrap OR queries in sub-condition in checkedout search	2021-07-27 14:39:10 -07:00
snipe	9a5d9eafeb	Merge pull request #9709 from morning-bird/master ... add CompanyableTrait	2021-07-27 14:38:21 -07:00
snipe	071325f368	Merge pull request #9824 from PetriAsi/feature/api-image-uploads-v6 ... Added #9594: Feature/api image uploads for v6	2021-07-27 14:35:16 -07:00
snipe	eca15bd49b	Merge pull request #9837 from Godmartinz/chore/ch16531/update-demo-photos-of-iphones-to-be-more ... Update demo photos of iPhones to be more [ch16531]	2021-07-27 14:34:52 -07:00
snipe	476ab2888c	Merge pull request #9852 from Godmartinz/develop-v6-integration ... adds newer versions of devices for demo	2021-07-27 14:34:15 -07:00
snipe	5f077cc33a	Merge pull request #9858 from dampfklon/fix-dockerfile-v6 ... Add new php extension dependencies for v6	2021-07-27 14:32:23 -07:00
snipe	d2fc98b685	Merge pull request #9861 from inietov/fixes/consumables_accessories_not_correctly_displayed_via_locations ... Fixes #9853 Consumables/Accessories not correctly displayed via Locations	2021-07-26 14:49:05 -07:00
Ivan Nieto Vivanco	38a2a0c1ee	Add the pertinent filters in Accessories and Consumables controllers	2021-07-26 12:59:15 -05:00
Dampfklon	20df7be2f4	add new php extensions dependencies for v6	2021-07-24 23:15:17 +02:00
snipe	75d4a46fff	Merge pull request #9856 from inietov/bug/ch15413/model_number_is_not_on_accessory_import_dropdown ... Fixes: Model Number is not on the Accessory import dropdown of mappable fields [ch15413]	2021-07-24 01:05:26 -07:00
Ivan Nieto Vivanco	0f1c48cb6f	Add the field model_number to Accessory importer	2021-07-24 02:38:44 -05:00
Godfrey M	013e168883	adds newer versions of devices for demo	2021-07-21 15:12:27 -07:00
Ivan Nieto Vivanco	35ffe8b902	Adds a check to know if the asset is checked out to the logged in user to allow check the state int the view	2021-07-20 18:56:22 -05:00
Godfrey M	9fb911146f	Update demo photos of iPhones to be more [ch16531]	2021-07-19 12:26:04 -07:00
snipe	615bdd0499	Bumped hash ... Signed-off-by: snipe <snipe@snipe.net>	2021-07-15 13:29:07 -07:00