Commit Graph

  • 9ca20e4964 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Brady Wetherington 2020-08-11 17:33:19 -07:00
  • 456a74d88c De-merge out incorrectly merged files. Whoops! Brady Wetherington 2020-08-11 16:41:20 -07:00
  • 799c059070 Add internationalized version of LDAP error message Brady Wetherington 2020-08-11 16:21:18 -07:00
  • c62d43a778 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better Brady Wetherington 2020-08-10 17:04:17 -07:00
  • b725bd0fae Add @PeterUpfold as a contributor Brady Wetherington 2020-08-10 17:23:04 -07:00
  • 09190e05ae Add @PeterUpfold as a contributor snipe 2020-08-10 17:24:20 -07:00
  • e0644dbbf6 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Brady Wetherington 2020-08-10 17:22:31 -07:00
  • 5b6925b00c Removed debugging :( snipe 2020-08-04 21:00:37 -07:00
  • df17a859bf Changed modal IDs so manager creation modal works on user creation main page snipe 2020-08-04 20:59:54 -07:00
  • 24c43056ba Moved pGenerator script to default layout footer snipe 2020-08-04 20:58:28 -07:00
  • 4e0a9c7a94 Fart fix snipe 2020-08-03 12:35:34 -07:00
  • 6a089f86f8 Fixed pathing for accessories snipe 2020-08-03 11:17:56 -07:00
  • 606b7e905d Small edits to PR template snipe 2020-07-31 17:02:33 -07:00
  • d73ddad477 Created a PR template snipe 2020-07-31 16:59:26 -07:00
  • 502b3c50a9 Fixed upload preview (fixed regression from #6736) snipe 2020-07-31 14:36:50 -07:00
  • 9a39cf721e Merge pull request #8258 from ballertv/features/consumable-api snipe 2020-07-31 12:18:49 -07:00
  • 2bb5ac61a9 Add @sanjay900 as a contributor snipe 2020-07-31 11:02:06 -07:00
  • 3e62a6ea2d Merge branch 'develop' of https://github.com/snipe/snipe-it into develop snipe 2020-07-31 11:01:35 -07:00
  • 7410b16835 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Brady Wetherington 2020-07-24 16:22:44 -07:00
  • 8994f3e15e cleanup andres 2020-07-22 19:57:06 -04:00
  • d23f1a77ca implement checkout API andres 2020-07-22 18:46:02 -04:00
  • e955c983a3 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer snipe 2020-07-22 13:43:29 -07:00
  • b09e7d19b3 Add new useraccountcontrol value for valid AD users; document algorithm and values Brady Wetherington 2020-07-22 13:32:16 -07:00
  • 2fa17ac185 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats snipe 2020-07-22 12:06:31 -07:00
  • 3b1e46f72b Update general.php Godfrey Martinez 2020-07-22 11:25:57 -07:00
  • 0c1a1de2a2 Update general.php Godfrey Martinez 2020-07-22 11:24:36 -07:00
  • 20c9ae5818 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats Godfrey M 2020-07-22 10:21:19 -07:00
  • eed41e4549 Moved address down further, fixed broken HTML snipe 2020-07-21 16:57:32 -07:00
  • b750f4754f Added city to bulk user importer snipe 2020-07-21 16:49:54 -07:00
  • c17a06792a Added address, city, state, country to user importer snipe 2020-07-21 16:49:38 -07:00
  • 4f76cc6cfb I don’t actually know what this file is for snipe 2020-07-21 16:46:13 -07:00
  • b905154373 Fixed #8247 - added notes field to user details display snipe 2020-07-20 14:29:32 -07:00
  • daf748e531 Bumped hash v4.9.4 snipe 2020-07-17 12:32:01 -07:00
  • 799a93c46a Allow for email/username search on users snipe 2020-07-17 12:11:32 -07:00
  • 34aa12e229 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create snipe 2020-07-16 17:44:13 -07:00
  • 897757bd04 Removed added line for location snipe 2020-07-16 17:43:44 -07:00
  • c7125c3937 Set location_id to rtd_location_id on asset creation snipe 2020-07-16 16:34:39 -07:00
  • 0238c88a3e Merge pull request #8228 from snipe/fix_select2_ajax_pulldowns_v5 snipe 2020-07-16 15:37:42 -07:00
  • 145dfe5847 Rebuild assets Brady Wetherington 2020-07-16 15:36:10 -07:00
  • 68263ff806 Changed selectlist results to be 'items' for internal consistency Brady Wetherington 2020-07-16 15:33:38 -07:00
  • 81a6332889 Removed license ID from seats table cookie info snipe 2020-07-14 13:55:38 -07:00
  • 6e563f6e4b Merge branch 'master' of https://github.com/snipe/snipe-it snipe 2020-07-13 21:16:54 -07:00
  • 5320f5c67c Disallow non-super users from editing their own permissions snipe 2020-07-13 21:16:45 -07:00
  • 7f69ae953b Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns snipe 2020-07-13 21:16:00 -07:00
  • 17f6fbabfa Switch to 'items' to maintain compatbility with other internal API's Brady Wetherington 2020-07-13 21:12:03 -07:00
  • 318da67230 Fix Select2 'infinite scroll' drop-downs for Snipe-IT v5 Brady Wetherington 2020-07-13 17:43:15 -07:00
  • c79f8c1baf Merge pull request #8207 from EDVLeer/patch-1 snipe 2020-07-13 17:42:16 -07:00
  • e7a820f7c9 Changes how we do AJAX calls via Select2 for dynamic drop-down menus Brady Wetherington 2020-07-13 17:14:31 -07:00
  • 9c9fc2754c Merge pull request #8226 from inietov/fixes/edit_asset_error_php74 snipe 2020-07-13 12:59:28 -07:00
  • 8fd4529fad Change the form input name for serials in the view Ivan Nieto 2020-07-13 13:49:21 -05:00
  • 12c92e30b7 Show whether or not the user was imported via LDAP in the view page snipe 2020-07-10 16:21:27 -07:00
  • 5b02cfade4 Merge pull request #8220 from sean-borg/sean/expected-checkin-dates snipe 2020-07-10 13:07:15 -07:00
  • fd10b755b0 Removed the sr-only tag in table headers snipe 2020-07-10 11:30:01 -07:00
  • 567a9639f4 Enhanced #5762 Able to bulk edit expected checkin date Sean Borg 2020-07-09 21:08:35 +01:00
  • 7a433f8598 Updated purchase date format in hardware/bulkedit Sean Borg 2020-07-09 21:04:35 +01:00
  • 3d8823ede5 Added #5762 Modify expected checkin dates Sean Borg 2020-07-09 20:47:18 +01:00
  • dbbb7680d9 A few more fixes for the cli snipe 2020-07-09 21:12:50 -07:00
  • cf0dd5bbad Small fixes for cli tool snipe 2020-07-09 20:43:13 -07:00
  • 25e53d8c7f Merge pull request #8216 from snipe/features/checkout_license_to_all_users snipe 2020-07-09 20:27:01 -07:00
  • 89d433b41a Removed duplicate seat call snipe 2020-07-09 20:26:02 -07:00
  • e2570ada6f CLI tool to checkout a license to ALL users snipe 2020-07-09 20:04:05 -07:00
  • 45afe725a1 Only try to get the company if there is an auth’d user snipe 2020-07-09 20:03:47 -07:00
  • 536401fe0f Update snipeit.sh EDVLeer 2020-07-07 08:21:36 +02:00
  • ec6ed256fb Bumped minor version snipe 2020-07-06 18:45:43 -07:00
  • 2aaa7bed2d Merge pull request #8183 from snipe/features/merge_users snipe 2020-06-25 18:37:41 -07:00
  • cc9f1577a4 Removed unused use directives snipe 2020-06-25 17:43:53 -07:00
  • ab1fe8be0c Added merge utility snipe 2020-06-25 17:42:39 -07:00
  • 339bdddc38 Fix for Vue js not loading due to CSP :( snipe 2020-06-25 11:00:33 -07:00
  • 35b9cf4b70 Fixed missing db prefix on scopeDueOrOverdueForAudit snipe 2020-06-23 02:41:59 -07:00
  • 7ccb41371e Removed unoptimized images directive snipe 2020-06-23 01:09:39 -07:00
  • 2e60a457bf Dumb fix for feature-policy being dumb. snipe 2020-06-23 01:07:00 -07:00
  • 2390d2160b Merge pull request #8164 from snipe/features/additional_security_headers snipe 2020-06-23 00:27:47 -07:00
  • 00b051b8c7 Added a few more comments snipe 2020-06-23 00:26:09 -07:00
  • 05b3a9ad7e Config variable for HSTS snipe 2020-06-22 23:17:27 -07:00
  • 4fb880384f Changed comment snipe 2020-06-22 22:37:14 -07:00
  • 43042ad841 Consolidated ReferrerPolicy into new SecurityHeaders file snipe 2020-06-22 22:35:59 -07:00
  • a716382ac4 Removed CSP middleware (it’s added in the general header) snipe 2020-06-22 22:33:37 -07:00
  • 36c8f7f4f1 Additional security headers snipe 2020-06-22 22:31:01 -07:00
  • b42801f6ae Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector snipe 2020-06-22 20:47:35 -07:00
  • 946129f206 Made quote style consistent snipe 2020-06-22 20:45:20 -07:00
  • b941ef1e08 Pulled CSS font awesome styles out of the blade and into overrides.css snipe 2020-06-22 20:41:40 -07:00
  • d1aa11ec89 Fix for weird padlock display in asset listing with encrypted custom fields snipe 2020-06-22 20:29:19 -07:00
  • de4934f21d Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text snipe 2020-06-22 17:28:38 -07:00
  • b10076b015 corrected an error where font-size for labels were static in settings. Godfrey M 2020-06-22 17:04:39 -07:00
  • af06e42056 Bumped version v4.9.3 snipe 2020-06-17 11:17:25 -07:00
  • 9a2440dc4b Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid snipe 2020-06-16 20:20:07 -07:00
  • 2ac1c1636c Better handle the logic to determine if we should display the license checkout blade snipe 2020-06-16 16:12:57 -07:00
  • a7eb89f6b6 Misc fixes for flysystem paths snipe 2020-06-16 16:06:25 -07:00
  • 004ecad059 Force suppress deprecation warning on ldap_control_paged_result() Peter Upfold 2020-06-03 08:59:50 +01:00
  • 1267c68f28 Removed barcodes from S3 uploader snipe 2020-05-28 19:56:18 -07:00
  • 262eb79471 WIP - this needs refactoring snipe 2020-05-28 01:59:01 -07:00
  • 7a785b4952 Updated a few flysystem settings snipe 2020-05-28 01:54:29 -07:00
  • beae8efb21 Merge pull request #8088 from Godmartinz/Label_Woes snipe 2020-05-27 23:01:33 -07:00
  • 3c0a6292c4 Clarified env example with flysystem examples snipe 2020-05-27 22:47:53 -07:00
  • 8ccc1c6515 Fixed weird merge in Bulk Users Controller snipe 2020-05-27 22:46:42 -07:00
  • 9839e5e566 adjusted for all label text, removed local variable Godfrey M 2020-05-27 12:27:40 -07:00
  • d54acd908c Made logo file have a better name for multiple tries in the same day snipe 2020-05-27 02:31:04 -07:00
  • 42fe1ea398 Set public files specifically to public snipe 2020-05-27 02:30:43 -07:00
  • bb062b20a1 Switched env to public snipe 2020-05-27 02:30:30 -07:00
  • a93810e301 Updated example config snipe 2020-05-27 00:39:28 -07:00