Commit Graph

  • e5129a8b98 Removed next_version snipe 2017-11-21 19:39:33 -08:00
  • a922c1a298 Auto-bumped hash/version snipe 2017-11-21 19:38:29 -08:00
  • f4aa812d96 Changed twitter handle to @snipeitapp snipe 2017-11-21 19:02:15 -08:00
  • 0c9e41e1fa Updated versioning script to handle githooks better snipe 2017-11-21 19:01:47 -08:00
  • 1d6320a88f Merge branch 'develop' snipe 2017-11-21 16:26:41 -08:00
  • 4696e799ed Fixes #4491 and #4483 - handle pre-selected asset on checkout, better checkout-to selection UI (#4501) snipe 2017-11-21 15:58:31 -08:00
  • 2e08a91c53 Merge branch 'develop' v4.1.5 snipe 2017-11-20 21:48:57 -08:00
  • 4fd35573ad Bumped version snipe 2017-11-20 21:20:34 -08:00
  • caf2cdbf6f Merge branch 'develop' snipe 2017-11-20 20:51:22 -08:00
  • c0293a7c1c Add @uknzaeinozpas as a contributor snipe 2017-11-20 19:39:04 -08:00
  • 17405f5de1 Fixed #4413 - Next license seat not bering assigned correctly snipe 2017-11-20 19:21:05 -08:00
  • bfefa10462 Add @TheVakman as a contributor snipe 2017-11-20 18:54:43 -08:00
  • 55a140045b Fixed upgrade language snipe 2017-11-16 16:50:16 -08:00
  • 897bd2c56e Fixed location sorting location instead of rtd snipe 2017-11-16 16:49:48 -08:00
  • 7321c5937f Fixed #4440 - allow username search in asset dropdown snipe 2017-11-16 16:49:16 -08:00
  • 98700cab8b Merge branch 'develop' snipe 2017-11-16 14:14:49 -08:00
  • 3d07635820 Fixed sort by model in asset listing snipe 2017-11-16 14:14:30 -08:00
  • 59b18a6ada Merge branch 'develop' snipe 2017-11-16 13:49:05 -08:00
  • ce525c1985 Fixed #4471 - removed gate for categories selectlist snipe 2017-11-16 13:48:38 -08:00
  • a0d163a3c4 Merge branch 'develop' snipe 2017-11-16 11:41:18 -08:00
  • faab971931 Improved - removed 500 pixel width on 2FA dropdown snipe 2017-11-16 11:09:42 -08:00
  • 38eb16dfea Fixed #4408 - requestable assets not working snipe 2017-11-16 11:09:24 -08:00
  • 4494456cad Merge branch 'develop' snipe 2017-11-15 15:51:50 -08:00
  • 876dde1280 Fixed #4428 - updated translations snipe 2017-11-15 15:31:34 -08:00
  • 17ee904828 Fixed #4450 - added MAIL_REPLYTO_ADDR to docker.env snipe 2017-11-15 14:48:45 -08:00
  • 4f1b58cd35 Merge branch 'develop' snipe 2017-11-15 14:27:47 -08:00
  • edcd3afc3e Fixes #4457 - use un-escaped CSS for custom CSS styles snipe 2017-11-15 14:27:21 -08:00
  • e433b0f9d8 Merge branch 'develop' v4.1.4 snipe 2017-11-14 16:50:05 -08:00
  • f137e516a6 Bumped version snipe 2017-11-14 16:49:18 -08:00
  • ba38b841cb Constrain accessory by category ID if one is passed snipe 2017-11-14 16:47:21 -08:00
  • f7c6697a69 Merge branch 'develop' snipe 2017-11-14 01:32:43 -08:00
  • 498fc3762d Fixed #4437 - pagination for maintenances snipe 2017-11-14 01:32:25 -08:00
  • eb24eb1fff Merge branch 'develop' snipe 2017-11-14 00:04:27 -08:00
  • 3e5e6ba99a Use table alias for models join in search/order by models snipe 2017-11-14 00:04:03 -08:00
  • 0396267388 Fixed #4412 - use select2 ajax list for asset maintenances snipe 2017-11-12 17:22:16 -08:00
  • 4577ba39d7 Merge branch 'develop' snipe 2017-11-10 15:56:34 -08:00
  • 7eef1b4bcf Fixed #4418 - order models by name asc in selectlist snipe 2017-11-10 15:56:14 -08:00
  • 578da128e9 Merge branch 'develop' snipe 2017-11-09 18:59:25 -08:00
  • bb4d49690f Add purchase date to dates array so it’s treated as a Carbon date snipe 2017-11-09 18:59:05 -08:00
  • 7eb94d16a1 Merge branch 'develop' snipe 2017-11-09 14:42:19 -08:00
  • 65bd33c274 Make sure the user isn’t deleted before trying to display the name snipe 2017-11-09 14:42:03 -08:00
  • 0f7aa21a59 Merge branch 'develop' snipe 2017-11-09 13:41:17 -08:00
  • ee0814716a Only format ecpected checkin date if one exists snipe 2017-11-09 13:40:55 -08:00
  • f56e1768b6 Merge branch 'develop' snipe 2017-11-09 13:28:12 -08:00
  • 012afe99e2 Set purchase date to date type snipe 2017-11-09 13:27:58 -08:00
  • 0c02b6d24e Use —no-dev flag in upgrade snipe 2017-11-09 13:25:44 -08:00
  • 2f34336f2b Merge branch 'develop' snipe 2017-11-09 11:18:21 -08:00
  • afe6f43a1b Exclude manufacturer on filter sort snipe 2017-11-09 11:18:04 -08:00
  • 738e33b165 Merge branch 'develop' snipe 2017-11-09 11:06:50 -08:00
  • 566fd4d2e1 Only format purchase date if one exists snipe 2017-11-09 11:06:37 -08:00
  • c61887da21 Merge branch 'develop' snipe 2017-11-09 10:52:46 -08:00
  • 6852b74317 Removed gates from selectlist method snipe 2017-11-09 10:51:55 -08:00
  • 4c266fdcf4 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-11-08 20:28:23 -08:00
  • c26a2f8291 Patching #4402 into develop snipe 2017-11-08 20:28:18 -08:00
  • a994e54726 Update upgrade.php (#4402) uknzaeinozpas 2017-11-09 05:13:35 +01:00
  • 172c7c75a8 Fixed #4374 - Add option to display company names to labels (#4405) madd15 2017-11-09 14:35:39 +10:30
  • 487fd17ce3 Fixed ambiguous query when selecting by model_id snipe 2017-11-08 20:03:26 -08:00
  • 65353fa422 Nicer styling for purchase cost in edit form snipe 2017-11-08 18:06:51 -08:00
  • 4f4920615c Format expected checkin as Y-m-d in form snipe 2017-11-08 18:06:14 -08:00
  • c162c02304 Force expected checkin to be formatted as a date (not datetime) since it’s a date field in the DB snipe 2017-11-08 18:03:47 -08:00
  • 1bb1480f67 Added a comment around protected dates so we know wtf snipe 2017-11-08 18:03:27 -08:00
  • 8dceacc2b4 Merge branch 'develop' snipe 2017-11-08 17:09:19 -08:00
  • ffae537400 Check that the models are valid being trying to return a value in the ajax partials snipe 2017-11-08 17:07:57 -08:00
  • 5ce7882bf5 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-11-08 17:01:50 -08:00
  • b36594f508 Check that the company is valid in select ajax snipe 2017-11-08 17:01:46 -08:00
  • 59c9c22a59 Small UI Changes (#4404) madd15 2017-11-09 07:42:03 +10:30
  • 9097681c13 Changed log fomrat in example env to single snipe 2017-11-08 11:08:11 -08:00
  • 567f741d95 Merge branch 'develop' snipe 2017-11-08 10:59:29 -08:00
  • 9b1fb90519 Change default log type back to single snipe 2017-11-08 10:58:56 -08:00
  • b567ffdcfe Fixed #2855 - checkin for components snipe 2017-11-08 06:06:05 -08:00
  • 9d44607b8f Added UI fade out when bootstrap alerts are dismissed snipe 2017-11-08 03:13:18 -08:00
  • 35ee52212f Added ability to disable the alert icon in the top menu snipe 2017-11-08 03:08:17 -08:00
  • e9e32fdb00 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-11-08 02:46:40 -08:00
  • 6c130ce8ac Apply patch #4354 snipe 2017-11-08 02:46:33 -08:00
  • dd7db0de93 Moved firewall commands from CentOS 7 to a routine and called form both CentOS 7 and Fedora. (#4366) Sorvani 2017-11-08 04:37:34 -06:00
  • 70efac8fa7 Production js snipe 2017-11-08 02:24:34 -08:00
  • 6e2556eefd Production assets snipe 2017-11-08 02:24:06 -08:00
  • fb6a545cc6 Slightly nicer styling snipe 2017-11-08 02:11:33 -08:00
  • e5c1e41966 Nicer icheck for user menu snipe 2017-11-08 01:52:35 -08:00
  • 61617a2629 Slightly less fugly groups permission styling snipe 2017-11-08 01:19:20 -08:00
  • a3e80882c1 Better error handling for qr codes on invalid assets snipe 2017-11-08 01:04:14 -08:00
  • 31980c55de Merge branch 'develop' snipe 2017-11-08 00:58:16 -08:00
  • d1022e8ff7 Fixed #4390 - results couldn’t be loaded error snipe 2017-11-08 00:57:43 -08:00
  • e6ff447ee8 Bumped hash snipe 2017-11-07 23:12:59 -08:00
  • 1123272ae8 Bumped hash snipe 2017-11-07 23:12:10 -08:00
  • 74aa562a3b Merge branch 'develop' snipe 2017-11-07 23:10:49 -08:00
  • 74773ac912 Fixed incorrect policy reference in consumables listing snipe 2017-11-07 23:05:29 -08:00
  • 9764d2ad24 Removed commented code snipe 2017-11-07 22:25:32 -08:00
  • d03b8c6528 Error handling for when log ID has no match on asset accept snipe 2017-11-07 22:25:24 -08:00
  • 99a355145e Removed empty comments snipe 2017-11-07 22:24:57 -08:00
  • 7233e2dded Merge branch 'develop' snipe 2017-11-07 18:21:47 -08:00
  • eed50112d5 Better fallback for local that won’t break migrations snipe 2017-11-07 18:18:27 -08:00
  • 5aee5a3f3d Update location on checkout, error if bad target snipe 2017-11-07 17:37:08 -08:00
  • f21c7ba312 Merge branch 'develop' snipe 2017-11-07 11:28:41 -08:00
  • 9d7455f022 Fixed handling deleting old images better snipe 2017-11-07 11:28:13 -08:00
  • b748e7ed5e Fixed transformers to use new singleton upload urls snipe 2017-11-07 11:11:47 -08:00
  • 84a717c6ad Fixed deleted ordering scope snipe 2017-11-07 11:06:38 -08:00
  • a202e1657c Fixed path for singletons snipe 2017-11-06 21:58:28 -08:00
  • 30ec919048 Remove AWS package snipe 2017-11-06 21:45:31 -08:00
  • 4ae4083b7b Removed unused $matches variable snipe 2017-11-06 21:26:30 -08:00