Commit Graph

344 Commits

Author SHA1 Message Date
8df42a6cf0 Merge branch 'develop' into feature/ACK
# Conflicts:
#	core/src/main/java/ch/dissem/bitmessage/BitmessageContext.java
2016-04-28 19:32:21 +02:00
784b192bab Simplyfied MultiThreadedPOWEngine and thread pool creation 2016-04-28 07:15:48 +02:00
a0505f5704 Minor improvements to the demo Application and a fix for when the ACK is empty 2016-04-25 08:13:46 +02:00
61890b3da9 Some improvements to the application 2016-04-15 17:18:11 +02:00
ddd5826f42 Fixed feature bitfield calculation/resolution 2016-04-13 07:32:35 +02:00
c31ec7a9e5 Fixed problems after merging 2016-04-12 17:27:19 +02:00
6f4f51aef3 Merge branch 'develop' into feature/ACK
# Conflicts:
#	core/src/main/java/ch/dissem/bitmessage/DefaultMessageListener.java
#	core/src/main/java/ch/dissem/bitmessage/InternalContext.java
#	core/src/main/java/ch/dissem/bitmessage/entity/BitmessageAddress.java
#	core/src/main/java/ch/dissem/bitmessage/entity/Plaintext.java
2016-04-11 23:41:23 +02:00
e8ddf90363 Provide a more flexible way to label messages.
I'm not quite sure about chans yet
2016-04-11 15:10:59 +02:00
4f7f80c12a Added tests and code improvements 2016-04-08 19:22:40 +02:00
f70c15da38 Some code for deterministic addresses - needs tests 2016-04-07 23:01:16 +02:00
32ea3517fe Chans should now work.
Other deterministic addresses should be easy to implement, but aren't done yet
2016-04-07 17:24:56 +02:00
ead5341b2e Some code for supporting chans 2016-03-31 20:04:23 +02:00
3e5e431d6f Code cleanup 2016-02-28 23:03:00 +01:00
57057298a1 Code cleanup 2016-02-26 16:30:45 +01:00
9ca28ead66 Code cleanup 2016-02-26 16:12:43 +01:00
2a17e6024f Code cleanup 2016-02-26 15:06:47 +01:00
bc68a5d3ec Code cleanup & improvements
- most notably removed some unnecessary synchronize blocks in the DefaultNetworkHandler
2016-02-26 14:34:08 +01:00
382cb80a87 Updated badges 2016-02-26 14:01:26 +01:00
f6add5b2ea Code cleanup 2016-02-25 16:36:43 +01:00
0a00a0a1b4 Code cleanup 2016-02-24 23:25:55 +01:00
9f1e0057c9 Code cleanup 2016-02-24 23:10:04 +01:00
4dd639e651 Code cleanup 2016-02-24 22:51:35 +01:00
f5215be8c6 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	README.md
2016-02-24 19:43:21 +01:00
a72718d4e8 Update README.md 2016-02-24 16:53:11 +01:00
8b2133977c Merge pull request #20 from Erkan-Yilmaz/patch-1
typo
2016-02-24 16:21:07 +01:00
Erkan Yilmaz
f17f26bf34 typo 2016-02-24 15:14:42 +01:00
86accb94f2 Update README.md
added link to IRC channel (thanks, kiwiirc!)
2016-02-24 14:34:14 +01:00
ccb102efd7 Update README.md 2016-02-15 16:54:13 +01:00
f71671e04a Added tests for DefaultMessageListener and ProofOfWorkService
and some minor improvements
2016-02-15 07:33:38 +01:00
e4a69f42b0 Fixed problem with sending broadcasts
(while adding some tests)
2016-02-13 08:03:05 +01:00
af3e63f592 Improved tests for cryptography 2016-02-09 17:09:22 +01:00
60adf73616 Improved tests for repositories 2016-02-07 23:36:35 +01:00
9c375d6608 Update README.md 2016-02-06 17:27:12 +01:00
db64b55510 Version 1.0.2-SNAPSHOT bump
Fixed NPE if you create a Plaintext object without recipient
2016-02-06 15:47:13 +01:00
06dbfbf64a Update README.md 2016-02-04 13:01:03 +01:00
58e9644ff1 Merge tag '1.0.1' into develop
1.0.1 1.0.1
2016-02-04 10:18:40 +01:00
d580d6983b Merge branch 'release/1.0.1' 2016-02-04 10:18:39 +01:00
9231cf5eaa Skip system tests by default as they don't work on Travis CI 2016-02-04 10:12:43 +01:00
354f506872 Raised timeout for test so hopefully it doesn't fail anymore on Travis CI (otherwise there must be a different problem) 2016-02-03 19:28:41 +01:00
2bfeedc7a9 Update build.gradle
Another try for codecov.io
2016-02-03 17:32:04 +01:00
ea700755b6 Update .travis.yml
Another try
2016-02-03 17:17:31 +01:00
5ab577f18a Update .travis.yml to work with codecov.io 2016-02-03 17:09:26 +01:00
b1599cbd60 This should fix the build on Travis CI / machines that don't have signing configured 2016-02-03 07:52:22 +01:00
91c41fa3bd Version 1.0.1 bump 2016-02-02 21:23:15 +01:00
985e830779 Made TTLs easily changeable (albeit not for specific messages)
This should make the system test run on Travis CI again
2016-02-02 21:05:14 +01:00
edd8045327 Fixed / improved message sending and added a system test (it's a start) 2016-02-02 20:40:01 +01:00
5f4dbfc985 Version 1.0.1-SNAPSHOT - fixed issue with requesting pubkey, and problem where your keys are overwritten if you try to import a contact again or worse, your identity as a contact 2016-01-31 18:11:20 +01:00
3103ae6edd Merge remote-tracking branch 'origin/master' into develop 2016-01-29 18:20:24 +01:00
1a77396bdc Update README.md
Fixed error where bc and sc was used instead of bouncy and spongy
2016-01-29 11:06:39 +01:00
3eabda29ee Merge branch 'master' into develop 2016-01-24 09:38:47 +01:00