Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge master into develop for RC 6.0.0-8 #10993

Merged
merged 75 commits into from
May 5, 2022
Merged

Merge master into develop for RC 6.0.0-8 #10993

merged 75 commits into from
May 5, 2022

Conversation

snipe
Copy link
Owner

@snipe snipe commented Apr 28, 2022

This should be a straightforward (we hope) merge down from master to develop to prepare for the golden master.

snipe and others added 30 commits March 4, 2022 03:18
@snipe
Suppress errors for missing signatures
f840652 
Signed-off-by: snipe <[email protected]>
@snipe
Fixed getAssetBySerial
3e2fe10 
Signed-off-by: snipe <[email protected]>
@snipe
Use the max_results env value in the paginator
fcb81b9 
Signed-off-by: snipe <[email protected]>
@snipe
Finer grain for > 200
def570d 
Signed-off-by: snipe <[email protected]>
@snipe
Merge pull request #10797 from snipe/features/use_max_results_in_pagi…
33ee63f 
…nation

Use the max_results env value in the paginator
@snipe
Added QR and alt barcode urls to asset transformer
9269d59 
Signed-off-by: snipe <[email protected]>
@snipe
Added cache comment
e9d297e 
Signed-off-by: snipe <[email protected]>
@snipe
Merge pull request #10798 from snipe/features/add_qr_and_barcode_urls…
e30d814 
…_to_asset_transformer

Added QR and alt barcode urls to asset transformer
@snipe
Check if table exists before trying to create
86a2312 
Signed-off-by: snipe <[email protected]>
@snipe
Merge pull request #10799 from snipe/fixes/check_if_tables_exist_befo…
ed39df3 
…re_trying_to_create

Check if table exists before trying to create in migrations
@inietov
Add a condition to show customfields as the user wants in localizatio…
2410b1a 
…n settings
@snipe
Merge pull request #10804 from inietov/fixes/date_localization_not_wo…
968de7e 
…rking_custom_fields

Fixes #8143 Date localization not work in custom fields
@inietov
Sanitize dates input in the importer before saving
9caf27c
@snipe
Merge pull request #10811 from inietov/fixes/CarbonExceptions_Invalid…
dadc80d 
…FormatException_DateTime

Fixes Carbon\Exceptions\InvalidFormatException: DateTime::__construct(): Failed to parse time string
@snipe
Added session killer artisan command
93d6ce1 
Signed-off-by: snipe <[email protected]>
@snipe
Better phrasing
3e3c277 
Signed-off-by: snipe <[email protected]>
@snipe
Add a force override
1ac293a 
Signed-off-by: snipe <[email protected]>
@snipe
Merge pull request #10814 from snipe/features/add_clear_sessions_arti…
7cbcd2d 
…san_command

Added session killer artisan command
@inietov
Add support for boolean type customfields
7571c0b
@snipe
Merge pull request #10853 from inietov/fixes/customfields_boolean_for…
169973e 
…mat_not_saving_master

Fixes Customfields with boolean format not saving master[sc-9973]
@snipe
Possible fix for boolean field check
8c92198 
Signed-off-by: snipe <[email protected]>
@uberbrady
WIP: fix bootstrap table export options
00ca30a
@uberbrady
Clean up the bootstrap table export options
af9f3d5
@snipe
Merge pull request #10857 from uberbrady/fix_bs_tables_export_options
729b23c 
Fix bs tables export options
@snipe
Removed comment
20e6580 
Signed-off-by: snipe <[email protected]>
@snipe
Backporting #10829 to master
639409f 
Signed-off-by: snipe <[email protected]>
@uberbrady
Don't crash JS when there are no data-export-options (as is true in D…
e50ad8a 
…ashboard)
@snipe
Merge pull request #10873 from uberbrady/fix_dashboard
70059f6 
Don't crash JS when there are no data-export-options (as is true in Dashboard) Fixes #10872
@qveensi
Fix problem with static paths
863ea62
@snipe
Merge pull request #10874 from QveenSi/patch-1
e046db6 
Fix problem with static paths
snipe and others added 17 commits April 12, 2022 21:17
@snipe
Removed security-advisories package for now
161c6b7 
Signed-off-by: snipe <[email protected]>
@snipe
Merge pull request #10936 from snipe/fixes/backport_licenses_loading
7479f5f 
Ports #10494 to master
@snipe
Fixes potential XSS vuln in user requestable results
698c7f4 
Signed-off-by: snipe <[email protected]>
@snipe
Merge pull request #10942 from snipe/fixes/xss_user_requested
f211c11 
Fixes potential XSS vuln in user requestable results
@snipe
Bumped version
e4ef970 
Signed-off-by: snipe <[email protected]>
@snipe
Adds status ID to asset checkout API endpoint
6b13291 
Signed-off-by: snipe <[email protected]>
@snipe
Adds validator to make sure the status ID is deployable
b2087a9 
Signed-off-by: snipe <[email protected]>
@snipe
Merge pull request #10943 from snipe/fixes/add_status_id_to_checkout_api
9a0219e 
Added status_id to asset checkout API
@Godmartinz
fixes double updates from action log and history
9169406
@snipe
Merge pull request #10952 from Godmartinz/fixes_double_updates
ef7f21e 
fixes double updates from action log and history
@snipe
Escape checkout target name
f623d05 
Signed-off-by: snipe <[email protected]>
@snipe
Merge pull request #10971 from snipe/fixes/potential_xss_in_depreciation
0abc108 
Escape checkout target name
@snipe
Add @chrisweirich as a contributor
126bb48
@snipe
Added access gate to the requested assets index
2e9cf8f 
Signed-off-by: snipe <[email protected]>
@snipe
Merge pull request #10991 from snipe/fixes/added_gate_to_requested_as…
173ec44 
…sets

Added access gate to the requested assets index
@snipe
Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8
9aac1cb 
Signed-off-by: snipe <[email protected]>

# Conflicts:
#	README.md
#	app/Console/Commands/MoveUploadsToNewDisk.php
#	app/Http/Controllers/ActionlogController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/StatuslabelsController.php
#	app/Http/Controllers/Assets/AssetCheckinController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/BulkUsersController.php
#	app/Http/Requests/AssetCheckoutRequest.php
#	app/Importer/LicenseImporter.php
#	app/Models/Actionlog.php
#	app/Models/License.php
#	app/Models/User.php
#	app/Observers/AssetObserver.php
#	composer.lock
#	config/version.php
#	database/factories/LicenseFactory.php
#	database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php
#	database/migrations/2018_10_18_191228_add_kits_licenses_table.php
#	database/migrations/2018_10_19_153910_add_kits_table.php
#	database/migrations/2018_10_19_154013_add_kits_models_table.php
#	database/migrations/2019_02_07_185953_add_kits_consumables_table.php
#	database/migrations/2019_02_07_190030_add_kits_accessories_table.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/ar/general.php
#	resources/lang/ar/passwords.php
#	resources/lang/cs/general.php
#	resources/lang/cs/passwords.php
#	resources/lang/de/admin/custom_fields/general.php
#	resources/lang/de/admin/settings/general.php
#	resources/lang/de/admin/settings/message.php
#	resources/lang/fr/admin/custom_fields/general.php
#	resources/lang/fr/admin/hardware/general.php
#	resources/lang/fr/admin/locations/table.php
#	resources/lang/fr/admin/settings/message.php
#	resources/lang/hu/admin/custom_fields/general.php
#	resources/lang/hu/admin/settings/general.php
#	resources/lang/hu/general.php
#	resources/lang/it/admin/settings/general.php
#	resources/lang/nl/admin/custom_fields/general.php
#	resources/lang/nl/admin/settings/general.php
#	resources/lang/nl/general.php
#	resources/lang/pl/admin/custom_fields/general.php
#	resources/lang/sv-SE/passwords.php
#	resources/lang/tr/general.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/reports/activity.blade.php
#	resources/views/users/print.blade.php
@snipe
Bumped version
150724b 
Signed-off-by: snipe <[email protected]>
@snipe snipe requested review from uberbrady and inietov April 28, 2022 16:53
@snipe snipe removed the legal label Apr 28, 2022
uberbrady
uberbrady approved these changes Apr 28, 2022
View reviewed changes
Copy link
Collaborator

@uberbrady uberbrady left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few changes that are minor, but this looks good to me.

app/Console/Commands/MoveUploadsToNewDisk.php Show resolved Hide resolved
resources/lang/en/admin/settings/general.php Outdated Show resolved Hide resolved
@snipe snipe removed the legal label May 3, 2022
@snipe snipe merged commit 953b3a8 into develop May 5, 2022
@snipe snipe deleted the rcs/merge_master_into_develop_for_rc_8 branch May 5, 2022 17:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@uberbrady uberbrady uberbrady approved these changes

@inietov inietov Awaiting requested review from inietov

Assignees
No one assigned
Labels
backend legal
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@snipe @uberbrady @inietov @qveensi @joelpittet @Godmartinz