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
13,629 Commits 4 Branches 148 Tags 4.3 GiB
86d0f96c6c
Commit Graph

13629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manfred Karrer
c455ae176b Merge remote-tracking branch 'origin/master' 2014-08-26 18:31:45 +02:00
Manfred Karrer
fd62cbe9ef removed most SuppressWarning annotations, added comments 2014-08-26 18:31:35 +02:00
Chris Beams
ec6b0ae6bc
Ignore OS X .DS_Store files 2014-08-26 18:28:21 +02:00
Manfred Karrer
627b49c7c1 fixed locale problem with fiat comparison in tests, added comments 2014-08-26 18:19:24 +02:00
Manfred Karrer
5415878356 changed fiat comparison in tests, added comments 2014-08-26 17:58:37 +02:00
Manfred Karrer
77431b3d94 added comments 2014-08-26 17:44:55 +02:00
Chris Beams
1955250ae8
Apply formatting to strip trailing whitespace 2014-08-26 17:36:59 +02:00
Manfred Karrer
98c6e34b23 fixed utest, update formatting added comments 2014-08-26 17:32:43 +02:00
Manfred Karrer
25b2afc545 merged with cbeams formatting changes. use MVP pattern for create offer screen (2. update) 2014-08-26 17:05:45 +02:00
Manfred Karrer
a9794a79d2 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/main/java/io/bitsquare/gui/trade/createoffer/CreateOfferController.java
	src/main/java/io/bitsquare/gui/util/BSFormatter.java
 2014-08-26 16:58:34 +02:00
Manfred Karrer
1c3c8b9d21 merged with cbeams formatting changes. use MVP pattern for create offer screen 2014-08-26 16:57:31 +02:00
Chris Beams
bf6652c340
Add trailing newline 2014-08-26 16:31:35 +02:00
Chris Beams
e4be536b63
Polish Javadoc 2014-08-26 16:31:21 +02:00
Chris Beams
75299b4311
Remove Bitsquare GPL copyright from Oracle sources 
Certain sources are already copyrighted by Oracle. This commit partially
reverts be3beb5 by deleting the copyright headers that were added there.
All Oracle copyright headers remain intact.
 2014-08-26 16:29:35 +02:00
Chris Beams
3fcc56f849
Collapse TODO comments onto single line 2014-08-26 16:28:58 +02:00
Chris Beams
fcd9966978
Remove code that has been commented out 2014-08-26 16:26:16 +02:00
Chris Beams
7f67d5545d
Merge branch 'formatting' 2014-08-26 16:06:00 +02:00
Chris Beams
a31aa9c883
Organize import statements 2014-08-26 16:01:34 +02:00
Chris Beams
424d4e8ff8
Format else statements on new line 
Based on Manfred's existing IDEA settings
 2014-08-26 16:01:33 +02:00
Chris Beams
a3c4df8dc3
Adjust line wrapping by hand 2014-08-26 16:01:33 +02:00
Chris Beams
1ad1d318e8
Wrap lines at 120 chars 2014-08-26 16:01:33 +02:00
Chris Beams
23b2cabf19
Apply formatting to XML sources 2014-08-26 16:01:32 +02:00
Chris Beams
7d6ca37d06
Apply formatting to Java sources 
This is essentially the default IDEA formatting settings, with one tweak
made to allow same-line field annotations (useful particularly in the
case of the @FXML annotation)
 2014-08-26 16:01:32 +02:00
Chris Beams
9c3df7375a
Add IDEA formatting settings 2014-08-26 16:01:31 +02:00
Chris Beams
681f2d55b8
Convert sources to unix line endings 
Performed with the following command:

    $ git ls-files | xargs dos2unix
 2014-08-26 16:01:26 +02:00
Chris Beams
26b8bb09be
Apply copyright to FXML sources 
Per http://www.gnu.org/licenses/gpl-howto.html
 2014-08-26 15:56:15 +02:00
Chris Beams
be3beb5c13
Apply copyright to Java sources 
Per http://www.gnu.org/licenses/gpl-howto.html
 2014-08-26 15:56:14 +02:00
Chris Beams
d5e7b6cfdb
Add IDEA copyright configuration 2014-08-26 15:56:14 +02:00
Chris Beams
6ff63ce2c6
Ignore Vim swap files 2014-08-26 15:56:13 +02:00
Chris Beams
b1e85691ed
Remove duplicate gitignore entry 2014-08-26 15:56:13 +02:00
Chris Beams
ecbc5c009a
Remove misplaced and duplicate dependency from pom 
The dependency declaration for net.glxn:qrgen:1.3 added in commit
4358268d88 was placed outside the
<dependencies> element, resulting in pom validation errors and breaking
the build. This commit removes the offending <dependency> element, as it
is a duplicate of the original declaration added to the pom months ago
in commit 328ecf34fe.
 2014-08-25 14:23:48 +02:00
Manfred Karrer
4358268d88 add qr code support and payment url to wallet app 2014-08-24 22:38:33 +02:00
Manfred Karrer
e2bf6ec652 add qr code support and payment url to wallet app 2014-08-24 20:11:13 +02:00
Manfred Karrer
4e2f977ff0 adjust bank account combobox and balance label 2014-08-24 17:53:43 +02:00
Manfred Karrer
5fa7872606 update readme with new videos 2014-08-24 15:20:51 +02:00
Manfred Karrer
ac2b8e3f41 use default country in bank account 2014-08-24 15:17:35 +02:00
Manfred Karrer
fc85a8ee17 improve addressentry handling 2014-08-24 14:38:16 +02:00
Manfred Karrer
00b41cf537 fixed problems with caching 2014-08-24 14:01:28 +02:00
Manfred Karrer
71ce70bf4b add support for caching views 2014-08-24 01:43:27 +02:00
Manfred Karrer
3391f6f4d3 fixed remove offer bug 2014-08-23 19:55:23 +02:00
Manfred Karrer
bf08388ac9 override useCaching (need a bit more effort to use caching) 2014-08-22 18:35:17 +02:00
Manfred Karrer
656a517057 save last successful bootstrap method and use that afterwards directly (speed up bootstrap when fallbacks are used like port forwarding and relay). Relay mode cause still issues on the server, need to be fixed ba Thomas Bocek (see mailinglist) 2014-08-22 18:28:12 +02:00
Manfred Karrer
0a9a442baa add jar plugin to pom 2014-08-22 02:51:06 +02:00
Manfred Karrer
7b49ab8218 fix main class in manifest 2014-08-22 01:54:14 +02:00
Manfred Karrer
9d0d81a7b8 fix bug with bank account 2014-08-21 18:32:19 +02:00
Manfred Karrer
0905fbd6b4 reformat 2014-08-20 21:56:03 +02:00
Manfred Karrer
7e8ee84ed1 fixed validation bugs and bugs at create order view 2014-08-20 21:55:27 +02:00
Manfred Karrer
844029d967 fixed network sync panel visibility 2014-08-20 11:06:11 +02:00
Manfred Karrer
a4beeeb447 new create offer layout 2014-08-11 23:03:50 +02:00
Manfred Karrer
17697afa24 improved startup, add splash screen, make it smoother 2014-08-11 13:40:16 +02:00