Commit Graph

  • 0c98390eef Hide bulk actions, checkbox and checkout/in if deleted snipe 2016-06-29 04:19:37 -07:00
  • 345a0da337 Add Unix Socket support to standard .env configurations for DB (#2208) Brady Wetherington 2016-06-28 20:15:03 -07:00
  • 38a7bfecf6 Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-28 14:52:58 -07:00
  • 6d5bc64b2b Another fix for status label types snipe 2016-06-28 14:52:11 -07:00
  • 7c4b2caadf Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-28 12:40:31 -07:00
  • 6633366b29 Small fix for status label types snipe 2016-06-28 12:40:20 -07:00
  • 64dbcf7c92 Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-28 12:19:36 -07:00
  • 483bf1b309 Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-06-28 12:19:19 -07:00
  • 0e96a0aa3e Updated comment snipe 2016-06-28 12:19:14 -07:00
  • e4275bd3d3 Fixes status label inline creation snipe 2016-06-28 12:19:05 -07:00
  • 52c89ca889 Hide Delete action if user is deleted. (#2205) Daniel Meltzer 2016-06-28 14:50:11 -04:00
  • d484636bba Add model number column to the hardware list. (#2204) Daniel Meltzer 2016-06-28 01:32:40 -04:00
  • 084db22cd5 Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-06-27 21:15:18 -07:00
  • 081179a4fd Removed old JS libraries that aren't needed by v3 snipe 2016-06-27 21:15:11 -07:00
  • 82d19fc704 Merge pull request #2201 from dmeltzer/fix-user-creation-values snipe 2016-06-27 21:12:49 -07:00
  • b1c28d7965 Move checks back into methods instead of having an extra helper method. Also remove unnecessary lock_passwords checks because there is a check at the top of the method that does this already. Daniel Meltzer 2016-06-28 00:11:59 -04:00
  • 6ea74f9fc3 Merge pull request #2203 from dmeltzer/display-error-if-import-upload-fails snipe 2016-06-27 20:55:51 -07:00
  • 278be52f7b Show the exception message if APP_DEBUG is enabled. Daniel Meltzer 2016-06-27 23:54:45 -04:00
  • ee1f983114 If the move of the uploaded import file fails, return a message. Fixes an issue reported on gitter today where bad permissions on the upload directory didn't provide any feedback. Daniel Meltzer 2016-06-27 23:37:15 -04:00
  • e3fe80e2a5 Merge pull request #2202 from dmeltzer/sqlite-fix-asset-edit snipe 2016-06-27 20:20:01 -07:00
  • d3b035cfe9 Fix integrity constraint violation on sqlite. If the requestable checkbox was not checked, it did not exist in the request. Setting requestable to null in such a case would cause a violation because it should be 0/1. Daniel Meltzer 2016-06-27 23:16:03 -04:00
  • cf29a4a319 Extract common data from UserController postCreate and postEdit into a helper method. Use this method to store data about user. Fixes #2200 Daniel Meltzer 2016-06-27 22:47:21 -04:00
  • e9bb0e948b Merge pull request #2197 from dmeltzer/another-slack-fix snipe 2016-06-23 19:23:59 -07:00
  • 5bc52a9425 Link to user on asset checkout as well as checkin. Daniel Meltzer 2016-06-23 09:39:50 -04:00
  • 51a8fc1eee Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-22 17:18:16 -07:00
  • 2867cd523d Fixes #2192 snipe 2016-06-22 17:14:49 -07:00
  • 0cf563ae5b Show admin in maintenances snipe 2016-06-22 17:04:47 -07:00
  • 95beddf613 Use helper library for asset list snipe 2016-06-22 16:58:36 -07:00
  • e5a5de6a0d Just use inline validation instead of form request, since it's a one-off snipe 2016-06-22 15:59:00 -07:00
  • 0ca85f8a8a Updates to components snipe 2016-06-22 14:55:17 -07:00
  • 014e7ba9c4 Updated strings snipe 2016-06-22 14:39:19 -07:00
  • 2df3e95efc Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-22 14:19:30 -07:00
  • 65dfd23021 Merge pull request #2191 from dmeltzer/importer-improves snipe 2016-06-22 14:18:30 -07:00
  • 25b916afeb Show the name of the item with errors in the table. Daniel Meltzer 2016-06-22 17:07:55 -04:00
  • 6673a5afe1 Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-22 13:01:06 -07:00
  • fdd17a2088 Fixed weird capitalisation of language strings snipe 2016-06-22 12:58:29 -07:00
  • 424b854e29 Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-22 12:52:00 -07:00
  • f753783ca0 Smaller miminums for model and category name snipe 2016-06-22 12:50:21 -07:00
  • 5daaa24a07 Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-22 12:30:48 -07:00
  • 4ed8ff5576 Formatting fixes for coding standards snipe 2016-06-22 12:27:41 -07:00
  • 70aefdc9c0 Merge pull request #2190 from dmeltzer/fix-asset-creation snipe 2016-06-22 12:23:13 -07:00
  • f6d47887c4 Flash input on model validation errors when creating/editing assets. Daniel Meltzer 2016-06-22 15:20:49 -04:00
  • 8942e085c3 Merge pull request #2189 from dmeltzer/importer-improvements snipe 2016-06-22 12:20:13 -07:00
  • 3470fd57ef Merge pull request #2188 from dmeltzer/paveit-syntax-fix snipe 2016-06-22 12:16:25 -07:00
  • eba6574047 Add a space to the signature to make the --soft option work. Daniel Meltzer 2016-06-22 15:13:43 -04:00
  • 43e64a5f8c Store a list of errors associated with each field instead of overwriting the error if multiple occur. Also Adjust the importer to extract the asset tag earlier in the process so all asset related errors are associated with the asset tag rather than some being tied to the name. Daniel Meltzer 2016-06-22 15:13:01 -04:00
  • 71b82fee03 Merge pull request #2187 from dmeltzer/fix-asset-creation snipe 2016-06-22 11:31:48 -07:00
  • b9f72a2afa Flash errors to session on edit as well. Daniel Meltzer 2016-06-22 12:53:27 -04:00
  • 560115e758 If we survive form request validation but fail model validation, ensure that the errors are actually flashed to the session. Another thing that will be better fixed in the future when handling json nicer. Daniel Meltzer 2016-06-22 10:02:29 -04:00
  • dd1241f964 Fix in case crated_at is blank snipe 2016-06-21 17:19:46 -07:00
  • dcdc1a6e7b Merge pull request #2185 from dmeltzer/slack-fixes snipe 2016-06-21 15:45:22 -07:00
  • 50e38cb740 Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-21 12:22:49 -07:00
  • 508e7acb54 Bump up memory for LDAP import of large number of users snipe 2016-06-21 12:22:10 -07:00
  • e9227f77b6 Fixes #2163 - put model image in view if no asset image snipe 2016-06-21 12:20:22 -07:00
  • 3107b3679d Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-21 11:09:31 -07:00
  • 49bf9f8b5b Switch null to lowercase for code style adherence snipe 2016-06-21 11:06:53 -07:00
  • 133d5e34a9 Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-21 10:07:37 -07:00
  • 9c5965a8c5 Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-21 10:06:29 -07:00
  • afc3cfa16a Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-06-21 10:06:19 -07:00
  • c9bdc7da8e Merge pull request #2176 from dmeltzer/fix-importer-user snipe 2016-06-21 10:04:06 -07:00
  • 37d22d6d21 Merge remote-tracking branch 'origin/v3-master' into v3 snipe 2016-06-21 10:03:45 -07:00
  • b152927dd0 Merge pull request #2164 from rassie/v3-master snipe 2016-06-21 10:03:10 -07:00
  • f004facb06 A few slack fixes Daniel Meltzer 2016-06-21 09:41:05 -04:00
  • d6dd449445 Only show importer progress if on command line. It broke error display from web. Daniel Meltzer 2016-06-19 23:56:10 -04:00
  • 8c00bad6d0 Add a check to ensure custom fields exist before iterating through them Daniel Meltzer 2016-06-19 23:55:17 -04:00
  • 4715cc6447 Pass user id to importer. This shows items imported through web interface as created by the appropriate user. Also save warranty_months to item, not just read it from csv. Fixes #2175 Daniel Meltzer 2016-06-19 23:06:54 -04:00
  • 6165d804f9 Merge pull request #2145 from dmeltzer/disable-select2-on-ios snipe 2016-06-17 17:15:47 -07:00
  • 161c6fe2e6 Merge pull request #2173 from twistedR/fix-password-login snipe 2016-06-17 17:15:05 -07:00
  • 1c51db876c Merge pull request #2172 from ddreier/v3-label-changes snipe 2016-06-17 17:14:28 -07:00
  • f26c24ea35 Merge pull request #2171 from dmeltzer/fix-asset-maintence-validation snipe 2016-06-17 17:14:00 -07:00
  • 48595e3d76 Merge pull request #2135 from YetAnotherCodeMonkey/v3 snipe 2016-06-17 17:12:47 -07:00
  • bb3d88cce5 Use the full app.url for the password link Raveesh 2016-06-17 17:52:14 -04:00
  • 52084a2c24 Add CSS to center the 1D barcode and add PHP to include the custom CSS from Settings. Daniel Dreier 2016-06-17 14:38:50 -05:00
  • 5a45ec708b Use the model validation trait to validate asset maintences. Might be better to add a form request as well, but this at least makes the model validation occur. fixes #2170 Daniel Meltzer 2016-06-16 22:22:07 -04:00
  • 8d03668d78 Fix reverse proxy support Nikolai Prokoschenko 2016-06-16 11:44:38 +02:00
  • 4a148ac069 Codacity badge snipe 2016-06-15 21:23:58 -07:00
  • 973513a078 Remove unecessary log use statement snipe 2016-06-15 21:18:40 -07:00
  • 412756b651 Fix link to view manufacturer in hardware view snipe 2016-06-15 21:14:26 -07:00
  • 416cd96c94 Removed debugging loggin in middleware snipe 2016-06-15 21:08:19 -07:00
  • 87352470c0 Added sortable created_at to assets and users snipe 2016-06-15 21:06:17 -07:00
  • 27427dd26b Additional comments to clarify permissions middleware snipe 2016-06-15 20:57:16 -07:00
  • e2789b2951 Protect users routes snipe 2016-06-15 20:45:57 -07:00
  • 6a277a5391 Added inheritance back into users/groups snipe 2016-06-15 20:45:45 -07:00
  • 464ecc7cc6 Moved group sync snipe 2016-06-15 11:51:10 -07:00
  • 1efa69e51f Fixes #2158 snipe 2016-06-15 11:50:57 -07:00
  • 6253d41231 Merge pull request #2151 from dmeltzer/pull-from-v3-master snipe 2016-06-13 22:55:41 -07:00
  • b4d6842a7c Minor formatting changes, added DB call for custom fields v3.0-beta.3 snipe 2016-06-13 21:45:52 -07:00
  • f3e42384c5 Hardcoded higher PHP execution limits snipe 2016-06-13 21:41:09 -07:00
  • c29984d0df Skip superuser check if the user isn't logged in snipe 2016-06-13 19:05:29 -07:00
  • 77f6fe161e Change install.sh in v3 to pull the v3 script Daniel Meltzer 2016-06-13 21:58:06 -04:00
  • 9b08d99fa4 Fetch the current v3-master zip file, not the alpha2 one. Daniel Meltzer 2016-06-13 21:54:32 -04:00
  • 0fd43c0a5d Updated language strings snipe 2016-06-13 12:16:43 -07:00
  • 3ca81f4d73 Fixes #2140 snipe 2016-06-13 12:07:01 -07:00
  • bfe4bc6ee5 Bypass company scoping if user is an admin snipe 2016-06-13 11:40:22 -07:00
  • dec95c3e06 Updated blade for box panel snipe 2016-06-13 11:39:57 -07:00
  • 2df71be321 No need to update the user again snipe 2016-06-13 11:30:47 -07:00
  • 396446a34b Updated namespace for collection snipe 2016-06-13 10:54:28 -07:00
  • 2daed3c271 Fix for custom fields not saving snipe 2016-06-10 16:36:46 -07:00
  • c1a3592059 Fixes #2130 snipe 2016-06-10 08:29:43 -07:00
  • 57c9d506b8 Fix namespacing for actionlog snipe 2016-06-10 07:57:54 -07:00