Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit e321aea Merge: 8ec99ff 37568ae Author: snipe <[email protected]> Date: Mon Aug 31 12:14:44 2020 -0700 Merge branch 'master' into integrations/2020-08-31-v5-rc # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php commit 37568ae Merge: 01a8321 32ad905 Author: snipe <[email protected]> Date: Tue Aug 25 20:49:37 2020 -0700 Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP Fixed #8338 - Added google maps to CSP commit 32ad905 Author: snipe <[email protected]> Date: Tue Aug 25 20:48:53 2020 -0700 Added google maps to CSP commit 01a8321 Merge: bcad49c 3c68834 Author: snipe <[email protected]> Date: Tue Aug 25 20:38:31 2020 -0700 Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist Fixed #8335 - added assignedTo scope on status labels API call for assetlist commit 3c68834 Author: snipe <[email protected]> Date: Tue Aug 25 20:37:30 2020 -0700 Added assignedTo scope commit bcad49c Author: snipe <[email protected]> Date: Fri Aug 14 16:10:22 2020 -0700 Try to better handle slack “too many requests” issue commit b5acca8 Author: snipe <[email protected]> Date: Fri Aug 14 16:02:15 2020 -0700 Check for admin for slack notifications commit e52919c Merge: 714576b 29f3a5c Author: snipe <[email protected]> Date: Fri Aug 14 15:35:15 2020 -0700 Merge pull request #8327 from snipe/features/checkin_license_from_all_users Checkin license from all users cli tool commit 29f3a5c Author: snipe <[email protected]> Date: Fri Aug 14 15:27:40 2020 -0700 Use more verbose annotation for Auth::user if/else commit 134e8e6 Author: snipe <[email protected]> Date: Fri Aug 14 15:25:07 2020 -0700 Moved user email nulling until after the save commit 714576b Merge: b999c50 5128992 Author: Brady Wetherington <[email protected]> Date: Fri Aug 14 15:24:03 2020 -0700 Merge pull request #8328 from snipe/fix_deprecation_report Fix deprecation report for customers with many active assets commit 5128992 Author: Brady Wetherington <[email protected]> Date: Fri Aug 14 15:03:03 2020 -0700 Fix deprecation report for customers with many active assets commit 0291323 Author: snipe <[email protected]> Date: Fri Aug 14 14:57:58 2020 -0700 Use the user as the target commit e0f6f9b Author: snipe <[email protected]> Date: Fri Aug 14 14:43:37 2020 -0700 Artisan command to check in licenses from all users commit f1a6308 Author: snipe <[email protected]> Date: Fri Aug 14 14:43:07 2020 -0700 Check for Auth::user before trying to log id (for cli) commit b999c50 Merge: 9ca20e4 e3906b2 Author: snipe <[email protected]> Date: Wed Aug 12 12:37:47 2020 -0700 Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation Looks great, thank you! commit e3906b2 Author: Godfrey M <[email protected]> Date: Wed Aug 12 12:27:18 2020 -0700 added translation for admin/licenses/message.not_found commit 9ca20e4 Merge: e0644db 456a74d Author: Brady Wetherington <[email protected]> Date: Tue Aug 11 17:33:19 2020 -0700 Merge pull request #8313 from snipe/improve_ldap_search_error_reporting Improve ldap search error reporting commit 456a74d Author: Brady Wetherington <[email protected]> Date: Tue Aug 11 16:41:20 2020 -0700 De-merge out incorrectly merged files. Whoops! commit 799c059 Author: Brady Wetherington <[email protected]> Date: Tue Aug 11 16:21:18 2020 -0700 Add internationalized version of LDAP error message commit c62d43a Author: Brady Wetherington <[email protected]> Date: Mon Aug 10 17:04:17 2020 -0700 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better commit b725bd0 Author: Brady Wetherington <[email protected]> Date: Mon Aug 10 17:23:04 2020 -0700 Add @PeterUpfold as a contributor commit e0644db Merge: 5b6925b 004ecad Author: Brady Wetherington <[email protected]> Date: Mon Aug 10 17:22:31 2020 -0700 Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result() commit 5b6925b Author: snipe <[email protected]> Date: Tue Aug 4 21:00:37 2020 -0700 Removed debugging :( commit df17a85 Author: snipe <[email protected]> Date: Tue Aug 4 20:59:54 2020 -0700 Changed modal IDs so manager creation modal works on user creation main page commit 24c4305 Author: snipe <[email protected]> Date: Tue Aug 4 20:58:28 2020 -0700 Moved pGenerator script to default layout footer This fixes an issue where the password generator wouldn’t load in a modal in Chrome commit 606b7e9 Author: snipe <[email protected]> Date: Fri Jul 31 17:02:33 2020 -0700 Small edits to PR template Slight text changes to ask specifics about versions commit d73ddad Author: snipe <[email protected]> Date: Fri Jul 31 16:59:26 2020 -0700 Created a PR template First draft of the PR guidelines template commit 9a39cf7 Merge: 7410b16 8994f3e Author: snipe <[email protected]> Date: Fri Jul 31 12:18:49 2020 -0700 Merge pull request #8258 from ballertv/features/consumable-api This looks great, thank you! commit 7410b16 Merge: e955c98 b09e7d1 Author: Brady Wetherington <[email protected]> Date: Fri Jul 24 16:22:44 2020 -0700 Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 Add new useraccountcontrol value for valid AD users commit 8994f3e Author: andres <[email protected]> Date: Wed Jul 22 19:57:06 2020 -0400 cleanup commit d23f1a7 Author: andres <[email protected]> Date: Wed Jul 22 18:46:02 2020 -0400 implement checkout API commit e955c98 Merge: 2fa17ac eed41e4 Author: snipe <[email protected]> Date: Wed Jul 22 13:43:29 2020 -0700 Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer Added address, city, state and country to importer and city to bulk editor commit b09e7d1 Author: Brady Wetherington <[email protected]> Date: Wed Jul 22 13:32:16 2020 -0700 Add new useraccountcontrol value for valid AD users; document algorithm and values commit 2fa17ac Merge: b905154 3b1e46f Author: snipe <[email protected]> Date: Wed Jul 22 12:06:31 2020 -0700 Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats Added firstinitial.lastname, lastname_firstinitial, firstnamelastname… commit 3b1e46f Author: Godfrey Martinez <[email protected]> Date: Wed Jul 22 11:25:57 2020 -0700 Update general.php commit 0c1a1de Author: Godfrey Martinez <[email protected]> Date: Wed Jul 22 11:24:36 2020 -0700 Update general.php fixed typo commit 20c9ae5 Author: Godfrey M <[email protected]> Date: Wed Jul 22 10:21:19 2020 -0700 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats commit eed41e4 Author: snipe <[email protected]> Date: Tue Jul 21 16:57:32 2020 -0700 Moved address down further, fixed broken HTML commit b750f47 Author: snipe <[email protected]> Date: Tue Jul 21 16:49:54 2020 -0700 Added city to bulk user importer commit c17a067 Author: snipe <[email protected]> Date: Tue Jul 21 16:49:38 2020 -0700 Added address, city, state, country to user importer commit 4f76cc6 Author: snipe <[email protected]> Date: Tue Jul 21 16:46:13 2020 -0700 I don’t actually know what this file is for commit b905154 Author: snipe <[email protected]> Date: Mon Jul 20 14:29:32 2020 -0700 Fixed #8247 - added notes field to user details display commit daf748e Author: snipe <[email protected]> Date: Fri Jul 17 12:32:01 2020 -0700 Bumped hash commit 799a93c Author: snipe <[email protected]> Date: Fri Jul 17 12:11:32 2020 -0700 Allow for email/username search on users commit 34aa12e Merge: 81a6332 897757b Author: snipe <[email protected]> Date: Thu Jul 16 17:44:13 2020 -0700 Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create Set location_id to rtd_location_id on asset creation commit 897757b Author: snipe <[email protected]> Date: Thu Jul 16 17:43:44 2020 -0700 Removed added line for location commit c7125c3 Author: snipe <[email protected]> Date: Thu Jul 16 16:34:39 2020 -0700 Set location_id to rtd_location_id on asset creation commit 81a6332 Author: snipe <[email protected]> Date: Tue Jul 14 13:55:38 2020 -0700 Removed license ID from seats table cookie info This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses commit 6e563f6 Merge: 5320f5c 7f69ae9 Author: snipe <[email protected]> Date: Mon Jul 13 21:16:54 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit 5320f5c Author: snipe <[email protected]> Date: Mon Jul 13 21:16:45 2020 -0700 Disallow non-super users from editing their own permissions commit 7f69ae9 Merge: c79f8c1 17f6fba Author: snipe <[email protected]> Date: Mon Jul 13 21:16:00 2020 -0700 Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit 17f6fba Author: Brady Wetherington <[email protected]> Date: Mon Jul 13 21:12:03 2020 -0700 Switch to 'items' to maintain compatbility with other internal API's commit c79f8c1 Merge: 12c92e3 536401f Author: snipe <[email protected]> Date: Mon Jul 13 17:42:16 2020 -0700 Merge pull request #8207 from EDVLeer/patch-1 Update snipeit.sh commit e7a820f Author: Brady Wetherington <[email protected]> Date: Mon Jul 13 17:14:31 2020 -0700 Changes how we do AJAX calls via Select2 for dynamic drop-down menus commit 12c92e3 Author: snipe <[email protected]> Date: Fri Jul 10 16:21:27 2020 -0700 Show whether or not the user was imported via LDAP in the view page commit fd10b75 Author: snipe <[email protected]> Date: Fri Jul 10 11:30:01 2020 -0700 Removed the sr-only tag in table headers It was breaking Bootstrap Tables column selector :( commit dbbb768 Author: snipe <[email protected]> Date: Thu Jul 9 21:12:50 2020 -0700 A few more fixes for the cli Do not check out a piece of software if it’s already been checked out to the user commit cf0dd5b Author: snipe <[email protected]> Date: Thu Jul 9 20:43:13 2020 -0700 Small fixes for cli tool commit 25e53d8 Merge: ec6ed25 89d433b Author: snipe <[email protected]> Date: Thu Jul 9 20:27:01 2020 -0700 Merge pull request #8216 from snipe/features/checkout_license_to_all_users Added CLI tool to checkout license to all users commit 89d433b Author: snipe <[email protected]> Date: Thu Jul 9 20:26:02 2020 -0700 Removed duplicate seat call commit e2570ad Author: snipe <[email protected]> Date: Thu Jul 9 20:04:05 2020 -0700 CLI tool to checkout a license to ALL users commit 45afe72 Author: snipe <[email protected]> Date: Thu Jul 9 20:03:47 2020 -0700 Only try to get the company if there is an auth’d user (Needed for command line tools, where no Auth::user() is present) commit 536401f Author: EDVLeer <[email protected]> Date: Tue Jul 7 08:21:36 2020 +0200 Update snipeit.sh Ubuntu 20.04 commit ec6ed25 Author: snipe <[email protected]> Date: Mon Jul 6 18:45:43 2020 -0700 Bumped minor version commit 2aaa7be Merge: 339bddd cc9f157 Author: snipe <[email protected]> Date: Thu Jun 25 18:37:41 2020 -0700 Merge pull request #8183 from snipe/features/merge_users Added merge utility commit cc9f157 Author: snipe <[email protected]> Date: Thu Jun 25 17:43:53 2020 -0700 Removed unused use directives commit ab1fe8b Author: snipe <[email protected]> Date: Thu Jun 25 17:42:39 2020 -0700 Added merge utility commit 339bddd Author: snipe <[email protected]> Date: Thu Jun 25 11:00:33 2020 -0700 Fix for Vue js not loading due to CSP :( commit 35b9cf4 Author: snipe <[email protected]> Date: Tue Jun 23 02:41:59 2020 -0700 Fixed missing db prefix on scopeDueOrOverdueForAudit commit 7ccb413 Author: snipe <[email protected]> Date: Tue Jun 23 01:09:39 2020 -0700 Removed unoptimized images directive securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯ commit 2e60a45 Author: snipe <[email protected]> Date: Tue Jun 23 01:07:00 2020 -0700 Dumb fix for feature-policy being dumb. commit 2390d21 Merge: b42801f 00b051b Author: snipe <[email protected]> Date: Tue Jun 23 00:27:47 2020 -0700 Merge pull request #8164 from snipe/features/additional_security_headers Additional security headers commit 00b051b Author: snipe <[email protected]> Date: Tue Jun 23 00:26:09 2020 -0700 Added a few more comments commit 05b3a9a Author: snipe <[email protected]> Date: Mon Jun 22 23:17:27 2020 -0700 Config variable for HSTS commit 4fb8803 Author: snipe <[email protected]> Date: Mon Jun 22 22:37:14 2020 -0700 Changed comment commit 43042ad Author: snipe <[email protected]> Date: Mon Jun 22 22:35:59 2020 -0700 Consolidated ReferrerPolicy into new SecurityHeaders file commit a716382 Author: snipe <[email protected]> Date: Mon Jun 22 22:33:37 2020 -0700 Removed CSP middleware (it’s added in the general header) commit 36c8f7f Author: snipe <[email protected]> Date: Mon Jun 22 22:31:01 2020 -0700 Additional security headers commit b42801f Merge: de4934f 946129f Author: snipe <[email protected]> Date: Mon Jun 22 20:47:35 2020 -0700 Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector Fixed weird padlock display in asset listing with encrypted custom fields commit 946129f Author: snipe <[email protected]> Date: Mon Jun 22 20:45:20 2020 -0700 Made quote style consistent commit b941ef1 Author: snipe <[email protected]> Date: Mon Jun 22 20:41:40 2020 -0700 Pulled CSS font awesome styles out of the blade and into overrides.css commit d1aa11e Author: snipe <[email protected]> Date: Mon Jun 22 20:29:19 2020 -0700 Fix for weird padlock display in asset listing with encrypted custom fields commit de4934f Merge: af06e42 b10076b Author: snipe <[email protected]> Date: Mon Jun 22 17:28:38 2020 -0700 Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings commit b10076b Author: Godfrey M <[email protected]> Date: Mon Jun 22 17:04:39 2020 -0700 corrected an error where font-size for labels were static in settings. commit af06e42 Author: snipe <[email protected]> Date: Wed Jun 17 11:17:25 2020 -0700 Bumped version commit 9a2440d Merge: beae8ef 2ac1c16 Author: snipe <[email protected]> Date: Tue Jun 16 20:20:07 2020 -0700 Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid Better handle the logic to determine if we should display the license checkout blade [ch13792] commit 2ac1c16 Author: snipe <[email protected]> Date: Tue Jun 16 16:12:57 2020 -0700 Better handle the logic to determine if we should display the license checkout blade commit 004ecad Author: Peter Upfold <[email protected]> Date: Wed Jun 3 08:59:50 2020 +0100 Force suppress deprecation warning on ldap_control_paged_result() commit beae8ef Merge: d14ab7e 9839e5e Author: snipe <[email protected]> Date: Wed May 27 23:01:33 2020 -0700 Merge pull request #8088 from Godmartinz/Label_Woes Barcode resizing and text adjustment commit 9839e5e Author: Godfrey M <[email protected]> Date: Wed May 27 12:27:40 2020 -0700 adjusted for all label text, removed local variable commit d14ab7e Author: snipe <[email protected]> Date: Wed May 27 00:22:44 2020 -0700 Porting change from #8053 to master Signed-off-by: snipe <[email protected]> commit e7f74d9 Author: Godfrey M <[email protected]> Date: Tue May 26 17:22:45 2020 -0700 Label_Woes commit e97cf01 Author: Godfrey M <[email protected]> Date: Tue May 26 17:15:39 2020 -0700 Label_Woes commit ed23505 Author: Godfrey M <[email protected]> Date: Tue May 26 17:10:45 2020 -0700 Label_Woes commit 001e721 Merge: f886837 8210da6 Author: snipe <[email protected]> Date: Wed May 20 10:21:52 2020 -0700 Merge pull request #8063 from dmeltzer/backport-8092 BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635] commit 8210da6 Author: Daniel Meltzer <[email protected]> Date: Wed May 20 10:29:27 2020 -0400 Fix Missing Category selection in Asset Model Modal dialog. A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information. commit f886837 Author: snipe <[email protected]> Date: Thu May 14 00:55:47 2020 -0700 Roll back previous change Signed-off-by: snipe <[email protected]> commit e4385c0 Author: snipe <[email protected]> Date: Thu May 14 00:48:30 2020 -0700 Fixes #8051 regression Signed-off-by: snipe <[email protected]> commit 0550fe0 Author: snipe <[email protected]> Date: Tue May 12 10:31:54 2020 -0700 Fix for session fixation vulnerability Signed-off-by: snipe <[email protected]> commit 7fb3a9b Merge: 9a2ed80 ecb1e87 Author: snipe <[email protected]> Date: Mon May 11 22:41:36 2020 -0700 Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap Added option to disable backup in import commit ecb1e87 Author: snipe <[email protected]> Date: Mon May 11 20:45:15 2020 -0700 Updated assets Signed-off-by: snipe <[email protected]> commit f43df5f Author: snipe <[email protected]> Date: Mon May 11 20:44:46 2020 -0700 Fixed form label Signed-off-by: snipe <[email protected]> commit 95cc48e Author: snipe <[email protected]> Date: Mon May 11 20:41:10 2020 -0700 Added option to disable backup in import Signed-off-by: snipe <[email protected]> commit 9a2ed80 Author: snipe <[email protected]> Date: Mon May 11 20:28:42 2020 -0700 Fixed mismatched HTML header tags Signed-off-by: snipe <[email protected]> commit d20fad2 Author: snipe <[email protected]> Date: Mon May 11 20:28:24 2020 -0700 Use more modern request helper Signed-off-by: snipe <[email protected]> commit ae813dd Author: snipe <[email protected]> Date: Mon May 11 18:11:16 2020 -0700 Add @alek13 as a contributor commit bb42109 Author: snipe <[email protected]> Date: Mon May 11 18:10:45 2020 -0700 Added a clarifying comment Signed-off-by: snipe <[email protected]> commit f46ecf8 Author: snipe <[email protected]> Date: Mon May 11 18:07:20 2020 -0700 Updated composer lock Signed-off-by: snipe <[email protected]> commit b9e821c Author: snipe <[email protected]> Date: Mon May 11 18:07:14 2020 -0700 Small fix for Group Functional Tests Signed-off-by: snipe <[email protected]> commit 9ee28c7 Author: snipe <[email protected]> Date: Mon May 11 18:07:02 2020 -0700 Switched to use info instead of danger on undeployable statuses Signed-off-by: snipe <[email protected]> commit 1a8ba06 Merge: 0fd232e ee4d69b Author: snipe <[email protected]> Date: Mon May 11 17:53:32 2020 -0700 Merge branch 'master' of https://github.com/snipe/snipe-it commit 0fd232e Author: snipe <[email protected]> Date: Mon May 11 17:53:24 2020 -0700 Fixed group functional test (We had changed the minimum to 2 instead of 3) Signed-off-by: snipe <[email protected]> commit ee4d69b Merge: 31c5350 d1ad111 Author: snipe <[email protected]> Date: Mon May 11 17:52:45 2020 -0700 Merge pull request #8041 from alek13/patch-1 use supported package for slack commit d1ad111 Author: Alexander Chibrikin <[email protected]> Date: Mon May 11 20:31:13 2020 +0300 use supported package for slack see maknz/slack#94 commit 31c5350 Author: snipe <[email protected]> Date: Fri May 1 01:05:48 2020 -0700 Fixed incorrect route for groups edit Signed-off-by: snipe <[email protected]> commit 7eb70e1 Merge: 5bb4f27 3dfcb46 Author: snipe <[email protected]> Date: Fri Apr 24 04:50:37 2020 -0700 Merge pull request #7993 from snipe/fixes/7989_column_selector Fixed #7989 - Converted table heading icons in People to CSS glyphs commit 3dfcb46 Author: snipe <[email protected]> Date: Fri Apr 24 04:41:08 2020 -0700 Minor formatting changes Signed-off-by: snipe <[email protected]> commit 96eb96f Author: snipe <[email protected]> Date: Fri Apr 24 04:27:00 2020 -0700 Removed stray val (typo) Signed-off-by: snipe <[email protected]> commit a2f08bd Author: snipe <[email protected]> Date: Fri Apr 24 04:08:54 2020 -0700 Added comments Signed-off-by: snipe <[email protected]> commit e009fbe Author: snipe <[email protected]> Date: Fri Apr 24 04:04:53 2020 -0700 Converted table heading icons in People to CSS glyphs Signed-off-by: snipe <[email protected]> commit 5bb4f27 Author: snipe <[email protected]> Date: Fri Apr 24 00:47:19 2020 -0700 Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets Signed-off-by: snipe <[email protected]>
- Loading branch information