Commit Graph

  • 5290c47e2a Merge branch 'develop' into v5-master-develop-integration snipe 2019-11-18 19:49:39 -08:00
  • 957c7f4e79 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop snipe 2019-11-18 19:01:35 -08:00
  • a73fd24695 Fix maintenances permissions check to allow users who can edit assets to edit maintenances snipe 2019-11-08 17:02:17 -08:00
  • 70c8ad9797 Bumped minor version v4.7.8 snipe 2019-10-28 13:55:21 -07:00
  • 0290257734 Limit license seats to 999 to prevent latency snipe 2019-10-28 13:48:18 -07:00
  • 53eae6fbfd Fix issues with update permission naming (#7493) Marián Skrip 2019-10-28 19:44:48 +01:00
  • a90149940a Update UsersController.php (#7528) Alexandr Hacicheant 2019-10-28 20:43:29 +02:00
  • 4fe689dc5d Merge branch 'master' of https://github.com/snipe/snipe-it snipe 2019-10-21 15:45:17 -07:00
  • 0769f585ea Disallow locations from being their own parents snipe 2019-10-21 15:45:05 -07:00
  • 04562e6d4a Added 4260352 to ldapsync enabled account constraint snipe 2019-10-18 17:48:50 -07:00
  • 22d2ad9248 Fixes nested location selectlist (#7483) snipe 2019-10-02 03:56:56 -07:00
  • 6deb26fafe Remove unused variable snipe 2019-09-30 19:37:52 -07:00
  • 6c1de7ff05 Apply fix for #6642 to master snipe 2019-09-30 19:21:57 -07:00
  • ab05a44e0b Merge branch 'develop' of https://github.com/snipe/snipe-it into develop snipe 2019-09-30 19:18:54 -07:00
  • 7f5f4a1297 Added softwarew support and hardware support to maintenance types snipe 2019-09-24 01:34:23 -07:00
  • c68c0e1208 Account for limit if none is passed in the request v4.7.7 snipe 2019-09-03 20:28:49 -07:00
  • c256536d21 Math is hard snipe 2019-09-03 14:29:58 -07:00
  • 4159a0effa Bumped version snipe 2019-09-03 14:12:13 -07:00
  • b8f7cd81eb Limit API request results per page (#7405) snipe 2019-09-03 14:02:08 -07:00
  • 3dcef9aac9 Add support for custom remote user header (#7370) Martin Berg 2019-09-03 20:07:26 +02:00
  • b381528668 Added console rekey tool (#7330) snipe 2019-09-03 11:03:32 -07:00
  • 4c8b26f732 Implement #3088: Add "Generate Label" option to "Actions" dropdown menu in individual Asset Details view. (#7388) Logan Swartzendruber 2019-09-03 14:02:55 -04:00
  • 7b0b28aed0 Add #7393 - next_audit_date set on asset creation if an audit interval is configured in settings (#7394) Rick Heil 2019-09-03 13:58:51 -04:00
  • 6d66d7e215 Removed withErrors on JSON response snipe 2019-08-22 21:36:47 -07:00
  • 0544164015 Fixed Eloquent Builder path in docblock snipe 2019-08-20 18:10:36 -07:00
  • b6a188a87b Removed erroneous linebreak snipe 2019-08-20 18:10:21 -07:00
  • b5bf8e9a37 Smaller chunking for custom report, add max_execution_time snipe 2019-08-15 06:14:25 -07:00
  • ba197c8857 Fixed #7259 - upgraded phpdocumentor/reflection-docblock to v4 snipe 2019-08-15 03:02:24 -07:00
  • 124b249df4 Fixed #7289 - git fetch before checkout in upgrade.php snipe 2019-08-15 01:32:20 -07:00
  • 2a6919c438 Fixed #7321 - added link to Helm Chart repo snipe 2019-08-15 01:07:30 -07:00
  • 60bb385cf7 Make status label required snipe 2019-08-14 23:46:09 -07:00
  • 47724d7268 Make error text color match snipe 2019-08-14 23:46:00 -07:00
  • c9f9a60354 Fixed asset tag error message alignment snipe 2019-08-14 23:28:01 -07:00
  • da52511bf9 Use asset tags snipe 2019-08-14 23:13:23 -07:00
  • 7899d2284c Fixed parse error in API routes snipe 2019-08-14 22:33:56 -07:00
  • c5e6f06e9b Revert import history to master version to fix errors snipe 2019-08-14 22:27:17 -07:00
  • 6db915b7f0 Removed serialize duplicate snipe 2019-08-14 22:22:50 -07:00
  • 756361584a Updated assets snipe 2019-08-14 22:22:33 -07:00
  • a6d486ea8a Fix invalidJSON exception snipe 2019-08-14 22:18:48 -07:00
  • f1143d701a Updated composer.lock snipe 2019-08-14 21:55:38 -07:00
  • b65fd4adba Fixed syntax in composer.json snipe 2019-08-14 21:51:37 -07:00
  • 441ae69f5c Integrations/develop into master (#7352) snipe 2019-08-14 21:48:14 -07:00
  • 8b4a9aa382 Fixes to history importer snipe 2019-08-13 18:15:42 -07:00
  • 99cd552d5c History importer fixes snipe 2019-08-13 18:00:21 -07:00
  • 6c7e5cb9cf Merge branch 'master' of https://github.com/snipe/snipe-it snipe 2019-08-10 17:49:23 -07:00
  • 6ebb01a081 Group related variables in .env snipe 2019-08-10 17:48:03 -07:00
  • 5591c861b9 Update README.md (#7334) Greg Stamper 2019-08-08 02:12:46 -04:00
  • d37280567d Fixed CVE-2019-10742 snipe 2019-08-06 21:11:38 -07:00
  • e7b0ee2539 Added accessories checkout/checkin API endpoint snipe 2019-08-02 15:08:26 -07:00
  • 1608dba7dd Commenting again? snipe 2019-07-31 14:29:19 -07:00
  • f721dac2ca Merge branch 'develop' of https://github.com/snipe/snipe-it into develop snipe 2019-07-31 14:26:46 -07:00
  • a4629977e7 Added comments to the ByFilter query scope for clarity snipe 2019-07-31 14:24:38 -07:00
  • c593b3645c Added comments to the ByFilter query scope for clarity snipe 2019-07-31 14:24:01 -07:00
  • 28ae90fa8a Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7317) Ivan Nieto 2019-07-31 15:55:21 -05:00
  • f407b86aa8 Added condition to deal with fieldname 'rtd_location' which can be tried to be queried in some places and doesn't exist in database (#7318) Ivan Nieto 2019-07-31 15:54:55 -05:00
  • c7be25078e Bumped version snipe 2019-07-26 13:02:47 -07:00
  • 3dc2cc9f22 CORS for api (#7292) snipe 2019-07-26 12:38:31 -07:00
  • ab86e42b2e Fixed #7270 - Checking-in Assets via API Removes the Item's Asset Name snipe 2019-07-26 12:37:38 -07:00
  • 9af9ed9eb9 Add @mskrip as a contributor snipe 2019-07-24 11:01:28 -07:00
  • 250a797339 Fixed #7250 - permission issue for API fieldsets and fields endpoints snipe 2019-07-24 11:00:42 -07:00
  • 8a1f6b74e8 Fix permission issue for API fieldsets and fields endpoints (#7294) Marián Skrip 2019-07-24 19:57:09 +02:00
  • 141b0b410b Change variable name to be clearer v4.7.6 snipe 2019-07-23 18:23:51 -07:00
  • d40f06373e DIsable CORS allowed origins by default to replicate existing behavior snipe 2019-07-23 18:23:39 -07:00
  • 56753fa4cd More clarification snipe 2019-07-23 18:07:45 -07:00
  • 8a7bafb575 Clarified header comments snipe 2019-07-23 18:05:07 -07:00
  • 82f91cb944 Fixed typo snipe 2019-07-23 18:03:53 -07:00
  • 41b226e5fc Added APP_CORS_ALLOWED_ORIGINS env option snipe 2019-07-23 18:02:51 -07:00
  • ae6048a6ea Changed order so CORS will still work if throttle hit snipe 2019-07-23 18:02:27 -07:00
  • ef41e0060a Added CORS support to API snipe 2019-07-23 17:17:01 -07:00
  • a0f3fc6d76 Bumped hash snipe 2019-07-18 14:37:54 -07:00
  • 74e647fea7 Apply fix from PR #7273 to master snipe 2019-07-18 14:37:48 -07:00
  • 55ee90b25d Fixes #7252 form request changes (#7272) snipe 2019-07-18 14:32:23 -07:00
  • eec445fcf5 Command to fix custom field unicode conversion differences between PHP versions (#7263) snipe 2019-07-18 14:30:18 -07:00
  • af1857b6ee Fix for the issue when the user tries to query assets due for audit without appropiate configuration [ch9625] (#7273) Ivan Nieto 2019-07-18 16:08:55 -05:00
  • cef22c3158 Caps asset warranty to 20 years snipe 2019-07-18 09:49:58 -07:00
  • 61fb38087e Bumped hash snipe 2019-07-17 17:55:53 -07:00
  • 0e93495ca2 Check that the user has assets and that the aset model is valid snipe 2019-07-17 17:51:35 -07:00
  • 444e250609 Fixed countable() strings on user destroy snipe 2019-07-17 17:51:13 -07:00
  • 77a6f6f400 Cap warranty months to 3 on the frontend blade snipe 2019-07-17 12:15:15 -07:00
  • 15bfd07f30 Cap warranty months to three characters snipe 2019-07-17 12:13:15 -07:00
  • fecf8015a1 Added space between footer and custom message snipe 2019-07-17 12:09:32 -07:00
  • 79ab0d8dc2 Check for valid seat on hardware view snipe 2019-07-17 12:09:18 -07:00
  • b4b6d6b571 Comment clarification on #7186 snipe 2019-07-15 15:31:09 -07:00
  • 8c73a47afb Fixed #7186 - has vs filled in User’s API blanking out groups if no group_ids are passed snipe 2019-07-15 15:27:02 -07:00
  • f82ffe378c Merge branch 'master' of https://github.com/snipe/snipe-it snipe 2019-07-15 14:11:18 -07:00
  • 984c2a8fd4 Better log message for bad LDAP connection snipe 2019-07-15 14:10:57 -07:00
  • 6736b1c4e7 Addresses #7238 - add PWA code to layout snipe 2019-07-15 13:49:56 -07:00
  • d409be6d43 Fix #6910: Add logic to manipulate the eloquent query. (#7006) Ivan Nieto 2019-07-15 15:02:44 -05:00
  • e1b33f3087 Spelling Correction (#7206) Thomas Misilo 2019-06-27 20:33:13 -05:00
  • 740d5a6846 Downgrading rollbar for Laravel 5.5 snipe 2019-06-25 18:07:21 -07:00
  • d19df4ded8 Bumped version v4.7.5 snipe 2019-06-24 14:43:44 -07:00
  • 03a4512406 fixing previous commit's actual wiping of password (#7183) Kasey 2019-06-19 14:21:53 -07:00
  • de992e4df3 Fixed LDAP password blanking on save snipe 2019-06-14 17:20:37 -07:00
  • a85251aa83 Fixed #7164 - change table name to permission_groups snipe 2019-06-14 10:37:20 -07:00
  • 4c61d330e6 fix Paginator (#7157) Diogenes S. Jesus 2019-06-14 18:54:09 +02:00
  • 26a1181765 Possible fix for reporting/admin migration back in time snipe 2019-06-12 18:53:53 -07:00
  • cef030cf55 Fixed permission insert snipe 2019-06-12 18:39:55 -07:00
  • 2bfa05fd2d Back in time fix FOR #7145 for new installs on MySQL 8+ snipe 2019-06-12 16:24:55 -07:00
  • 30904dd019 Reduce minimum group name length to 2 (from 3) snipe 2019-06-12 15:56:19 -07:00
  • 1d0d25db37 Fixed #7145 - rename groups table to permissions_group for mysql 8 reserved word compatibility snipe 2019-06-12 15:51:47 -07:00