Commit Graph

  • 48b52a0ccc Merge branch 'hotfixes/p-typo' into develop snipe 2016-09-28 08:59:07 -07:00
  • 9ecb0e6ca1 Fixed errant typo snipe 2016-09-28 08:58:16 -07:00
  • 9091385182 Merge branch 'hotfixes/purchase_cost' into develop snipe 2016-09-27 19:13:21 -07:00
  • b90c0de822 Fix companyable reult in maintenances snipe 2016-09-27 19:07:45 -07:00
  • ee2522571c Fixes #2673 snipe 2016-09-27 19:07:30 -07:00
  • d3a13bcd45 Functional config for laravel 5 snipe 2016-09-27 18:47:00 -07:00
  • 67f199b09d Added customfields to asset CSV export snipe 2016-09-27 15:09:47 -07:00
  • f1c458185d Client-side pagination on asset report for faster loading snipe 2016-09-27 14:56:05 -07:00
  • ed22ec4b36 Bumped hash snipe 2016-09-27 08:42:55 -07:00
  • fa72e64b98 Add checkout date to asset report snipe 2016-09-27 08:42:48 -07:00
  • 2a8ab06ca3 Remove escaping for CSV to prevent weird encoding snipe 2016-09-27 07:25:28 -07:00
  • 61d07bdc7c Sigh. snipe 2016-09-27 07:24:26 -07:00
  • 3061ce2983 Missed delimiter for CSV snipe 2016-09-27 07:23:30 -07:00
  • e9f3d622f5 Add company name to custom asset report snipe 2016-09-27 07:19:52 -07:00
  • 1e3244b2b3 Merge branch 'hotfixes/eol' into develop snipe 2016-09-27 07:04:45 -07:00
  • a92bfe8ade Default EOL to null, not 0, if no value entered snipe 2016-09-27 06:53:59 -07:00
  • c42dfadd17 Merge branch 'hotfixes/purchase_order' into develop snipe 2016-09-27 01:31:02 -07:00
  • 0a391de09f Fixes #2682 - search on purchase_order snipe 2016-09-27 01:29:31 -07:00
  • b6cc7e7c14 Fixes bug where 12-hour fprmat for hours was used snipe 2016-09-26 22:35:51 -07:00
  • 819ca2921b Fixes bug where 12-hour format was used for hours snipe 2016-09-26 22:34:09 -07:00
  • 7d272e3c96 Fix pre-flight port number check. (#2681) Joris van Eijden 2016-09-27 03:23:56 +02:00
  • 40f00665b3 Translate emails (#2652) Andrés Núñez 2016-09-26 23:13:07 +02:00
  • 03ee6b8f91 SELinux and iptables update for installer (#2674) tiagom62 2016-09-26 17:11:43 -04:00
  • 937192f7ce Ugh… git… why? snipe 2016-09-23 14:13:41 -07:00
  • ce1f62b9be Merge branch 'hotfixes/2672' into develop snipe 2016-09-23 14:12:52 -07:00
  • 3208522dd1 Fixes #2672 - model_no field updated to be string snipe 2016-09-23 14:10:08 -07:00
  • c3cd329604 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2016-09-23 13:14:18 -07:00
  • 2ba4986396 Updated history importer message snipe 2016-09-23 13:14:11 -07:00
  • 8ba19632cf Removed new badge snipe 2016-09-23 13:13:42 -07:00
  • caf6a10227 grr.. Fixed git commit message stuck in file. (#2659) Michael T 2016-09-21 15:27:09 -07:00
  • 580091269d mkdir not recursive (#2460) Eammon Hanlon 2016-09-21 12:05:06 -07:00
  • bcc6ca5180 Deb/Ubu pro bar & Ubu 16 php-xml pkg (#2644) Michael T 2016-09-20 13:26:53 -07:00
  • 7fdd4fbe98 Updates to the history importer to make it a little less brittle and provide better feedback snipe 2016-09-20 09:22:49 -07:00
  • aecef2618f Add reply-to for mail snipe 2016-09-20 07:20:40 -07:00
  • bd5e6d8551 Add reply-to config setting snipe 2016-09-20 07:20:10 -07:00
  • 1e4e9dd3d7 Updated language files snipe 2016-09-20 05:08:04 -07:00
  • 2ab91fed01 Fixes #2607 - non-encrypted now visible to non-admins with asset access snipe 2016-09-20 03:48:38 -07:00
  • 5b0220ac1e Fixed typo snipe 2016-09-20 03:01:04 -07:00
  • aa92b93bd1 Fixes #2622 - add depreciation to license report snipe 2016-09-20 02:58:08 -07:00
  • 998624ad68 Bumped version for v3.5-beta v3.5.0-beta snipe 2016-09-20 00:50:35 -07:00
  • d3d36315d3 Hotfixes adding company name to custom report snipe 2016-09-20 00:49:08 -07:00
  • 6dc143d95d Use Ajax activity report for dashboard to prevent data duplication snipe 2016-09-20 00:46:46 -07:00
  • d8753a7d86 Use Ajax for activity report snipe 2016-09-20 00:46:24 -07:00
  • 90af734f6b Fix migration from integer to string to handle polymorphic migration snipe 2016-09-20 00:46:14 -07:00
  • 3aa7c60765 Costometic cleanup snipe 2016-09-20 00:45:25 -07:00
  • 0962d770cf Ajax activity report snipe 2016-09-20 00:45:16 -07:00
  • 5d8c06bc30 Eager loading for custom report snipe 2016-09-19 23:52:20 -07:00
  • 2597a7b896 Added Ajax reporting view snipe 2016-09-19 23:52:01 -07:00
  • 3741a93884 Added docblocks and cleaned up spacing snipe 2016-09-19 23:51:45 -07:00
  • 71be73781b Add company name option to reports snipe 2016-09-19 22:27:34 -07:00
  • 7aea9341f8 Have the installer install php-xml in ubuntu 16.04, it's where the utf8_decode function is located (#2638) Daniel Meltzer 2016-09-19 19:28:07 -05:00
  • e5098c3ba1 missing semicolon (#2629) tiagom62 2016-09-17 14:39:24 -04:00
  • 46507c929a Sort backups newest to oldest (#2624) tiagom62 2016-09-17 03:00:39 -04:00
  • 8233d520c6 Missing file formats (#2621) tiagom62 2016-09-16 19:18:33 -04:00
  • 06f174adf9 Allow uploading rtf files (#2620) tiagom62 2016-09-16 19:18:24 -04:00
  • 08f320b76a DB_DUMP_PATH not set when using install.sh (#2623) tiagom62 2016-09-16 19:17:04 -04:00
  • 04898c49b2 Fixed wrong translation from PR snipe 2016-09-15 20:03:47 -07:00
  • eeff305b02 Update dashboard.blade.php (#2593) Karol 2016-09-16 04:59:01 +02:00
  • 2d8269ddcd Checkout Improvements, and initial support for requesting an asset model (#2573) Daniel Meltzer 2016-09-15 21:58:27 -05:00
  • b0a8a0427d Merge branch 'hotfix/license-clone' into develop snipe 2016-09-14 19:08:06 -07:00
  • f384593e19 Fix license cloning snipe 2016-09-14 19:04:52 -07:00
  • 5846f23d8b Fix stupid migration? Maybe? Might be more trouble later snipe 2016-09-14 18:59:14 -07:00
  • 91a035ec5b Text BOM text BOM, you’re my Text BOM…. snipe 2016-09-14 18:58:52 -07:00
  • d357326dc1 Use PHP streaming to generate asset report to prevent timeouts snipe 2016-09-12 14:10:04 -07:00
  • 5e2dbaffc4 Use streaming to handle large exports snipe 2016-09-12 14:06:55 -07:00
  • 391c9a77ef Misc debug template for use with debugging CSV exports, etc snipe 2016-09-12 14:05:31 -07:00
  • 7bde0f4f92 Fixes #2586 snipe 2016-09-08 20:01:46 -07:00
  • aa0ccf11fa Only load the remote gravatar image if the server can talk to the outside world snipe 2016-09-07 01:41:23 -07:00
  • a8f79369ee Added components checkout gate snipe 2016-09-07 01:15:14 -07:00
  • 0a506120b7 Hotfix for dumb enum issue snipe 2016-09-06 20:01:10 -07:00
  • 0e28f36678 Fixes for weird stupid enum issue snipe 2016-09-06 20:00:37 -07:00
  • e86adccf19 Actionlog Class: Improvements and polymorphism (#2561) Daniel Meltzer 2016-09-06 21:39:42 -05:00
  • e7fba08f92 Merge remote-tracking branch 'origin/develop' v3.4 snipe 2016-09-06 10:38:31 -07:00
  • 35f3f1432f Bumped version snipe 2016-09-06 10:38:07 -07:00
  • 934b39268d Merge remote-tracking branch 'origin/develop' snipe 2016-09-06 10:35:33 -07:00
  • 67315d81d6 Fixes #2134 - hide archived assets from list all snipe 2016-09-01 13:28:15 -07:00
  • eee64d5509 Set the public path for users who can’t use public as a directory (shared hosting) snipe 2016-09-01 12:53:38 -07:00
  • b450ef3534 Cast group permissions as array for older, wonky installs snipe 2016-08-30 13:25:14 -07:00
  • d4dc1830ec Fixes #2527 - honor the setting for whether Snpie-IT can access the outside world snipe 2016-08-30 12:58:08 -07:00
  • 04e9ca0942 Fixes #2399 snipe 2016-08-30 12:34:23 -07:00
  • 06021d79c1 Fixed typo snipe 2016-08-30 12:25:46 -07:00
  • 7ecb8d7bc1 Patches PR#2526 to develop snipe 2016-08-30 12:13:29 -07:00
  • efe95d9ad0 Syntax error on VOLUME instruction (#2526) Ryan Stafford 2016-08-30 15:11:42 -04:00
  • 6f89699f1a Make purchase cost default to null snipe 2016-08-30 08:52:33 -07:00
  • 2c18bc24a7 Check if username is userprincipalname snipe 2016-08-30 08:34:17 -07:00
  • f81b21208b Bumped version for v3.4.0-beta v3.4.0-beta snipe 2016-08-30 07:39:55 -07:00
  • ba70e5b053 A little demo-proofing of the maintenances page snipe 2016-08-30 07:34:33 -07:00
  • 5090468357 Fixes #2510 and #2488 - CSS class added to images in views snipe 2016-08-30 07:20:07 -07:00
  • 213cda8cf4 Fixes #2525 snipe 2016-08-30 07:03:22 -07:00
  • 421cbf11fc Patches PR#2500 for dev because @dmeltzer forgot that we commit to the develop branch :P snipe 2016-08-30 06:54:04 -07:00
  • 8816c481af Added HTML for generating passwords in asset user creation modal snipe 2016-08-30 06:48:23 -07:00
  • 3ed0cf2be8 Moved import errors up higher on the screen, fixed some weird formatting bugaboos snipe 2016-08-30 06:48:00 -07:00
  • cd28b012b3 Remove last name requirement in save user request snipe 2016-08-30 06:47:38 -07:00
  • 25902db659 Generate password from modal snipe 2016-08-30 06:47:18 -07:00
  • 35a67ab18a Fixes #2516 - listbox error on new asset snipe 2016-08-29 23:49:23 -07:00
  • 2cfb015b1a Removed extra debugging info snipe 2016-08-29 23:13:30 -07:00
  • e4dcd47d6c Fix UTF-8 issues in imports snipe 2016-08-29 22:57:48 -07:00
  • 64cd4fb1c9 Allow X-Frame-Options to be disabled via env if necessary snipe 2016-08-29 22:57:29 -07:00
  • 276e0a7114 Importer: Implement item update and interface improvments (#2507) Daniel Meltzer 2016-08-29 17:49:32 -05:00
  • 9bf3403f31 Fix #2499 (#2500) Daniel Meltzer 2016-08-26 08:01:58 -05:00