6538 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ivan Nieto Vivanco	80fb24e861	Fix issue caused for single and double quotes when used as listbox's values	2021-08-23 22:00:01 -05:00
snipe	70f6753f50	Merge pull request #9979 from uberbrady/add_client_side_ldap_certs ... Add client side ldap certs	2021-08-23 16:30:46 -07:00
snipe	9285697611	Merge remote-tracking branch 'origin/develop'	2021-08-20 17:30:52 -07:00
snipe	9687bcb41c	Fixed issue where consumables model number was not searchable ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-20 17:30:35 -07:00
snipe	4ec4e0f44e	Merge remote-tracking branch 'origin/develop'	2021-08-19 12:09:48 -07:00
snipe	ff8faab3be	Merge pull request #9960 from uberbrady/fix_null_sum_totals ... Fix regression for NULL valued numbers in the summary calculation	2021-08-19 12:08:33 -07:00
Brady Wetherington	e28db2d221	Fix regression for NULL valued numbers in the summary calculation	2021-08-19 12:01:47 -07:00
snipe	24af2ab67a	Merge remote-tracking branch 'origin/develop'	2021-08-18 14:31:53 -07:00
snipe	7b447a2f16	Merge branch 'develop' of https://github.com/snipe/snipe-it into develop	2021-08-18 14:31:38 -07:00
snipe	f5112b47cd	Merge pull request #9953 from uberbrady/fix_bootstrap_sum_formatter ... Fixed ch17133 - Fixed sum total calculation on Bootstrap Table pages -	2021-08-18 14:31:10 -07:00
Brady Wetherington	4519f6e180	Fixed sum total calculation on Bootstrap Table pages	2021-08-18 14:13:31 -07:00
snipe	6f7718dd0e	Merge pull request #9950 from inietov/fixes/ch945/status_colors_are_not_displaying_correctly ... Looks great, thanks!	2021-08-18 14:09:26 -07:00
Ivan Nieto Vivanco	f04e23cacb	Add a small refactor so we not repeat logic	2021-08-18 15:22:53 -05:00
Brady Wetherington	1b66f7f719	Add new client-side LDAP SSL certs to .gitignore	2021-08-18 13:22:36 -07:00
Ivan Nieto Vivanco	4207858a14	Fix the count in StatuslabelsController@getAssetsCountByStatuslabel() function that allows it to pass the correct index ... Also edit the default color for assets with the Pending label, so it match the color in the docs	2021-08-18 14:08:35 -05:00
snipe	b88fde5dae	Nicer comment formatting ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 12:07:09 -07:00
snipe	04fa5f2022	Merge remote-tracking branch 'origin/develop'	2021-08-18 01:05:25 -07:00
snipe	923d2a79ae	Fixed weird layout on bulk audit [ch17146] ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 01:05:09 -07:00
snipe	c970464690	Updated production assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:48:05 -07:00
snipe	f99602c039	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/version.php # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json	2021-08-18 00:47:33 -07:00
snipe	0aa328f908	Updated hash ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:45:35 -07:00
snipe	f8562e5835	Recompiled assets ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:45:02 -07:00
snipe	8a6c7269d3	Fixed border radius for bulk checkout field [ch16936] ... Signed-off-by: snipe <snipe@snipe.net>	2021-08-18 00:44:55 -07:00
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
Brady Wetherington	4d4badf830	Got the client-side LDAP setup working well enough for sync!	2021-08-17 14:43:36 -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	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
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
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	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	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