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.

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

Sdk merge basedonbackport #8

Open
wants to merge 186 commits into
base: sdk
Choose a base branch
from

Conversation

Kukks
Copy link

@Kukks Kukks commented Nov 22, 2021

This is a merge from sdk instead of a rebase on it, as the git subrepo does not like when the git branch loses its commit history

kiminuo and others added 30 commits July 22, 2020 22:23
…deterministic-builds

Update DeterministicBuildGuide a bit.
# Conflicts:
#	WalletWasabi.Gui/Tabs/SettingsView.xaml
- Fix the issue when long message pushes other controls out of window

# Conflicts:
#	WalletWasabi.Gui/CrashReport/Views/CrashReportWindow.xaml
- Order from exception then info text changed to Info text then exception
- Height inceased and now it has two more rows
- Title added
- Size increased
- Fix the issue when background image shifts during window resizing
- Transpranet Textbox
# Conflicts:
#	WalletWasabi.Gui/Controls/StatusBar.xaml
# Conflicts:
#	WalletWasabi.Gui/Controls/WalletExplorer/SendTabViewModel.cs
# Conflicts:
#	WalletWasabi.Gui/Tabs/AboutView.xaml
molnard and others added 30 commits June 2, 2021 15:42
[Backport 1.1.12.9] Cherry-picking
Fix GZIP header missing on ClearNet
[BACKPORT] Falling back from fallback
# Conflicts:
#	WalletWasabi.Gui/packages.lock.json
#	WalletWasabi.Packager/packages.lock.json
#	WalletWasabi/Stores/BitcoinStore.cs
#	WalletWasabi/Stores/IndexStore.cs
#	WalletWasabi/WalletWasabi.csproj
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.

10 participants