Skip to content

combine note+desc in settings, add dash to title #1055

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
Merged
merged 5 commits into from
May 23, 2023
Merged

combine note+desc in settings, add dash to title #1055

merged 5 commits into from
May 23, 2023

Conversation

adrian-kong
Copy link
Contributor

@adrian-kong adrian-kong requested a review from a team May 22, 2023 20:32
@adrian-kong adrian-kong enabled auto-merge (squash) May 22, 2023 20:38
@silverjam
Copy link
Contributor

qml formatting issue

--- a/resources/SettingsTabComponents/SettingsPane.qml
+++ b/resources/SettingsTabComponents/SettingsPane.qml
@@ -296,7 +296,6 @@ Rectangle {
                         let notes = selectedRowField("notes");
                         if (notes)
                             return desc + "\n\nNotes:\n" + notes;
-
                         return desc;
                     }
                     return selectedRowField(_fieldName);
[cargo-make] ERROR - Error while executing command, exit code:

@swiftnav-travis
Copy link

Frontend and Release Workflow Started here

@adrian-kong
title-dash only when connected (#1056)
cae0e7f 
* title-dash?

* Update console_backend/src/status_bar.rs

Co-authored-by: Jason Mobarak <[email protected]>

* clippy

* clippy

---------

Co-authored-by: Jason Mobarak <[email protected]>
@swiftnav-travis
Copy link

Frontend and Release Workflow Started here

@adrian-kong adrian-kong changed the title combine note, description textedit combine note+desc in settings, add dash to title May 23, 2023
@adrian-kong adrian-kong merged commit 2178d57 into main May 23, 2023
@adrian-kong adrian-kong deleted the adrian/combinenotes branch May 23, 2023 02:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
1 more reviewer

@silverjam silverjam silverjam approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@adrian-kong @silverjam @swiftnav-travis