Commit graph

6763 commits

Author SHA1 Message Date
Chris Beams
35559350d3
Merge pull request #1865 from cbeams/fix-codeowners
Fix syntax error in CODEOWNERS
2018-11-05 08:20:49 +01:00
Chris Beams
ce5bf55bdd
Fix syntax error in CODEOWNERS
Owners are space-separated, not comma-separated. It is presumed that
this syntax error is why reviews have not been being suggested for
assignment as expected.
2018-11-05 08:05:10 +01:00
Manfred Karrer
067b773d15
Merge pull request #1860 from cbeams/codeowners
Add CODEOWNERS file
2018-11-03 09:59:19 -05:00
Chris Beams
6cc0e455e2
Make @cbeams /pricenode code owner 2018-11-03 11:24:16 +01:00
Chris Beams
41a51670a0
Make @cbeams Gradle build code owner 2018-11-03 11:24:16 +01:00
Chris Beams
813d2ae1a6
Make @ripcurlx, @ManfredKarrer /desktop code owners 2018-11-03 11:24:16 +01:00
Chris Beams
26eada4310
Make @blabno /assets code owner 2018-11-03 11:24:16 +01:00
Chris Beams
7c42e52651
Make @ManfredKarrer default code owner 2018-11-03 11:15:41 +01:00
Chris Beams
90945a3ae4
Add CODEOWNERS
Per docs at https://help.github.com/articles/about-codeowners/
2018-11-03 11:00:44 +01:00
Manfred Karrer
ae85969fe1
Fix wrong linebreaks 2018-11-01 12:49:35 -05:00
Manfred Karrer
b55ba273a1
Merge pull request #1829 from arunasurya/2018-10-04-fix-grammar
Improve grammar of Background Info
2018-11-01 12:03:07 -05:00
Manfred Karrer
48fa15ee89
Merge pull request #1852 from ManfredKarrer/add-dev-setup-guide
Add dev setup guide
2018-11-01 11:57:37 -05:00
Manfred Karrer
93b9dab8c1
Improve text 2018-11-01 11:56:45 -05:00
Manfred Karrer
cda97b7a5b
Fix typos, move files, remove file 2018-11-01 11:52:39 -05:00
Chris Beams
7f1da8a344
Fix typo in 'Running Bisq' section of README 2018-11-01 12:20:24 +01:00
Aruna Surya
6dd193b0f0
Improve grammar of Background Info 2018-11-01 08:16:38 +01:00
Manfred Karrer
60df87cb5c
Move DAO notes to contributing file 2018-10-31 22:11:25 -05:00
Manfred Karrer
bafe6f1842
Remove data dir locations 2018-10-31 22:10:07 -05:00
Manfred Karrer
8dab0d6347
Update wording and formatting 2018-10-31 22:08:48 -05:00
Manfred Karrer
12bfd21d8d
Update wording and formatting 2018-10-31 21:59:10 -05:00
Manfred Karrer
b5765647f3
Add dao section 2018-10-31 21:54:35 -05:00
Manfred Karrer
ebb9feeb2e
Fix wrong links 2018-10-31 21:48:03 -05:00
Manfred Karrer
c1b1b44b41
Add dev setup guide
- Move outdated and not highly relevant files to sub directories
2018-10-31 21:38:51 -05:00
Manfred Karrer
9888f93bfe
Merge pull request #1845 from j3ko/master
add interac e-transfer question/answer validation
2018-10-30 13:32:05 -05:00
Jeffrey Ko
ee51292d87
add interac e-transfer question/answer validation 2018-10-30 21:53:32 +07:00
Christoph Atteneder
55133ef117
Merge pull request #1822 from ManfredKarrer/add-cash-depoist-warning
Add warning popup for cash deposit
2018-10-29 10:59:30 +01:00
Manfred Karrer
1350413050
Add filter for not adding null entries 2018-10-28 12:45:10 -05:00
Manfred Karrer
8ab9c2839d
Merge pull request #1831 from leshik/th-promptpay-integration
Add PromptPay (Thailand)
2018-10-28 12:42:18 -05:00
Alexey Zagarin
0b8f6c17e2 Add PromptPay (Thailand)
Closes https://github.com/bisq-network/payment-methods/issues/6.
2018-10-28 20:25:37 +07:00
Manfred Karrer
cc446fb707
Add warning popup for cash deposit 2018-10-26 21:48:41 -05:00
Manfred Karrer
3239b401ae
Merge pull request #1817 from devinbileck/update-install-script
Refine the unix install script
2018-10-25 19:47:17 -05:00
Devin Bileck
eb879ef495
Merge remote-tracking branch 'remotes/upstream/master' into update-install-script 2018-10-24 23:49:46 -07:00
Devin Bileck
f6e6512c9e
Refine unix install script 2018-10-24 23:40:24 -07:00
Manfred Karrer
5113ccc7fc
Merge pull request #1813 from ManfredKarrer/add-reimbursement-proposal
Add support for reimbursement requests
2018-10-24 18:29:17 -05:00
sqrrm
7be08fee9c
FIx typo
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:33 -05:00
sqrrm
c463768856
Add comment
Co-Authored-By: ManfredKarrer <mk@nucleo.io>
2018-10-24 18:28:08 -05:00
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -05:00
Christoph Atteneder
1ee8578fdc
Merge pull request #1807 from ManfredKarrer/update-install-script
Update install scripts
2018-10-24 10:08:14 +02:00
Christoph Atteneder
431411433b
Merge pull request #1811 from devinbileck/fix-typos
Fix typos
2018-10-24 10:05:16 +02:00
Devin Bileck
0e3166f6b9
Merge remote-tracking branch 'upstream/master' into fix-typos 2018-10-23 23:43:13 -07:00
Manfred Karrer
71276b0417
Update install scripts
Add not tested script based on what @devinbileck posted in
https://github.com/bisq-network/bisq/issues/1791
2018-10-23 17:43:10 -05:00
Manfred Karrer
fd6681b9a9
Merge pull request #1795 from ManfredKarrer/DAO-UI-hide-details
Dao UI improvements
2018-10-23 17:19:56 -05:00
Manfred Karrer
538538ec34
FIx missing arguments in test, Ignore test (JMockit issue)
@Christoph Can you have a look why JMockit is not working anymore
in that module? TradesChartsViewModel is null and creates a nullpointer.
Adding RunWith("JMockit") as it was earlier does not work with changed gradle file
with newer JMockit version.
2018-10-23 13:13:36 -05:00
Manfred Karrer
bccecc1f16
FIx missing arguments in test 2018-10-23 12:42:05 -05:00
Manfred Karrer
0bbafc070b
Use FormBuilder.getIcon instead of AwesomeDude.createIconLabel 2018-10-23 11:58:41 -05:00
Manfred Karrer
501050de6f
Add getUnusedBsqAddressAsString method 2018-10-23 11:56:11 -05:00
Manfred Karrer
7228228dc7
Merge branch 'master' into DAO-UI-hide-details 2018-10-23 11:52:44 -05:00
Christoph Atteneder
62b4b59895
Merge pull request #1805 from ripcurlx/remove-unnecessary-java-module-config
Remove java 9 module configuration
2018-10-23 18:17:42 +02:00
Christoph Atteneder
80544d52f4
Remove module configuration for openjfx libraries as they are not used as Java 9 modules. 2018-10-23 10:15:59 +02:00
Manfred Karrer
f8754969e9
Merge pull request #1803 from ManfredKarrer/move-javafx-dep-to-common
Move javafx dependencies to common
2018-10-22 17:01:12 -05:00