Commit Graph

  • 160fd1c86a Added setting to let admin decide whether footer text should link back to site snipe 2017-10-17 13:54:03 -07:00
  • 6ce01487c5 Merge branch 'develop' snipe 2017-10-17 13:31:43 -07:00
  • b46cbac911 Fixes #4230 - adds model name and manufacturer to emails snipe 2017-10-17 13:30:32 -07:00
  • e9c3d6bfb7 Full text search fixes - addresses laravel bug :( snipe 2017-10-17 12:48:18 -07:00
  • 9e9a5b7a53 Changed checkin/checkout buttons to different colors for easier visibility snipe 2017-10-17 11:32:09 -07:00
  • e7fe91c9d4 Depreciation view snipe 2017-10-17 11:20:05 -07:00
  • 6d130326aa Merge branch 'develop' snipe 2017-10-16 21:28:23 -07:00
  • 02db0f9f9d Handle deleted assets in maintenance snipe 2017-10-16 21:28:05 -07:00
  • e0668b7507 Handle references to suppliers that have been deleted snipe 2017-10-16 21:19:06 -07:00
  • 1376f246dc Merge branch 'develop' snipe 2017-10-16 20:38:19 -07:00
  • 113c55d905 Hopefully fixes #4150 snipe 2017-10-16 20:34:31 -07:00
  • 9cc25bcfd0 Hopefully fixes #4150 snipe 2017-10-16 20:34:22 -07:00
  • 81d3f78263 Production assets snipe 2017-10-16 20:12:42 -07:00
  • 66596b0b09 Production assets snipe 2017-10-16 20:12:22 -07:00
  • 7455b1019a Hacky possible fix for subdir issues snipe 2017-10-16 20:12:11 -07:00
  • 37df934e97 Fixes #4220 - allow nullable for completion date snipe 2017-10-16 18:32:48 -07:00
  • 6517a95d45 Check if there are any custom fields before trying to loop through them snipe 2017-10-16 15:29:19 -07:00
  • 4b84a0c916 Tidying some of the LDAP UDN logic snipe 2017-10-16 15:29:06 -07:00
  • 0f0a61e477 Merge branch 'develop' snipe 2017-10-16 10:10:29 -07:00
  • f64382aa00 Nicer error display in LDAP tests snipe 2017-10-16 10:10:11 -07:00
  • 1743417ec9 Merge branch 'develop' snipe 2017-10-16 09:38:26 -07:00
  • c61bed52c8 Removed danger class snipe 2017-10-16 09:38:09 -07:00
  • edf75865dc Merge branch 'develop' v4.0.10 snipe 2017-10-16 09:27:01 -07:00
  • 176a26e6c3 Bumped version snipe 2017-10-16 09:26:44 -07:00
  • 10a4d7e849 Merge branch 'develop' snipe 2017-10-16 09:09:53 -07:00
  • cbe008d52f Fix assetLoc to assetloc because reasons? snipe 2017-10-16 09:08:08 -07:00
  • aeb5152789 Removed extranneous class for danger text snipe 2017-10-16 09:04:38 -07:00
  • 938490df16 Merge branch 'develop' snipe 2017-10-16 09:01:09 -07:00
  • 45c2af80a3 More LDAP testing US refinements snipe 2017-10-16 09:00:51 -07:00
  • 892c1b04fd Merge branch 'develop' snipe 2017-10-16 07:07:35 -07:00
  • 1fbf3753bc More small LDAP test improvements snipe 2017-10-16 07:07:21 -07:00
  • 5ead5a94e3 Merge branch 'develop' snipe 2017-10-16 06:47:01 -07:00
  • bcf435f625 Try for better error reporting on LDAP fail snipe 2017-10-16 06:46:33 -07:00
  • 8638c46b1d Merge branch 'develop' snipe 2017-10-16 06:40:15 -07:00
  • b107280b7b Slightly nicer UI for LDAP login test snipe 2017-10-16 06:39:36 -07:00
  • 1a60c20117 Merge branch 'develop' snipe 2017-10-16 06:34:23 -07:00
  • f1a6926ad9 LDAP test login snipe 2017-10-16 06:34:04 -07:00
  • c27a7f09bd Merge branch 'develop' snipe 2017-10-16 05:55:27 -07:00
  • ba7b9d8168 Removed stray foo snipe 2017-10-16 05:54:33 -07:00
  • 5b070ee32f Merge branch 'develop' snipe 2017-10-16 05:52:52 -07:00
  • 59a126c47c Small tweaks to LDAP test snipe 2017-10-16 05:52:18 -07:00
  • 322e62418e Merge branch 'develop' snipe 2017-10-16 05:23:26 -07:00
  • a98d94ccdc Pass token to LDAPtest snipe 2017-10-16 05:22:37 -07:00
  • 5addcb517f Merge branch 'develop' snipe 2017-10-16 05:01:37 -07:00
  • 56cbc005ae Fixes expected checkins name in console kernel snipe 2017-10-16 05:01:15 -07:00
  • 22e9246031 Fix more old routes. Should fix #4216 (#4217) Daniel Meltzer 2017-10-16 02:32:40 -04:00
  • c0b39701cc Fixes #4170 - asset maintenance type not showing snipe 2017-10-14 16:17:14 -07:00
  • e2bac62e36 Fix #4205 (#4213) madd15 2017-10-14 17:44:22 +10:30
  • c12a23b84a Merge branch 'develop' snipe 2017-10-11 15:37:01 -07:00
  • fa95f6d836 Another attempt for #4165 snipe 2017-10-11 15:36:47 -07:00
  • 280e8c7ed1 Revert "Another attempt for #4165" snipe 2017-10-11 15:34:30 -07:00
  • 7617fda978 Another attempt for #4165 snipe 2017-10-11 15:33:53 -07:00
  • af69f7636b Merge branch 'develop' snipe 2017-10-11 14:44:37 -07:00
  • 6d4574130f Clearer indication of whether or not the user will be emailed a eula snipe 2017-10-11 14:44:25 -07:00
  • 485b6397d0 Possible (crummy temp) fix for #4165 snipe 2017-10-11 14:42:11 -07:00
  • 93990327de Hopefully fixes #4163 snipe 2017-10-11 14:18:08 -07:00
  • 4ee7765403 Change Save buttons to Checkout and add Cancel (#4202) madd15 2017-10-12 06:59:22 +10:30
  • bdbad067b4 Merge branch 'develop' snipe 2017-10-11 13:10:46 -07:00
  • 13a716310c Bumped hash snipe 2017-10-11 13:10:29 -07:00
  • d0c77c228b Merge branch 'develop' snipe 2017-10-11 13:09:30 -07:00
  • 36cbffa183 Fixes bug where custom fields would not store new name in custom fields table on edit snipe 2017-10-11 13:09:10 -07:00
  • 5edf9e143f Merge branch 'develop' snipe 2017-10-11 12:46:42 -07:00
  • b6a1e0d12f Call migrate before passport install snipe 2017-10-11 12:42:31 -07:00
  • 2fda3a2d26 Merge branch 'develop' snipe 2017-10-11 12:29:48 -07:00
  • f56eb16941 More specific order by clause for drilling down on order number snipe 2017-10-11 12:29:08 -07:00
  • c15c082fb4 Merge branch 'develop' snipe 2017-10-11 01:31:59 -07:00
  • 64e7ab3a12 Fixes #4182 - empty names for assets when checking out to asset snipe 2017-10-11 01:31:37 -07:00
  • afbd6c811b Merge branch 'develop' snipe 2017-10-10 23:38:45 -07:00
  • f64c02ce12 Fix for ambiguous query on models snipe 2017-10-10 23:12:16 -07:00
  • a0d8aa77d3 Merge branch 'develop' snipe 2017-10-10 22:59:50 -07:00
  • bed7b29417 Fixes group search snipe 2017-10-10 22:59:32 -07:00
  • 40ed86bfe0 Sudo isnt available on every distro. (#4194) tiagom62 2017-10-11 01:02:47 -04:00
  • 33497c9811 Merge branch 'develop' snipe 2017-10-10 12:48:05 -07:00
  • 52a8597813 Fixes #4136 snipe 2017-10-10 12:44:28 -07:00
  • eeb07f73e5 Added Redis vairables to example env snipe 2017-10-09 15:44:08 -07:00
  • 57422c9135 Added Redis support. (#4146) Alex Markessinis 2017-10-09 18:39:20 -04:00
  • adca7cb0c5 Fix LDAP location sync issue in #3993 (#4181) Richard Hofman 2017-10-10 09:06:47 +13:00
  • 059f8f5bc9 Remove dead macro code (#4164) Richard Schwab 2017-10-09 22:06:05 +02:00
  • c676e9d794 Fix progress spinner. (#4178) tiagom62 2017-10-09 16:04:48 -04:00
  • e9f10dd74e Maybe Fix #4052. Missed an absolute URL. (#4187) Daniel Meltzer 2017-10-09 16:04:38 -04:00
  • e29d878d4f Remove unused method arguments snipe 2017-10-07 15:09:50 -07:00
  • d4e3ea1412 Derp snipe 2017-10-07 15:07:31 -07:00
  • c5462c5f1f Not sure why this isn’t working… commenting it out for now snipe 2017-10-07 14:52:00 -07:00
  • d1328c3ba9 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-10-07 14:49:54 -07:00
  • 8c406e8e55 Additional auth policies snipe 2017-10-07 14:49:47 -07:00
  • 6e33f36595 Set snipe-logo as default snipe 2017-10-07 14:49:36 -07:00
  • 48277606de Support Debian 8 installs. Shellchecked. More cleanup. (#4174) tiagom62 2017-10-07 15:45:25 -04:00
  • d7c9fcc8df Small manufacturer display tweaks on license view to make text clearer, link phone snipe 2017-10-07 08:27:56 -07:00
  • 508576544b Merge branch 'develop' snipe 2017-10-07 08:17:58 -07:00
  • 9f2fc21649 I guess we don’t need to manually create the license seats snipe 2017-10-07 08:17:38 -07:00
  • 11f99a963a Removed extra comma in demo warning snipe 2017-10-07 08:03:08 -07:00
  • 27ab0271a1 Merge branch 'develop' snipe 2017-10-07 08:00:11 -07:00
  • f858b2858d Add language about the demo resetting daily to en files snipe 2017-10-07 07:59:57 -07:00
  • e2809f7bd0 Merge branch 'develop' snipe 2017-10-07 07:45:58 -07:00
  • f468b37f36 Bumped hash snipe 2017-10-07 07:45:43 -07:00
  • 0b3d3de30f Merge branch 'develop' snipe 2017-10-07 07:44:30 -07:00
  • 907b909223 Fixed language on settings page snipe 2017-10-07 07:44:08 -07:00
  • 9dc79f7165 Demo Settings reset artisan command snipe 2017-10-07 07:43:57 -07:00
  • 324d44dbac Small accessory factory tweaks snipe 2017-10-07 07:24:15 -07:00
  • 7a0e695ea0 Merge branch 'develop' snipe 2017-10-07 07:17:05 -07:00