Commit Graph

  • 3c59452e33 Fixed Tooltips and Rounded corners from previous cleanup (#6285) Wes Hulette 2018-10-03 16:17:08 -04:00
  • db385e024b Possible proxy issue fix snipe 2018-10-03 13:04:25 -07:00
  • 84848fabd7 Fixed #6284 - missing checkout information on Status Labels API assets endpoint snipe 2018-10-03 10:30:10 -07:00
  • 4a88e155c4 Fixed: #6263 V5 (develop) - Missing oauth tables when using the setup wizard (#6268) Wes Hulette 2018-10-03 13:06:24 -04:00
  • 66a9421fac Production assets snipe 2018-10-03 01:07:47 -07:00
  • be609f4a8f Merge branch 'jwhulette-V5_cleanup_js' into develop snipe 2018-10-03 00:56:49 -07:00
  • 90b8acdd3b Merge branch 'V5_cleanup_js' of https://github.com/jwhulette/snipe-it into jwhulette-V5_cleanup_js snipe 2018-10-03 00:56:09 -07:00
  • c8ad45b11e Port import manager code to develop snipe 2018-10-03 00:52:29 -07:00
  • 8937edb97e Better validation for manager_id snipe 2018-10-01 22:04:17 -07:00
  • c8bff3ef38 Features/add manager and dept to importer (#6277) snipe 2018-10-02 15:43:54 -07:00
  • 80393d73ae Public function save() missing array. (#6276) Djamon Staal 2018-10-02 13:40:20 +02:00
  • 1742867df1 Removed inline signature.css Wes Hulette 2018-10-01 08:20:31 -04:00
  • ce0a40a20c Merge branch 'develop' into JS_Cleanup Wes Hulette 2018-10-01 08:07:07 -04:00
  • e5e8c068ea Fixed mac address regex snipe 2018-09-29 22:41:17 -07:00
  • 366c1f81cc Added mac address to seeder snipe 2018-09-29 22:21:32 -07:00
  • 4975f9100c Added more seeders for better custom field displays on seeding snipe 2018-09-29 22:17:36 -07:00
  • a481fa2921 Added accessories images for seeder snipe 2018-09-29 22:17:14 -07:00
  • 79367642b1 [WIP] Added #5957 - Flysystem support (#6262) snipe 2018-09-29 21:33:52 -07:00
  • fc8096f8dc Fixed: Missing CSS file in basic.blade.php (#6264) Wes Hulette 2018-09-29 17:15:25 -04:00
  • 22c57c2862 Updated Debugbar to latest version (#6265) Wes Hulette 2018-09-29 17:14:20 -04:00
  • 5cb6744c1b Merge remote-tracking branch 'snipe-origin/develop' into develop Wes Hulette 2018-09-29 11:30:33 -04:00
  • 153a711de4 Fixed css URL error snipe 2018-09-28 23:18:16 -07:00
  • 71f60990db Ignore simlink snipe 2018-09-28 23:18:04 -07:00
  • 32951bbc90 Make CustomFieldset rules public instead of protected snipe 2018-09-28 12:34:52 -07:00
  • aee15e8af4 Fixed select box rendering issue. (#6260) Wes Hulette 2018-09-28 18:18:15 -04:00
  • 3016dcc616 WIP Wes Hulette 2018-09-28 17:30:52 -04:00
  • c090a2f0b6 Fixed script imports in setup.blade.php Wes Hulette 2018-09-28 16:06:40 -04:00
  • 11f128a84f Moved chart.js library into vendor.js Wes Hulette 2018-09-28 16:03:52 -04:00
  • 991a00b38f Updated pGenerator jQuery Plugin to v1.0.5 Wes Hulette 2018-09-28 12:50:11 -04:00
  • e80dfc886e Added admin-lte-options file, moved pGenerator to main js file Wes Hulette 2018-09-28 12:46:22 -04:00
  • b84eb836f4 Cleaned up JS Wes Hulette 2018-09-28 12:02:15 -04:00
  • b09afef46f Merge remote-tracking branch 'snipe-it-upstream/develop' into develop Wes Hulette 2018-09-28 17:17:48 -04:00
  • ecf77e60df Added: #6246 - CSS Cleanup (#6247) Wes Hulette 2018-09-28 17:09:48 -04:00
  • 10bc35d604 Fixed PHP warning Undefined offset: 1 in upgrade.php v4.6.5 snipe 2018-09-28 12:13:35 -07:00
  • eea65a3f26 Fixed manufacturers item count snipe 2018-09-28 12:03:27 -07:00
  • 3b21a19491 Updated language strings snipe 2018-09-28 11:54:52 -07:00
  • 7a52477294 Added Icelandic and Serbian to locale list snipe 2018-09-28 11:47:59 -07:00
  • ef0bd72076 Bumped version snipe 2018-09-28 11:21:39 -07:00
  • a5abb3e6a6 Fixes #6252 - activated flag not checked when editing active user snipe 2018-09-28 11:19:43 -07:00
  • ff824ec4db Fixes #6252 - activated flag not checked when editing active user snipe 2018-09-28 11:18:33 -07:00
  • ea63936947 Merge remote-tracking branch 'snipe-it-upstream/develop' into develop Wes Hulette 2018-09-28 08:29:33 -04:00
  • 68a04c7a23 Fixed #4151 - Undefined index: samaccountname on LDAP import snipe 2018-09-27 16:13:27 -07:00
  • 75032def9e Fixed #4151 - Undefined index: samaccountname on LDAP import snipe 2018-09-27 16:11:09 -07:00
  • b64924440f Merge remote-tracking branch 'snipe-it-upstream/develop' into develop Wes Hulette 2018-09-27 16:39:07 -04:00
  • e5d0f74ba7 Fixed #6248 - add free seats to licenses API endpoint snipe 2018-09-27 12:06:11 -07:00
  • 309f102745 Weird syntax in layout.blade.php. Change the use of 'or' operator to the null coalesce operator (#6240) Ivan Nieto 2018-09-27 00:33:34 -05:00
  • 3a0f738fb0 Added some hepful comments snipe 2018-09-26 19:20:50 -07:00
  • 55846cc717 Changed LOG:: to Log:: snipe 2018-09-26 19:06:31 -07:00
  • 1784278a59 Fixed importer email test snipe 2018-09-26 19:06:09 -07:00
  • afac0bc441 Removed old isActive model (unused) snipe 2018-09-26 19:05:42 -07:00
  • ffbee77f6f Patch for 5965 - multiple email recipients no longer working (#6238) snipe 2018-09-26 15:47:53 -07:00
  • 16e56646b8 Fixed #5965: Allow multiple alert email addresses (#6233) Wes Hulette 2018-09-26 17:07:41 -04:00
  • 82affd5154 Added PHP_CS & PHPMD files (#6234) Wes Hulette 2018-09-26 15:10:11 -04:00
  • 73e88faa00 Using changes proposed by dmeltzer to eliminate has_licenses function in some tests code (#6218) Ivan Nieto 2018-09-25 16:01:21 -05:00
  • bcf9d2f75c Don’t require statuslabel view to check for deployable status snipe 2018-09-25 00:36:43 -07:00
  • f85e3edfc7 fixed checking permissions for users with no permissions set (#6229) nix 2018-09-25 22:24:50 +02:00
  • 115f718cd9 Fix view if model doesnt have a manufacturer snipe 2018-09-24 19:10:24 -07:00
  • 9108ff8caa fixed typo snipe 2018-09-24 19:06:12 -07:00
  • d5cf0f1fbd Prevent deleting manufactureres via API if they have items/models snipe 2018-09-24 19:04:00 -07:00
  • c97db3259f Merge pull request #5913 from tilldeeke/refactore-checkout-checkin-notification-sending Brady Wetherington 2018-09-21 18:18:27 -07:00
  • 4b2093b485 Added counts to location show() API method snipe 2018-09-21 15:51:26 -07:00
  • b69b5fdf84 Added counts to location show() API method snipe 2018-09-21 15:50:14 -07:00
  • 24aaa36532 Applied 3159e7713a to develop snipe 2018-09-19 17:27:34 -07:00
  • d84366c6c5 Add empty array to groups if none filled in snipe 2018-09-19 17:24:29 -07:00
  • 89e06054bf Merge pull request #6205 from dasjoe/patch-1 Brady Wetherington 2018-09-17 21:45:48 -07:00
  • 2604d3c1fd Merge branch 'develop' of https://github.com/snipe/snipe-it into develop Minaev Dmitriy 2018-09-14 19:36:01 +03:00
  • b692f67779 Revision of #5471 (#6148) Ivan Nieto 2018-09-13 00:50:45 -05:00
  • 05b03df600 Fix for issue #6165 (#6168) Juho Taipale 2018-09-13 08:49:50 +03:00
  • 3159e7713a Fixes #5630 Hajo Möller 2018-09-11 13:07:45 +02:00
  • e445e201f3 Adds a migration to create checkout acceptances Till Deeke 2018-09-10 17:37:24 +02:00
  • bbd1d6059a Fixes errors in tests Till Deeke 2018-09-10 17:16:07 +02:00
  • 86f49d34c3 Redirects users from old acceptance screen to new overview Till Deeke 2018-09-10 17:13:16 +02:00
  • 007e8fbdf9 simplified checkout event handling per @uberbrady’s suggestion Till Deeke 2018-09-10 16:40:26 +02:00
  • adf6e7d1cd Added group support for user API snipe 2018-09-07 18:25:58 -07:00
  • ba3662a9ed Bumped hash snipe 2018-09-07 18:12:29 -07:00
  • 05ea61421f Added manager_id to fillable for locations API snipe 2018-09-07 18:11:38 -07:00
  • e45b4efa1a Better info buttons on audit snipe 2018-09-07 18:08:18 -07:00
  • 10d19be66c Added manager ID to validation snipe 2018-09-07 17:27:31 -07:00
  • b903ca05f7 Added manager ID to fillable fields in Location model snipe 2018-09-07 17:27:19 -07:00
  • 1dff71e4df Merge remote-tracking branch 'snipe-it-upstream/develop' into develop Wes Hulette 2018-09-07 13:36:12 -04:00
  • 827295a989 Fixed tooltips snipe 2018-09-07 05:39:56 -07:00
  • ff879e2018 Added the ability to update asset location when auditing - per #5854 snipe 2018-09-07 05:39:41 -07:00
  • e89b33f865 Enable popovers snipe 2018-09-07 05:09:24 -07:00
  • 181e75adb4 Apply hotfix for fixed category model scope snipe 2018-09-07 03:56:17 -07:00
  • 22ef2ce0b6 Bumped hash snipe 2018-09-07 03:20:31 -07:00
  • 51d3d130e4 Fixed Not unique table/alias: 'models' on custom report triggered when category is selected snipe 2018-09-07 03:19:54 -07:00
  • 827a86b2ef Only send inventory report to users if they have things checked out to them snipe 2018-09-07 03:08:32 -07:00
  • 451f4c3320 Bumped watson validating package version, laravel to v5.7.2 snipe 2018-09-07 03:08:08 -07:00
  • 77cdb2f409 Added console command to send inventory reports to users snipe 2018-09-07 02:24:41 -07:00
  • 26fd7f7e79 I have no idea why this was necessary suddenly snipe 2018-09-06 14:28:04 -07:00
  • b80b91514d Fixed Laravel 5.7 compatibility issue re: boot() method snipe 2018-09-05 19:27:37 -07:00
  • 60459d07ce Added email image auto-embed support snipe 2018-09-05 18:57:49 -07:00
  • 84cc90e427 Added alt text to email headers snipe 2018-09-05 18:57:36 -07:00
  • bd40bd5a22 Upgrade to laravel 5.7.0 snipe 2018-09-05 14:58:02 -07:00
  • 0e46b6fd42 Fixed #6152 - typo in upgrade script snipe 2018-09-05 14:57:30 -07:00
  • 161271b53a Merge remote-tracking branch 'snipe-it-upstream/develop' into develop Wes Hulette 2018-09-04 12:04:53 -04:00
  • a865f79d5e Fixed dashboard tables not showing data (#6143) Wes Hulette 2018-08-29 15:29:47 -04:00
  • e9f6cbc97f Merge remote-tracking branch 'snipe-it-upstream/develop' into develop Wes Hulette 2018-08-29 12:45:56 -04:00
  • 59559b1966 Merge remote-tracking branch 'snipe-it-upstream/develop' into develop Wes Hulette 2018-08-28 16:39:07 -04:00
  • a8b5fbde91 Add @inietov as a contributor snipe 2018-08-28 13:31:19 -07:00