Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
commit 685cc86 Author: snipe <[email protected]> Date: Tue Dec 20 17:24:01 2022 -0800 Sets the `ldap_default_group` field to nullable and default null Signed-off-by: snipe <[email protected]> commit fb10a6f Merge: 128c21a 3a9b8a4 Author: snipe <[email protected]> Date: Tue Dec 20 17:05:18 2022 -0800 Merge pull request #12268 from inietov/fixes/people_count Fixed: Dashboard user count scoping when full company support is enabled commit 3a9b8a4 Author: Ivan Nieto Vivanco <[email protected]> Date: Tue Dec 20 18:39:17 2022 -0600 Calculate the proper amount of people in the dashboard if Full Company Support is enabled commit 128c21a Merge: 88291ca 75a757d Author: snipe <[email protected]> Date: Tue Dec 20 15:09:30 2022 -0800 Merge pull request #12266 from uberbrady/fix-select-all-bug Fixed: There was a bug with BS tables' select-all which showed an incorrect list of elements commit 75a757d Author: Brady Wetherington <[email protected]> Date: Tue Dec 20 14:57:58 2022 -0800 There was a bug with select-all where some bits didn't quite work commit 88291ca Merge: 399c759 94afe2b Author: snipe <[email protected]> Date: Mon Dec 19 12:41:32 2022 -0800 Merge pull request #12254 from akemidx/documentating_something Commenting on a scope in Models/Company.php commit 94afe2b Author: akemidx <[email protected]> Date: Mon Dec 19 14:48:43 2022 -0500 edits & typo fixes commit 399c759 Merge: d0c5ba7 eb67d1b Author: snipe <[email protected]> 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 d0c5ba7 Merge: 29c2ff5 d9a21cc Author: snipe <[email protected]> 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 133d6ff Author: akemidx <[email protected]> Date: Thu Dec 15 15:18:24 2022 -0500 Commenting on a scope in Models/Company.php commit d9a21cc Author: Ivan Nieto Vivanco <[email protected]> Date: Thu Dec 15 14:12:05 2022 -0600 Add other items' purchase_cost columns to the same permission commit 29c2ff5 Merge: 3e7975b 1fe0bfe Author: snipe <[email protected]> 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 3e7975b Merge: 227fef7 d870bc3 Author: snipe <[email protected]> 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 d870bc3 Author: akemidx <[email protected]> Date: Thu Dec 15 14:19:51 2022 -0500 nested if loop commit 227fef7 Merge: 418ddcf 9d44720 Author: snipe <[email protected]> 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 9d44720 Author: Godfrey M <[email protected]> Date: Thu Dec 15 11:02:34 2022 -0800 reverted changes to composer.lock commit 9f3f0a2 Author: Godfrey M <[email protected]> Date: Thu Dec 15 10:53:45 2022 -0800 reverted changes to composer.lock commit 2e228cc Author: Godfrey M <[email protected]> Date: Thu Dec 15 10:45:42 2022 -0800 redid a few things. should be good now :) commit 3ee413f Author: Godfrey M <[email protected]> Date: Thu Dec 15 09:20:30 2022 -0800 removes livewire stuff commit b142f8e Author: Ivan Nieto Vivanco <[email protected]> Date: Wed Dec 14 23:00:35 2022 -0600 Add the permission to show purchase cost column to non-admin sessions commit 418ddcf Merge: c342668 1a908e3 Author: snipe <[email protected]> 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 c342668 Author: snipe <[email protected]> Date: Wed Dec 14 17:25:39 2022 -0800 Update @scoo73r as a contributor commit 2f6a26e Author: snipe <[email protected]> Date: Wed Dec 14 17:25:25 2022 -0800 Add @scoo73r as a contributor commit f635278 Merge: d13a237 8043b86 Author: snipe <[email protected]> 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 8043b86 Author: snipe <[email protected]> Date: Wed Dec 14 16:41:56 2022 -0800 Upgraded font awesome to 6.2.1 Signed-off-by: snipe <[email protected]> commit d13a237 Merge: fabefa6 d0d0058 Author: snipe <[email protected]> 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 b114ffd Author: akemidx <[email protected]> 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 fabefa6 Merge: 389ec3a f3e57d7 Author: snipe <[email protected]> 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 f3e57d7 Author: akemidx <[email protected]> Date: Tue Dec 13 16:00:59 2022 -0500 fixing PR commit 389ec3a Merge: c432fb9 6a72c34 Author: snipe <[email protected]> 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 6a72c34 Author: Godfrey M <[email protected]> Date: Tue Dec 13 12:32:30 2022 -0800 removed the cuddlers commit 4442b44 Author: Godfrey M <[email protected]> Date: Tue Dec 13 10:30:37 2022 -0800 adds serial to components tab of assets commit c432fb9 Merge: 9e8fff6 fa872b0 Author: snipe <[email protected]> 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 07ae91b Author: akemi <[email protected]> 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 450ad3d Author: Ivan Nieto Vivanco <[email protected]> Date: Mon Dec 12 14:17:08 2022 -0600 Added the column purchase_cost to user's default view commit fa872b0 Author: Godfrey M <[email protected]> Date: Mon Dec 12 10:38:31 2022 -0800 fixes a typo, the world is great again commit eb67d1b Author: Ivan Nieto Vivanco <[email protected]> Date: Tue Dec 6 18:00:16 2022 -0600 Filter items from the report if null returned commit d0d0058 Author: Godfrey M <[email protected]> Date: Tue Dec 6 11:19:28 2022 -0800 removed unwanted changes commit bbd04f8 Author: Godfrey M <[email protected]> Date: Tue Dec 6 11:13:24 2022 -0800 adds the rest of the fields for Remote commit 36901d2 Author: Godfrey M <[email protected]> Date: Mon Dec 5 16:28:19 2022 -0800 adds csvmatch for remote. Im a bit lost though lol commit 3206929 Author: Godfrey M <[email protected]> Date: Tue Nov 29 09:51:42 2022 -0800 adds AgeFormatter, not working yet commit 1fe0bfe Author: snipe <[email protected]> Date: Mon Nov 28 19:27:42 2022 -0800 Removed extra logging case that was very noisy Signed-off-by: snipe <[email protected]> commit 8d861cf Author: Godfrey M <[email protected]> Date: Mon Nov 28 10:59:18 2022 -0800 adds age to the asset table commit 078e728 Author: Godfrey M <[email protected]> Date: Mon Nov 28 10:45:58 2022 -0800 adds asset age to asset view commit f2d4a61 Author: Godfrey M <[email protected]> Date: Tue Oct 18 15:31:37 2022 -0700 removes dead space commit 3f25a1b Author: Godfrey M <[email protected]> Date: Tue Oct 18 15:25:38 2022 -0700 removes dead code commit f9ac447 Merge: 9b44822 b7bcfac Author: Godfrey M <[email protected]> Date: Tue Oct 18 15:18:09 2022 -0700 adds default group to LDAP commit 9b44822 Author: Godfrey M <[email protected]> Date: Tue Sep 13 11:40:10 2022 -0700 tinkering to no avail commit 28bc97f Author: Godfrey M <[email protected]> Date: Mon Sep 12 11:40:16 2022 -0700 one line away from this being over with commit 193b31e Author: Godfrey M <[email protected]> Date: Wed Aug 31 12:58:33 2022 -0700 select options working, testing sync then done commit 70ac8af Author: Godfrey M <[email protected]> Date: Wed Aug 31 09:53:20 2022 -0700 . commit 0c362e8 Author: Godfrey M <[email protected]> Date: Mon Aug 29 12:09:56 2022 -0700 gets the groups selector to appear but options are blank commit fc6fefd Author: Godfrey M <[email protected]> Date: Thu Aug 25 15:19:38 2022 -0700 adds migration, variables, checkbox,working on groups commit 1a908e3 Author: Tobias Regnery <[email protected]> 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 <[email protected]>
- Loading branch information