Commit Graph

  • d3b51715dc adding --force to php artistan snipeit:legacy-recrypt (#4232) Kasey 2017-10-20 17:21:21 -07:00
  • b215924b1a Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-10-20 17:18:13 -07:00
  • 25d3d66880 Add performance-improving indexes (#4278) Brady Wetherington 2017-10-20 17:17:11 -07:00
  • 189574377a Add 'where' clause to hasManyThrough relationship. (#4276) Brady Wetherington 2017-10-20 16:58:39 -07:00
  • 341ddec9d8 Adds built-in mail notification vendor templates snipe 2017-10-20 16:52:12 -07:00
  • abcce78944 use translation for "All" in sidebar menu (#4268) Nicolai Essig 2017-10-20 09:20:33 +02:00
  • 22e13cd4d2 Allow sorting on asset counts, disable delete button if the user has items checked out to them snipe 2017-10-19 17:15:21 -07:00
  • 5c105b52b6 Merge branch 'develop' snipe 2017-10-19 16:45:22 -07:00
  • f757da1a98 Bumped hash snipe 2017-10-19 16:45:04 -07:00
  • c1f8db37d9 Added note about saving before testing LDAP snipe 2017-10-19 16:35:59 -07:00
  • cfc215a013 Merge branch 'develop' snipe 2017-10-19 16:28:26 -07:00
  • 4215a3257b Fixes #1044 - adds suppliers and image to accessories (#4266) snipe 2017-10-19 16:25:24 -07:00
  • 1f247ff541 Don’t let the user checkout an asset to itself snipe 2017-10-19 15:51:55 -07:00
  • 2fc46746e2 Adds translation string placeholders for new LDAP functionality snipe 2017-10-19 12:22:54 -07:00
  • e185dc68af Fixes #4240 - allows admins to use custom password reset URL snipe 2017-10-19 12:22:27 -07:00
  • 54000ff69f Allows sorting by number of assets, etc in category snipe 2017-10-19 11:48:09 -07:00
  • f6a38e848a Allows sorting by whether or not the category requires acceptance snipe 2017-10-19 11:44:42 -07:00
  • 7e8d670f81 Disable delete buttons if there are assets, etc snipe 2017-10-19 11:41:35 -07:00
  • 287b150b7f Show disabled delete button if thing can’t be deleted snipe 2017-10-19 11:29:58 -07:00
  • b379656d55 Adds more consistent visual display of status label types snipe 2017-10-19 11:06:55 -07:00
  • 2e11a983c8 Nicer card display of status type explanations snipe 2017-10-19 10:52:30 -07:00
  • a9753eb646 Include asset count in status labels overview snipe 2017-10-19 10:48:15 -07:00
  • 707c4db881 API: Check there are no assets associated before allowing delete snipe 2017-10-19 10:39:08 -07:00
  • d1de34394e Removed stupid count method snipe 2017-10-19 10:37:30 -07:00
  • e5719441bc Merge branch 'develop' snipe 2017-10-19 08:36:05 -07:00
  • 7153013fb0 Fake sending the test email if the app is in demo mode snipe 2017-10-19 08:33:46 -07:00
  • 55500f77fb Merge branch 'develop' snipe 2017-10-19 08:20:44 -07:00
  • 2b826c3adc Merge branch 'features/mail_test_button' into develop snipe 2017-10-19 08:19:24 -07:00
  • cd193ce8bb Fixes #4036 - adds test email button to general settings snipe 2017-10-19 08:18:56 -07:00
  • cb50142ba3 Update @thakilla as a contributor snipe 2017-10-19 06:16:03 -07:00
  • 81aaed92ce Change default session name snipe 2017-10-19 06:08:58 -07:00
  • 4bc551db82 ref #4042 scale barcode with label size (#4258) Nicolai Essig 2017-10-19 15:08:01 +02:00
  • 471d665408 Add @thakilla as a contributor snipe 2017-10-19 06:07:42 -07:00
  • 068308ef56 Change changepassword menu icon to fixed width (#4262) Robin Temme 2017-10-19 15:04:02 +02:00
  • 1e65c7bf9a load custom css also on login page (#4260) Nicolai Essig 2017-10-19 15:01:42 +02:00
  • ae567c08db Fixes incorrect language reference for consumables on checkout if consumable doesn’t exist snipe 2017-10-19 03:44:01 -07:00
  • 0d25a4868a Merge branch 'develop' snipe 2017-10-19 03:37:52 -07:00
  • 13586be6b0 Fixed load error if license is invalid snipe 2017-10-19 03:37:27 -07:00
  • 44c649c3c8 Fixes #4256 - double encoding on user bulk checkin and delete blade snipe 2017-10-19 03:17:55 -07:00
  • 1a7bfb75fa Merge branch 'develop' snipe 2017-10-19 02:22:39 -07:00
  • 2b803a6a6c Fixes #4257 - use admin url when editing groups snipe 2017-10-19 02:22:05 -07:00
  • 92e4bdc02e Merge branch 'develop' snipe 2017-10-19 02:09:06 -07:00
  • 4d3d19ca2b Fixes older route reference in consumables snipe 2017-10-19 02:07:31 -07:00
  • 9c06912efd Small tweaks to prevent Chrome autofill snipe 2017-10-19 01:59:13 -07:00
  • c5893b4445 Fixes #4249 - display deployed location in listing snipe 2017-10-19 01:30:40 -07:00
  • b90933bb8b Fixes #4139 - fixed route for deleting file snipe 2017-10-19 01:11:24 -07:00
  • fe9a90854d Adds d.m.Y as date format, per #2423 snipe 2017-10-18 10:30:25 -07:00
  • 3b012f2827 Some advanced search query tweaks snipe 2017-10-18 10:07:35 -07:00
  • e31dadc99a Merge branch 'develop' snipe 2017-10-18 09:28:00 -07:00
  • 5519e2d4ae Fixes custom fields sorting on asset listings snipe 2017-10-18 09:27:34 -07:00
  • 6285a8b5b2 Merge branch 'develop' snipe 2017-10-18 08:54:35 -07:00
  • a3139c6fc6 Fix accessories route for invalid accessory ID snipe 2017-10-18 08:53:25 -07:00
  • 389ba9059f Merge branch 'develop' snipe 2017-10-18 08:45:22 -07:00
  • c0e50be03e Duh. Helps if you actually assign the array first. snipe 2017-10-18 08:45:05 -07:00
  • 447833c996 Only try to process model bulk editing if at least one model was selected snipe 2017-10-18 08:15:54 -07:00
  • 809e310565 Recrypt the LDAP password properly snipe 2017-10-18 08:15:23 -07:00
  • 38dd03b5ad Merge branch 'develop' snipe 2017-10-18 07:16:19 -07:00
  • 68f6385eba Fixes 500 in bulk checkout if no asset is selected snipe 2017-10-18 07:15:16 -07:00
  • bd376a4992 Possible fix for #4227 snipe 2017-10-18 07:02:18 -07:00
  • 97f65ceac0 Merge branch 'develop' snipe 2017-10-18 06:25:01 -07:00
  • 9e39abcc32 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-10-18 06:24:41 -07:00
  • 5cd2857d5d Use footer sumformatter for cost totals snipe 2017-10-18 06:24:36 -07:00
  • 585fcfb7d4 Use maintenances report API to populate the maintenances report snipe 2017-10-18 05:47:47 -07:00
  • d9135a8aac Disallow deleting suppliers with associated assets, licenses or maintenances snipe 2017-10-18 05:47:20 -07:00
  • 081a64223a Add @TonisOrmisson as a contributor snipe 2017-10-18 05:45:14 -07:00
  • a4eeff01f0 FIXED upgrade Recrypt not working with changed cipher (#4245) Tõnis Ormisson 2017-10-18 15:43:54 +03:00
  • eedbe468ac Fix licenses not saving supplier id on edit snipe 2017-10-18 05:43:15 -07:00
  • 463d9513e2 Merge branch 'develop' snipe 2017-10-18 04:49:16 -07:00
  • ed4aa7dec2 Account for deleted suppliers in asset maintenances report snipe 2017-10-18 04:48:52 -07:00
  • d6bbe15a76 Added upload state back to log test snipe 2017-10-18 04:04:05 -07:00
  • ea0a0a4a69 Merge branch 'develop' v4.0.13 snipe 2017-10-18 02:35:43 -07:00
  • 34442362ca Fixes bad route for new groups snipe 2017-10-18 02:35:30 -07:00
  • b846bb20c6 Merge branch 'develop' v4.0.12 snipe 2017-10-18 01:23:01 -07:00
  • ab3f5f4f4d Bumped version snipe 2017-10-18 01:21:50 -07:00
  • ea63ced2bd Fixes table alias bug in complex queries for Laravel snipe 2017-10-18 01:21:08 -07:00
  • 6bd49bfb72 Fixes #4191 - user search snipe 2017-10-18 01:20:50 -07:00
  • b80d3ce50d Hopefully fixes #4218 snipe 2017-10-18 00:36:52 -07:00
  • c069829b33 Fixes #906 - groups view snipe 2017-10-17 21:43:57 -07:00
  • 665a113ed8 Update account history query (#4237) Geoff Young 2017-10-17 23:39:49 -04:00
  • aa7091d962 Fixes #4226 - adds log_max_files to app config and sample env snipe 2017-10-17 20:04:07 -07:00
  • ceff6a9617 Merge branch 'develop' snipe 2017-10-17 19:27:31 -07:00
  • c01850fc73 Corrected Italian to Irish in language selector snipe 2017-10-17 19:19:46 -07:00
  • 4c04dc7b84 Merge branch 'develop' v4.0.11 snipe 2017-10-17 18:55:49 -07:00
  • c0103cd878 Bumped version snipe 2017-10-17 18:55:30 -07:00
  • 1f1d9d5461 Merge branch 'develop' snipe 2017-10-17 18:53:21 -07:00
  • c776fa4f7b Updated language strings snipe 2017-10-17 18:52:20 -07:00
  • dc91d10395 More possible fixes for #4210 snipe 2017-10-17 17:35:48 -07:00
  • 4df10ad26c Merge branch 'develop' snipe 2017-10-17 17:19:15 -07:00
  • 668a88bc86 Add autocomplete=off to settings forms for #4210 snipe 2017-10-17 17:18:17 -07:00
  • d6e0012818 Merge branch 'develop' snipe 2017-10-17 17:05:38 -07:00
  • 1d5fb52bfc Fix for LDAP where location ou is not null but blank snipe 2017-10-17 16:59:50 -07:00
  • 8efb02a0ee Merge branch 'develop' snipe 2017-10-17 16:23:59 -07:00
  • dea42db18b Reversed order of withTrashed for deleted asset QR codes snipe 2017-10-17 16:21:50 -07:00
  • 78d5d3947f Merge branch 'develop' snipe 2017-10-17 16:18:14 -07:00
  • a1f5e11517 Fix for broken QR code on deleted assets snipe 2017-10-17 16:01:53 -07:00
  • 99ad096a8a Added a space next to crowdin badge snipe 2017-10-17 15:26:16 -07:00
  • 65b4ffeed9 Higher res crowdin badge snipe 2017-10-17 15:25:34 -07:00
  • 0dac88816a Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-10-17 15:20:53 -07:00
  • f7626404b7 Add @BlueHatbRit as a contributor snipe 2017-10-17 15:18:27 -07:00
  • 78f4b08398 Change zenhub markdown shield to higher res (#4235) Elliot Blackburn 2017-10-17 23:16:49 +01:00