-
-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fixed incomplete sentence in translation file for audit interval #12306
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: snipe <snipe@snipe.net>
|
snipe
added a commit
that referenced
this pull request
Jan 9, 2023
commit e126315 Merge: 886f2a0 014eab3 Author: snipe <snipe@snipe.net> Date: Mon Jan 9 11:10:19 2023 -0800 Merge pull request #12323 from snipe/translations/updated_strings Updated language strings commit 014eab3 Author: snipe <snipe@snipe.net> Date: Mon Jan 9 11:09:26 2023 -0800 Updated language strings Signed-off-by: snipe <snipe@snipe.net> commit 886f2a0 Merge: 19e7039 e05764a Author: snipe <snipe@snipe.net> Date: Thu Jan 5 18:44:44 2023 -0800 Merge pull request #12317 from snipe/fixes/shorten_url_display_on_view Truncate URL with ellipsis if too long commit e05764a Author: snipe <snipe@snipe.net> Date: Thu Jan 5 18:42:26 2023 -0800 Truncate URL with ellipsis if too long Signed-off-by: snipe <snipe@snipe.net> commit 19e7039 Merge: bd3f730 6e42bce Author: snipe <snipe@snipe.net> Date: Thu Jan 5 18:07:30 2023 -0800 Merge pull request #12316 from snipe/features/chunk_data_in_sync_script Chunk sync script commit 6e42bce Author: snipe <snipe@snipe.net> Date: Thu Jan 5 18:04:06 2023 -0800 Removed $start variable from calback Signed-off-by: snipe <snipe@snipe.net> commit 1a3c947 Author: snipe <snipe@snipe.net> Date: Thu Jan 5 17:57:52 2023 -0800 Chunk sync script Signed-off-by: snipe <snipe@snipe.net> commit bd3f730 Merge: ace73ac 381f89c Author: snipe <snipe@snipe.net> Date: Thu Jan 5 14:11:24 2023 -0800 Merge pull request #12315 from snipe/features/added_default_values_to_model_api Features/added default values to model api commit 381f89c Author: snipe <snipe@snipe.net> Date: Thu Jan 5 13:15:30 2023 -0800 Added format to array Signed-off-by: snipe <snipe@snipe.net> commit db43628 Author: snipe <snipe@snipe.net> Date: Thu Jan 5 13:12:54 2023 -0800 Added default field info to models API response Signed-off-by: snipe <snipe@snipe.net> commit ace73ac Merge: 5898e38 301c4fd Author: snipe <snipe@snipe.net> Date: Thu Jan 5 09:59:35 2023 -0800 Merge pull request #12263 from Godmartinz/gh12211_label_padding_adjustment Fixed: page-break and padding at the end of document for labels commit 301c4fd Author: Godfrey M <godmartinz@gmail.com> Date: Thu Jan 5 09:55:25 2023 -0800 fixes conflicts commit 5898e38 Merge: c575798 9c63f42 Author: snipe <snipe@snipe.net> Date: Wed Jan 4 15:13:36 2023 -0800 Merge pull request #12308 from snipe/fixes/missing_translation_string Fixed missing translation string commit 9c63f42 Author: snipe <snipe@snipe.net> Date: Wed Jan 4 14:09:14 2023 -0800 Added missing translation string Signed-off-by: snipe <snipe@snipe.net> commit c575798 Merge: b36e818 7123e73 Author: snipe <snipe@snipe.net> Date: Wed Jan 4 14:01:03 2023 -0800 Merge pull request #12307 from snipe/fixes/update_less_and_css_loader Updated less-loader and css-loader libraries commit 7123e73 Author: snipe <snipe@snipe.net> Date: Wed Jan 4 14:00:04 2023 -0800 Updated less-loader and css-loader libraries Signed-off-by: snipe <snipe@snipe.net> commit b36e818 Merge: 818db58 b77d580 Author: snipe <snipe@snipe.net> Date: Wed Jan 4 13:57:14 2023 -0800 Merge pull request #12306 from snipe/fixes/weird_sentence_in_translations Fixed incomplete sentence in translation file for audit interval commit b77d580 Author: snipe <snipe@snipe.net> Date: Wed Jan 4 13:56:16 2023 -0800 English is hard, apparently Signed-off-by: snipe <snipe@snipe.net> commit 818db58 Merge: baf14c4 c4f900e Author: snipe <snipe@snipe.net> Date: Wed Jan 4 13:22:03 2023 -0800 Merge pull request #12305 from uberbrady/fix_license_seat_reporting Fixed: Change license_seat changing method to properly 'true up' license seats commit c4f900e Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Jan 4 13:02:53 2023 -0800 Change license_seat changing method to properly 'true up' license seats commit baf14c4 Merge: d187174 fa439a1 Author: snipe <snipe@snipe.net> Date: Tue Jan 3 14:50:25 2023 -0800 Merge pull request #12298 from snipe/fixes/db_seeder_company_id Fixed db seeder when company id is not present commit fa439a1 Author: snipe <snipe@snipe.net> Date: Tue Jan 3 14:45:23 2023 -0800 Check that the array key exists before trying to seed it Signed-off-by: snipe <snipe@snipe.net> commit d187174 Merge: 6d3c5e0 92ae271 Author: snipe <snipe@snipe.net> Date: Thu Dec 22 11:29:12 2022 -0800 Merge pull request #12090 from Godmartinz/deparmtnet_name_validator Added: validation for department names at Company locations commit 6d3c5e0 Merge: 685cc86 e791e65 Author: snipe <snipe@snipe.net> Date: Wed Dec 21 19:04:11 2022 -0800 Merge pull request #12264 from Godmartinz/gh12253_display_notes_accessories Added: notes to the accessories tab for user detail view commit 685cc86 Author: snipe <snipe@snipe.net> Date: Tue Dec 20 17:24:01 2022 -0800 Sets the `ldap_default_group` field to nullable and default null Signed-off-by: snipe <snipe@snipe.net> commit fb10a6f Merge: 128c21a 3a9b8a4 Author: snipe <snipe@snipe.net> 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 <inietov@gmail.com> 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 <snipe@snipe.net> 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 <bwetherington@grokability.com> Date: Tue Dec 20 14:57:58 2022 -0800 There was a bug with select-all where some bits didn't quite work commit e791e65 Author: Godfrey M <godmartinz@gmail.com> Date: Tue Dec 20 10:37:19 2022 -0800 adds notes to the accessories tab under users commit 38575e9 Author: Godfrey M <godmartinz@gmail.com> Date: Tue Dec 20 09:45:41 2022 -0800 fixes the rules for adding page-break and padding at the end of document commit 88291ca Merge: 399c759 94afe2b Author: snipe <snipe@snipe.net> 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 <kojotek.dx@gmail.com> Date: Mon Dec 19 14:48:43 2022 -0500 edits & typo fixes commit 399c759 Merge: d0c5ba7 eb67d1b 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 d0c5ba7 Merge: 29c2ff5 d9a21cc 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 133d6ff Author: akemidx <kojotek.dx@gmail.com> Date: Thu Dec 15 15:18:24 2022 -0500 Commenting on a scope in Models/Company.php commit d9a21cc 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 29c2ff5 Merge: 3e7975b 1fe0bfe 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 3e7975b Merge: 227fef7 d870bc3 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 d870bc3 Author: akemidx <kojotek.dx@gmail.com> Date: Thu Dec 15 14:19:51 2022 -0500 nested if loop commit 227fef7 Merge: 418ddcf 9d44720 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 9d44720 Author: Godfrey M <godmartinz@gmail.com> Date: Thu Dec 15 11:02:34 2022 -0800 reverted changes to composer.lock commit 9f3f0a2 Author: Godfrey M <godmartinz@gmail.com> Date: Thu Dec 15 10:53:45 2022 -0800 reverted changes to composer.lock commit 2e228cc Author: Godfrey M <godmartinz@gmail.com> Date: Thu Dec 15 10:45:42 2022 -0800 redid a few things. should be good now :) commit 3ee413f Author: Godfrey M <godmartinz@gmail.com> Date: Thu Dec 15 09:20:30 2022 -0800 removes livewire stuff commit b142f8e 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 418ddcf Merge: c342668 1a908e3 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 c342668 Author: snipe <snipe@snipe.net> Date: Wed Dec 14 17:25:39 2022 -0800 Update @scoo73r as a contributor commit 2f6a26e Author: snipe <snipe@snipe.net> Date: Wed Dec 14 17:25:25 2022 -0800 Add @scoo73r as a contributor commit f635278 Merge: d13a237 8043b86 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 8043b86 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 d13a237 Merge: fabefa6 d0d0058 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 b114ffd 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 fabefa6 Merge: 389ec3a f3e57d7 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 f3e57d7 Author: akemidx <kojotek.dx@gmail.com> Date: Tue Dec 13 16:00:59 2022 -0500 fixing PR commit 389ec3a Merge: c432fb9 6a72c34 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 6a72c34 Author: Godfrey M <godmartinz@gmail.com> Date: Tue Dec 13 12:32:30 2022 -0800 removed the cuddlers commit 4442b44 Author: Godfrey M <godmartinz@gmail.com> Date: Tue Dec 13 10:30:37 2022 -0800 adds serial to components tab of assets commit c432fb9 Merge: 9e8fff6 fa872b0 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 07ae91b 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 450ad3d 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 fa872b0 Author: Godfrey M <godmartinz@gmail.com> Date: Mon Dec 12 10:38:31 2022 -0800 fixes a typo, the world is great again commit eb67d1b 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 d0d0058 Author: Godfrey M <godmartinz@gmail.com> Date: Tue Dec 6 11:19:28 2022 -0800 removed unwanted changes commit bbd04f8 Author: Godfrey M <godmartinz@gmail.com> Date: Tue Dec 6 11:13:24 2022 -0800 adds the rest of the fields for Remote commit 36901d2 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 3206929 Author: Godfrey M <godmartinz@gmail.com> Date: Tue Nov 29 09:51:42 2022 -0800 adds AgeFormatter, not working yet commit 1fe0bfe 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 8d861cf Author: Godfrey M <godmartinz@gmail.com> Date: Mon Nov 28 10:59:18 2022 -0800 adds age to the asset table commit 078e728 Author: Godfrey M <godmartinz@gmail.com> Date: Mon Nov 28 10:45:58 2022 -0800 adds asset age to asset view commit 92ae271 Author: Godfrey M <godmartinz@gmail.com> Date: Wed Nov 9 13:11:33 2022 -0800 adds validation for department names at Company locations commit f2d4a61 Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 18 15:31:37 2022 -0700 removes dead space commit 3f25a1b Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 18 15:25:38 2022 -0700 removes dead code commit f9ac447 Merge: 9b44822 b7bcfac Author: Godfrey M <godmartinz@gmail.com> Date: Tue Oct 18 15:18:09 2022 -0700 adds default group to LDAP commit 9b44822 Author: Godfrey M <godmartinz@gmail.com> Date: Tue Sep 13 11:40:10 2022 -0700 tinkering to no avail commit 28bc97f Author: Godfrey M <godmartinz@gmail.com> Date: Mon Sep 12 11:40:16 2022 -0700 one line away from this being over with commit 193b31e Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 31 12:58:33 2022 -0700 select options working, testing sync then done commit 70ac8af Author: Godfrey M <godmartinz@gmail.com> Date: Wed Aug 31 09:53:20 2022 -0700 . commit 0c362e8 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 fc6fefd Author: Godfrey M <godmartinz@gmail.com> Date: Thu Aug 25 15:19:38 2022 -0700 adds migration, variables, checkbox,working on groups commit 1a908e3 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Self-explanatory :)