Skip to content

Conversation

@administratort
Copy link

@administratort administratort commented May 29, 2019

Summary of the Pull Request

References

PR Checklist

  • Closes #xxx
  • CLA signed. If not, go over here and sign the CLA
  • Tests added/passed
  • Requires documentation to be updated
  • I've discussed this with core contributors already. If not checked, I'm ready to accept this work might be rejected in favor of a different grand plan. Issue number where discussion took place: #xxx

Detailed Description of the Pull Request / Additional comments

zadjii-msft added 29 commits May 7, 2019 13:59
  * Load messages from the Resources.resw file
  * Display a message when we fail to parse the settings on an initial parse, or
    on a reload.
    * Unfortunately, the dialog is styled incorrectly when the app theme is
      opposite the system theme. This can result in the button being invisible.
…or-dialog

# Conflicts:
#	src/cascadia/CascadiaPackage/Resources/en-US/Resources.resw
# Conflicts:
#	src/cascadia/TerminalApp/App.cpp
  They're no longer ordered, which I hate, but we'll live with.
  Involves moving serialization out of AppKeyBindings, because all we have is a
  cppwinrt type, and Json::Value is not a cppwinrt type
# Conflicts:
#	src/cascadia/TerminalApp/App.cpp
#	src/cascadia/TerminalApp/App.h
#	src/cascadia/TerminalApp/AppKeyBindings.cpp
#	src/cascadia/TerminalApp/AppKeyBindings.h
#	src/cascadia/TerminalApp/CascadiaSettingsSerialization.cpp
#	src/cascadia/TerminalApp/ColorScheme.cpp
#	src/cascadia/TerminalApp/GlobalAppSettings.cpp
#	src/cascadia/TerminalApp/Profile.cpp
@msftclas
Copy link

CLA assistant check
Thank you for your submission, we really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

❌ administratort sign now
You have signed the CLA already but the status is still pending? Let us recheck it.

@DHowett-MSFT
Copy link
Contributor

Please don’t submit pull requests from our branches and code you did not author.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants