mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,601 Commits 4 Branches 148 Tags 4.3 GiB
2b782b095f
Commit Graph

17601 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alejandro García
9c9f627a60
Merge pull request #6751 from alvasw/gradle_java_conventions_remove_duplicate_repo_block 
java-conventions: Remove duplicate repositories block
 2023-07-06 19:31:59 +00:00
Alejandro García
9d52cfe8a2
Merge pull request #6733 from alyokaz/refactor-takebuybtcoffertest 
Refactor TakeBuyBTCOfferTest to replace sleep with loops
 2023-07-06 19:31:22 +00:00
Alejandro García
ff44e18de1
Merge pull request #6732 from alyokaz/fix-failing-takebuybtcoffertest 
Fix failing TakeBuyBTCOfferTest
 2023-07-06 19:30:09 +00:00
Alejandro García
a3da0207ec
Merge pull request #6727 from alyokaz/enable-apitest-debugging-suspend 
Suspend instances in Apitest by CSV list in apitest.properties
 2023-07-06 19:29:39 +00:00
Alejandro García
ee9109d14d
Merge pull request #6725 from alyokaz/remove-hardcoded-debug-option 
Remove hardcoding of enableBisqDebugging in ApiTest
 2023-07-06 19:28:58 +00:00
Alejandro García
18e789a8ad
Merge pull request #6724 from alyokaz/fix-bisq-properties-pickup 
Fix bisq.properties pickup in ApiTest
 2023-07-06 19:27:58 +00:00
Alejandro García
dc81a88a57
Merge pull request #6718 from alvasw/create_standalone_code_coverage_aggregation_module 
Create standalone code coverage aggregation module
 2023-07-06 19:25:29 +00:00
Alejandro García
638446dfa9
Merge pull request #6717 from alvasw/apply_jacoco_plugin_to_all_modules 
Add JaCoCo Gradle Plugin to all modules
 2023-07-06 19:24:50 +00:00
Alva Swanson
f6dff320d5
proto: Remove redundant 'sourceSets.main.java.srcDirs += ' 2023-07-06 18:27:36 +02:00
Alva Swanson
56e1969444
proto: Add idea plugin 
The protobuf-gradle-plugin automatically registers proto files and
generated Java code as sources to the idea plugin.
 2023-07-06 18:26:31 +02:00
Alva Swanson
2bbed1f60f
proto: Apply proto tasks only to main source set 2023-07-06 18:24:51 +02:00
Alva Swanson
e5e1ec092d
Declare grpc compiler version in proto module 2023-07-06 18:23:12 +02:00
Alva Swanson
d9056fa2be
Declare protoc version in proto module 2023-07-06 18:21:35 +02:00
Alva Swanson
78a742695c
Declare global protobuf-java in Java Platform Plugin 
The constraints in the platform module apply to all libraries (including
to transitively included libraries).
 2023-07-06 18:18:59 +02:00
Alva Swanson
0b0dbe8af2
java-conventions: Remove duplicate repositories block 2023-07-06 18:17:03 +02:00
Alva Swanson
feca0fb6be
GitHub Actions: Create aggregated JaCoCo coverage report 
Co-authored-by: napoly <napolytan@protonmail.com>
 2023-07-06 18:00:32 +02:00
Alva Swanson
6c81985d41
Create standalone code coverage aggregation module 
Co-authored-by: napoly <napolytan@protonmail.com>
 2023-07-06 18:00:32 +02:00
Alva Swanson
1045511049
Create standalone code coverage aggregation module 
Co-authored-by: napoly <napolytan@protonmail.com>
 2023-07-06 17:52:54 +02:00
Alva Swanson
d50df8f49f
Add JaCoCo Gradle Plugin to all modules 
Co-authored-by: napoly <napolytan@protonmail.com>
 2023-07-06 17:51:05 +02:00
AllyKaz
03b205a597
Refactor TakeBuyBTCOfferTest to replace sleep with loops 
Replace the use of Thread.sleep in the tests with loops
 2023-07-04 21:29:33 +01:00
AllyKaz
d2f9172a50
Fix failing TakeBuyBTCOfferTest 
Fix failing test by setting amount and minAmount to the maxTradeLimit for
fiat accounts (0.1 BTC)
 2023-07-04 21:11:53 +01:00
AllyKaz
b5b68b52ce
Suspend instances in Apitest by CSV list in apitest.properties 
Enable instances to be suspended in debugging mode by the inclusion of the
instance name in a CSV list in apitest.properties
 2023-07-04 21:00:48 +01:00
AllyKaz
6026e6fb78
xRemove hardcoding of enableBisqDebugging in ApiTest 
Remove hardcoding of value to prevent it  being set as a command line option
that then overides the option being set from apitest.properties file
preventing it from being altered without altering code. Redundant as false is
the default.
 2023-07-04 19:11:11 +01:00
Alejandro García
4cf54cd5e0
Merge pull request #6749 from jmacxx/fix_issue_6743 
Show more available UTXOs in Send Funds screen.
 2023-07-04 18:03:52 +00:00
Alejandro García
561f0b4b8d
Merge pull request #6748 from bisq-network/dependabot/github_actions/gradle/gradle-build-action-2.5.1 
Bump gradle/gradle-build-action from 2.4.2 to 2.5.1
 2023-07-04 18:03:07 +00:00
AllyKaz
1a931b815f
Stop deletion of original bisq.properties during test harness setup 
Stop the deletion of the original bisq.properties file after it's copied into the
instances data directories.
 2023-07-04 18:40:05 +01:00
AllyKaz
a2ef728ee0
Refactor dao-setup.gradle 
Remove redundant directory moving and renaming. Make buildResourcesDir
property less brittle.
 2023-07-04 18:12:24 +01:00
AllyKaz
0fb9e36eff
Fix bisq.properties pickup in ApiTest 
Copy 'bisq.properties' file in apitest/src/main/resources
to each instance's DataDir on startup to allow pickup by
the instance.
 2023-07-04 18:11:43 +01:00
jmacxx
089d4e9237
Show more available UTXOs in Send Funds screen. 2023-07-03 13:44:07 -05:00
dependabot[bot]
2b9c56b1d5
Bump gradle/gradle-build-action from 2.4.2 to 2.5.1 
Bumps [gradle/gradle-build-action](https://github.com/gradle/gradle-build-action) from 2.4.2 to 2.5.1.
- [Release notes](https://github.com/gradle/gradle-build-action/releases)
- [Commits](https://github.com/gradle/gradle-build-action/compare/v2.4.2...v2.5.1)

---
updated-dependencies:
- dependency-name: gradle/gradle-build-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-03 14:01:34 +00:00
Alejandro García
67182ca41f
Merge pull request #6738 from HenrikJannsen/add_bm_accounting_preferences 
Add reset buttons for BM accounting
 2023-07-01 21:52:41 +00:00
Alejandro García
323399647c
Merge pull request #6679 from napoly/fix_hide_edit_button_bsq_offer 
Remove edit button for BSQ offers
 2023-07-01 21:51:08 +00:00
HenrikJannsen
1ebc92e5b8
Add reset buttons for BM accounting 2023-07-01 14:25:43 +02:00
Alejandro García
d95dc58a06
Bump version number for v1.9.12 2023-06-30 23:55:18 +02:00
Alejandro García
3d573a9983
Merge pull request #6745 from alejandrogarcia83/update-burningman-acounting-store 
Use new burningman accounting file from full accounting node
 2023-06-30 21:44:29 +00:00
Alejandro García
0c3e5a8c5e
Use new burningman accounting file from full accounting node 
PR #6740 was a diff against master (instead against the release/v1.9.11
branch). The previous merge into the release branch corrupted the
acounting file.
 2023-06-30 22:43:25 +02:00
jmacxx
da9caf56a2
Seednode accounting set by command line, overrides UserPreferences. 2023-06-30 20:02:53 +02:00
Alejandro García
1cc2b35c89
Merge pull request #6744 from jmacxx/fix_seednode_accounting_pref 
Seednode accounting option is by command line, overrides UserPreferences.
 2023-06-30 18:00:50 +00:00
Alejandro García
6b0f32f8e7
Merge pull request #6742 from jmacxx/csv_export_proof_of_burn 
Add CSV export for Proof of Burn table.
 2023-06-30 18:00:12 +00:00
Alejandro García
60e48d92a2
Merge pull request #6741 from jmacxx/add_bsq_burned_to_report 
Add BSQ burned column in monthly burningman status report.
 2023-06-30 17:59:35 +00:00
jmacxx
a9bc45c173
Seednode accounting set by command line, overrides UserPreferences. 2023-06-30 10:10:23 -05:00
Alejandro García
23bea7a711
Merge branch 'master' into release/v1.9.11 2023-06-28 20:03:54 +03:00
Alejandro García
8c70dd650c
Merge pull request #6740 from HenrikJannsen/rename_bm_accounting_store 
Use new burningman accounting file recreated from scratch.
 2023-06-28 16:50:27 +00:00
jmacxx
aa79b01fd3
Add CSV export for Proof of Burn table. 2023-06-26 18:20:13 -05:00
jmacxx
8024b72860
Add burned BSQ column in monthly burningman status report. 2023-06-26 13:31:55 -05:00
HenrikJannsen
e54ed375db
Update resource file with latest run from scratch 
Signed-off-by: HenrikJannsen <boilingfrog@gmx.com>
 2023-06-24 12:12:09 +02:00
HenrikJannsen
16bbef972f
Use new burningman accounting file recreated from scratch. 
Remove old file.

The current accounting data are missing about 10% of transactions due to threading issues at processing the transactions in earlier versions.
 2023-06-23 22:20:19 +02:00
Alejandro García
edfa035aa6
Merge pull request #6737 from Emzy/remove-seed 
Remove one seednode from Wiz.
 2023-06-22 19:37:31 +00:00
Alejandro García
4d7c577b06
Merge pull request #6736 from alejandrogarcia83/update-data-stores-for-v1.9.11 
Update data stores for v1.9.11
 2023-06-22 19:36:24 +00:00
Stephan Oeste
63cc8e11dc
Remove one seednode from Wiz. 2023-06-22 18:42:13 +02:00