forked from z-classic/zclassic-full-node-wallet
-
Notifications
You must be signed in to change notification settings - Fork 0
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
update from ZenCash 0.84.1 #1
Open
nimbosa
wants to merge
313
commits into
ZclassicDev:develop
Choose a base branch
from
HorizenOfficial:master
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
Conflicts resolved: src/build/build.xml src/java/com/vaklinov/zcashui/DashboardPanel.java src/java/com/vaklinov/zcashui/ZCashUI.java src/resources/ubuntu-package/control
Feature/i18n Translation to Italian and German
Wallet operations i18n
Update to zen v3.2.0, version 1.0.7
Release 1.0.7
Release 1.0.8
Update to zen v3.3.0, version 1.0.9
Release 1.0.9
* Update to zend v3.3.1, swing version 1.0.10 * update jdk number * revert jdk bump * update jdk latest version * revert * update determine_latest_jdk function
Merge development in master
Merge development into master
Bumps [sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.21.0 to 3.41.2.2. - [Release notes](https://github.com/xerial/sqlite-jdbc/releases) - [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG) - [Commits](xerial/sqlite-jdbc@3.21.0...3.41.2.2) --- updated-dependencies: - dependency-name: org.xerial:sqlite-jdbc dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: TaiJon <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* test jdk version bump * update ant ver * update zend v4.1.0, swing version 1.0.12
Merge development into master
* Update LICENSE * Update copyright info
chore: update readme to archive the repo (#194)
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.
this is huge and requires manual merge + next commit for branding & renaming