commit 399c7590cd
Merge: d0c5ba70feb67d1b06
Author: snipe <snipe@snipe.net>
Date: Thu Dec 15 14:19:41 2022 -0800
Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets
Fixed 500 when downloading the Unaccepted Assets report [sc-19555]
commit d0c5ba70f6
Merge: 29c2ff56ed9a21cce0
Author: snipe <snipe@snipe.net>
Date: Thu Dec 15 12:42:29 2022 -0800
Merge pull request #12242 from inietov/features/add_purchase_cost_column
Added `purchase_cost` to user's default view [sc-19680]
commit d9a21cce00
Author: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Thu Dec 15 14:12:05 2022 -0600
Add other items' purchase_cost columns to the same permission
commit 29c2ff56ec
Merge: 3e7975b2c1fe0bfe17
Author: snipe <snipe@snipe.net>
Date: Thu Dec 15 11:26:49 2022 -0800
Merge pull request #12188 from snipe/fixes/decrease_logging_for_saml_when_not_enabled
Removed extra logging case that was very noisy
commit 3e7975b2c3
Merge: 227fef76ed870bc3b0
Author: snipe <snipe@snipe.net>
Date: Thu Dec 15 11:25:53 2022 -0800
Merge pull request #12250 from akemidx/grey_out_pw_reset_button
Fixed: Grey out pw reset button for consistency
commit d870bc3b02
Author: akemidx <kojotek.dx@gmail.com>
Date: Thu Dec 15 14:19:51 2022 -0500
nested if loop
commit 227fef76ee
Merge: 418ddcfac9d44720ff
Author: snipe <snipe@snipe.net>
Date: Thu Dec 15 11:06:53 2022 -0800
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group
Adds a permission group selection for directory sync
commit 9d44720ffd
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Dec 15 11:02:34 2022 -0800
reverted changes to composer.lock
commit 9f3f0a25ed
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Dec 15 10:53:45 2022 -0800
reverted changes to composer.lock
commit 2e228ccb0b
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Dec 15 10:45:42 2022 -0800
redid a few things. should be good now :)
commit 3ee413f379
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Dec 15 09:20:30 2022 -0800
removes livewire stuff
commit b142f8e012
Author: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Wed Dec 14 23:00:35 2022 -0600
Add the permission to show purchase cost column to non-admin sessions
commit 418ddcfac3
Merge: c342668f01a908e361
Author: snipe <snipe@snipe.net>
Date: Wed Dec 14 17:46:53 2022 -0800
Merge pull request #9876 from Toreg87/fixes/locations-deletable
Fixed#9875: Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
commit c342668f0f
Author: snipe <snipe@snipe.net>
Date: Wed Dec 14 17:25:39 2022 -0800
Update @scoo73r as a contributor
commit 2f6a26ec7d
Author: snipe <snipe@snipe.net>
Date: Wed Dec 14 17:25:25 2022 -0800
Add @scoo73r as a contributor
commit f635278010
Merge: d13a237008043b8678
Author: snipe <snipe@snipe.net>
Date: Wed Dec 14 16:42:41 2022 -0800
Merge pull request #12251 from snipe/security/upgrade_font_awesome
Upgraded font awesome to 6.2.1
commit 8043b86786
Author: snipe <snipe@snipe.net>
Date: Wed Dec 14 16:41:56 2022 -0800
Upgraded font awesome to 6.2.1
Signed-off-by: snipe <snipe@snipe.net>
commit d13a237000
Merge: fabefa61bd0d0058e7
Author: snipe <snipe@snipe.net>
Date: Wed Dec 14 12:13:18 2022 -0800
Merge pull request #12205 from Godmartinz/sc19675_add_remote_to_importer
Adds remote field to the user importer
commit b114ffd2c3
Author: akemidx <kojotek.dx@gmail.com>
Date: Wed Dec 14 14:48:59 2022 -0500
Grey out button pw reset button for consistency
When user has no email in their profile, the box is greyed out for
consistency accross all buttons on the user profile
commit fabefa61b0
Merge: 389ec3a3cf3e57d7dc
Author: snipe <snipe@snipe.net>
Date: Tue Dec 13 14:00:48 2022 -0800
Merge pull request #12243 from akemidx/new_grey_out_when_no_assets
Created method in users.php for adding up all assigned to user and pr…
commit f3e57d7dc0
Author: akemidx <kojotek.dx@gmail.com>
Date: Tue Dec 13 16:00:59 2022 -0500
fixing PR
commit 389ec3a3cb
Merge: c432fb9d76a72c344b
Author: snipe <snipe@snipe.net>
Date: Tue Dec 13 12:57:50 2022 -0800
Merge pull request #12247 from Godmartinz/gh12225_serial_added_to_components
adds serial to components tab of assets
commit 6a72c344b7
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Dec 13 12:32:30 2022 -0800
removed the cuddlers
commit 4442b446b9
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Dec 13 10:30:37 2022 -0800
adds serial to components tab of assets
commit c432fb9d70
Merge: 9e8fff6e5fa872b09a
Author: snipe <snipe@snipe.net>
Date: Tue Dec 13 10:28:17 2022 -0800
Merge pull request #12181 from Godmartinz/gh12163_asset_age
Adds asset age to asset index and asset view pages
commit 07ae91b00f
Author: akemi <akemi@ShibaPro.local>
Date: Wed Dec 7 17:46:18 2022 -0500
Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned.
commit 450ad3dcec
Author: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Mon Dec 12 14:17:08 2022 -0600
Added the column purchase_cost to user's default view
commit fa872b09a9
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Dec 12 10:38:31 2022 -0800
fixes a typo, the world is great again
commit eb67d1b064
Author: Ivan Nieto Vivanco <inietov@gmail.com>
Date: Tue Dec 6 18:00:16 2022 -0600
Filter items from the report if null returned
commit d0d0058e79
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Dec 6 11:19:28 2022 -0800
removed unwanted changes
commit bbd04f8876
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Dec 6 11:13:24 2022 -0800
adds the rest of the fields for Remote
commit 36901d271b
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Dec 5 16:28:19 2022 -0800
adds csvmatch for remote. Im a bit lost though lol
commit 3206929ee4
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Nov 29 09:51:42 2022 -0800
adds AgeFormatter, not working yet
commit 1fe0bfe17e
Author: snipe <snipe@snipe.net>
Date: Mon Nov 28 19:27:42 2022 -0800
Removed extra logging case that was very noisy
Signed-off-by: snipe <snipe@snipe.net>
commit 8d861cfd82
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Nov 28 10:59:18 2022 -0800
adds age to the asset table
commit 078e7281cd
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Nov 28 10:45:58 2022 -0800
adds asset age to asset view
commit f2d4a61e3c
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 18 15:31:37 2022 -0700
removes dead space
commit 3f25a1bf61
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 18 15:25:38 2022 -0700
removes dead code
commit f9ac447dd1
Merge: 9b448227fb7bcfaccc
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Oct 18 15:18:09 2022 -0700
adds default group to LDAP
commit 9b448227f7
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue Sep 13 11:40:10 2022 -0700
tinkering to no avail
commit 28bc97f29f
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Sep 12 11:40:16 2022 -0700
one line away from this being over with
commit 193b31e427
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Aug 31 12:58:33 2022 -0700
select options working, testing sync then done
commit 70ac8af9c4
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Aug 31 09:53:20 2022 -0700
.
commit 0c362e8b57
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Aug 29 12:09:56 2022 -0700
gets the groups selector to appear but options are blank
commit fc6fefdb4e
Author: Godfrey M <godmartinz@gmail.com>
Date: Thu Aug 25 15:19:38 2022 -0700
adds migration, variables, checkbox,working on groups
commit 1a908e361e
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date: Thu Jul 29 10:33:34 2021 +0200
Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport
locations->isDeletable() checks via gate::allows if a locations is deletable.
This calls SnipePermissionsPolicy->before() and checks for !Company::isCurrentUserHasAccess($item).
This returns false because locations don't have a company_id.
Check for this and return true if the item don't have a company_id.
Signed-off-by: snipe <snipe@snipe.net>
* - change generatePassword to be more secure (allow duplicate chars)
- move generatePassword from trait to helper
- fix summary output for sync command
* - Don't treat ldap_active_flag as boolean - fixes sync not working at all when ldap field is set
- Sync non activated users (But set activated=0)
* - Read user first before checking against user settings
* Fix failed logins to not throw exceptions
* Fixed missing oauth tables during setup.
* Custom fields of type "CUSTOM REGEX" are always saved as "ANY"
Fixes#5896
* Updated per PR
Fixed spelling
* Fixed logic error
Moved conditional code from view to controller
Added getFromatType function for dropdown
* Cleanup model bulk-edit
Use the general partials where appropriate, as well as display a list of
what models we are editing in the bulk edit.
* Use new api based fetch/display for modal select2.
This is just copy/pasting the code currently because I'm not entirely
sure how the two pieces of code interact.
* Remove old helper functions that are no longer necessary with our populating of select2 dropdowns via ajax.
* The default locale of en does not include dollar sign in default currency. Assume if there is no currency symbol set that the dollar sign is a good thing to look for in parsefloat.
* Fix for 4485. Serial not serial_number
Also fix bug where updating with a csv that does not include custom field columns should not overwrite current values.
* Rename serial_number to serial in default imports to avoid needing to map weirdly.
* Add Test for 4359. Not reproducable at current though
snipe