Commit Graph

  • b30369f7ce Added table name for trait snipe 2016-07-26 02:04:31 -07:00
  • 16fe53928c Updated undeleted validation snipe 2016-07-26 01:49:21 -07:00
  • 2e665e128f Putting uniqueUndeleted into a trait for use across models snipe 2016-07-26 01:39:30 -07:00
  • 60560e4994 Remove unused Log statement snipe 2016-07-26 00:50:16 -07:00
  • a44b90dfc9 Custom validator for multiple deleted items with the same unique field snipe 2016-07-26 00:44:26 -07:00
  • 987b969e88 Move bcrypt out of loop for object importer snipe 2016-07-25 22:31:33 -07:00
  • ad531d6d59 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2016-07-25 22:10:38 -07:00
  • 261d2f133b Only bcrypt temp passwords once for performance snipe 2016-07-25 22:10:33 -07:00
  • e0938cf82d Scope to company when viewing assets (#2315) Daniel Meltzer 2016-07-25 21:46:29 -05:00
  • eec22c5aeb Removed port stuff, since LDAP ignores it anyway :-/ snipe 2016-07-22 16:21:16 -07:00
  • b03330aae0 Added TLS option in settings for LDAP snipe 2016-07-22 16:00:37 -07:00
  • 7f5ea72dc7 Bumped version snipe 2016-07-22 15:11:03 -07:00
  • ba25972b49 Add LDAP port number option snipe 2016-07-22 15:09:49 -07:00
  • cc6b2a0081 FIxes #2280 snipe 2016-07-22 07:48:46 -07:00
  • a590cc3dd2 One more fix for MAC address weirdness snipe 2016-07-22 05:56:00 -07:00
  • d4138f4364 Fixes #2299 snipe 2016-07-22 03:10:25 -07:00
  • 128290bd82 Cleanup checkin blade snipe 2016-07-22 02:34:25 -07:00
  • 114540d836 Cleanup checkout form snipe 2016-07-22 02:20:05 -07:00
  • 0b57f74e36 Check for model name (this should never be blank, but…) snipe 2016-07-22 02:14:12 -07:00
  • 03d7d01e12 Fixes #2300 snipe 2016-07-22 02:12:04 -07:00
  • a1640d7fe3 Form cleanup snipe 2016-07-22 02:11:57 -07:00
  • 1f85f4b337 Clearer demo mode text snipe 2016-07-22 02:11:46 -07:00
  • b2d958724b Removed commented code snipe 2016-07-22 02:11:37 -07:00
  • 297820d347 Newer required style snipe 2016-07-22 01:33:55 -07:00
  • 094c5ac8df Fixes #2292 snipe 2016-07-22 01:16:18 -07:00
  • 78fda31379 Helper method to introspect into the model level validation to see if the field is required snipe 2016-07-22 00:29:23 -07:00
  • 3a04686ade Nicer demo mode message snipe 2016-07-22 00:28:22 -07:00
  • ca5d3e3006 Nicer license form display snipe 2016-07-22 00:25:41 -07:00
  • d427dcc8e2 updated version snipe 2016-07-22 00:23:34 -07:00
  • f0c00897ca Required class snipe 2016-07-22 00:21:56 -07:00
  • e256bdc9f7 Clearer version in footer snipe 2016-07-21 21:39:23 -07:00
  • 2e6e0e8911 Fixed versioning path snipe 2016-07-21 21:30:49 -07:00
  • b0dc5b4183 Fixes #2290 snipe 2016-07-21 21:28:17 -07:00
  • 9385c3e9cf Remove last name requirement from Form Request snipe 2016-07-21 19:46:46 -07:00
  • 61108102d7 No longer require last name snipe 2016-07-21 19:44:07 -07:00
  • 8ba9399de7 Merge branch 'master' into develop snipe 2016-07-21 19:42:11 -07:00
  • f6a4d4aaab Better display for some features disabled for demo mode snipe 2016-07-21 19:40:23 -07:00
  • df664bdc9d Fix categories acceptance test as it stands. We need to choose a category type to pass validation, and we need to see the elemnt alert-danger, not the text, to make the test fail when it should. (#2289) Daniel Meltzer 2016-07-21 00:36:43 -04:00
  • c2f6e0cfd8 Don't escape html in default eula. Fixes #2277 (#2279) Daniel Meltzer 2016-07-20 22:39:48 -04:00
  • ba6f26cef9 If a category has items in it, disable changing the category type (#2288) Daniel Meltzer 2016-07-20 22:27:33 -04:00
  • 68b0bbbec9 Fix tests (#2273) Daniel Meltzer 2016-07-19 18:50:21 -04:00
  • 52425f62c5 Set default values for status labels in import snipe 2016-07-19 15:49:04 -07:00
  • 54a0d0de0e Fetch the installer from master instead of v3 branch. (#2266) Daniel Meltzer 2016-07-19 12:41:00 -04:00
  • 099f5d4cfd Update installer script for v3 now that things have moved around. (#2263) Daniel Meltzer 2016-07-19 11:41:56 -04:00
  • 5266bd4415 Bumped version v3.0 snipe 2016-07-19 02:04:08 -07:00
  • ebc74a6530 [Security] Updating Guzzle to address CVE-2016-5385 snipe 2016-07-19 00:36:50 -07:00
  • 13d250f095 Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-07-19 00:13:01 -07:00
  • 68d8e6a3a9 Importer again (#2260) Daniel Meltzer 2016-07-18 18:46:03 -04:00
  • 192b1582f5 Merge branch 'v3' of git@github.com:snipe/snipe-it.git snipe 2016-07-15 16:46:15 -07:00
  • 27b8d326e3 fix for undefined user snipe 2016-07-15 16:38:49 -07:00
  • 7e56934484 Removed leftover user code snipe 2016-07-15 14:58:29 -07:00
  • 698cb161d4 Not sure how this ever worked? snipe 2016-07-15 11:11:48 -07:00
  • 92175eb700 Few more LDAP/AD tweaks snipe 2016-07-14 23:49:32 -07:00
  • 616f922306 Fixes #2254 snipe 2016-07-14 19:50:00 -07:00
  • c1d2be651a Removed default pemissions snipe 2016-07-14 18:32:54 -07:00
  • 8729871353 Fucking rookie mistake. Send redbull. snipe 2016-07-14 16:52:20 -07:00
  • 99a42dfc38 More AD fixes snipe 2016-07-14 16:27:32 -07:00
  • 0cf8ac1d95 Add AD domain to settings snipe 2016-07-14 15:52:52 -07:00
  • 8fd8e747d9 Fix for missing input variable in suppliers ajax method snipe 2016-07-13 22:35:21 -07:00
  • e6b872299d Possible fix for #2246 - needs AD testing snipe 2016-07-13 15:18:29 -07:00
  • a00198abc7 Added spinner for LDAP test snipe 2016-07-13 07:34:54 -07:00
  • 40b56cfad7 Removed unused variables snipe 2016-07-13 07:24:54 -07:00
  • 5cd2c78d5e Link to location view, not edit snipe 2016-07-13 07:16:10 -07:00
  • 2ce1d8b985 Fixed missing use statement snipe 2016-07-13 07:13:49 -07:00
  • f3e99113d2 Bumped version snipe 2016-07-13 05:53:23 -07:00
  • ab6e2a7301 Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-07-13 05:50:45 -07:00
  • e7038cfdc8 LDAP tester snipe 2016-07-13 05:50:40 -07:00
  • 4233c781ac Reworked LDAP login. Fixes #2218 snipe 2016-07-13 05:50:24 -07:00
  • b5d3843b7c New LDAP model snipe 2016-07-13 05:48:16 -07:00
  • 026f099ba3 Fixed indenting snipe 2016-07-13 05:47:32 -07:00
  • ff6c3cfa17 Added LDAP settings check in settings page snipe 2016-07-13 05:47:23 -07:00
  • bf88cd8233 Check for variables to exist and not null rather than assuming it does. Fixes #2247. (#2248) Daniel Meltzer 2016-07-13 00:03:23 -04:00
  • c8351ae01b Reverting back to or die snipe 2016-07-11 18:25:29 -07:00
  • 7a4cbce460 Use trans instead of lang:: snipe 2016-07-10 21:07:59 -07:00
  • 3f835ba847 Updated lang to trans snipe 2016-07-10 21:04:49 -07:00
  • f87fbbdb1d Removed unused use statement snipe 2016-07-10 21:01:11 -07:00
  • caee42e843 More valid composer name snipe 2016-07-10 20:57:12 -07:00
  • 4e38f96f97 Switched or and and to || and && for code quality snipe 2016-07-10 20:55:44 -07:00
  • 814f8ea5fb Added favicon snipe 2016-07-10 18:53:25 -07:00
  • ab3b9dcf5d Add a clone button the the user table. (#2241) Daniel Meltzer 2016-07-10 21:43:10 -04:00
  • f683c78a69 Fix adding an image to an asset when public/uploads/assets does not exist (#2240) Daniel Meltzer 2016-07-10 21:43:00 -04:00
  • 642be61007 Remove old asset importer snipe 2016-07-09 19:35:42 -07:00
  • 8d71e6b268 Fixed indenting snipe 2016-07-09 18:20:57 -07:00
  • 6bdc88cfea Removed extra space snipe 2016-07-09 18:20:14 -07:00
  • 7ff77981f6 Fixed indenting snipe 2016-07-09 18:19:51 -07:00
  • a9f060e768 Removed extraneous comments snipe 2016-07-09 18:19:19 -07:00
  • 6de943b226 Use latest spatie/laravel-backup snipe 2016-07-07 05:04:45 -07:00
  • 262fe62409 Updated composer lock snipe 2016-07-07 04:51:58 -07:00
  • 9f4e0491ed Fixes error in license checkout snipe 2016-07-07 04:13:08 -07:00
  • 7ee135826f Updated composer with more accurate info snipe 2016-07-07 02:07:42 -07:00
  • 5e8d8d6df0 Nicer date display snipe 2016-07-07 02:07:31 -07:00
  • f2ddc7b0ae Added purchase cost and purchase date to listing snipe 2016-07-07 02:07:21 -07:00
  • 01b01c6479 Fixes #2149 snipe 2016-07-07 01:13:31 -07:00
  • 3bb5479efd Move print statement to LOG snipe 2016-07-01 16:24:58 -07:00
  • 85606d830d Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-07-01 01:06:41 -07:00
  • 8fe1b88947 Disable email alerts on backups by default snipe 2016-07-01 01:05:45 -07:00
  • 9144605b57 Updated php codesniffer snipe 2016-07-01 01:05:32 -07:00
  • a7a748385f Longer cookie snipe 2016-07-01 01:05:22 -07:00
  • d4628b5c0f Merge remote-tracking branch 'origin/v3' into v3-master snipe 2016-06-29 04:31:42 -07:00
  • 0c65b6cad1 Nicer bulk delete layout snipe 2016-06-29 04:30:21 -07:00