| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						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 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						07b349563f
					 | 
					
						
						
							
							Fixed an issue in the POW engine
						
						
						
						
						
						
					 | 
					
						2016-01-23 17:18:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9f05af8bb7
					 | 
					
						
						
							
							Finally fixed the bug that was haunting me for the last week.
						
						
						
						
						
						
					 | 
					
						2016-01-21 20:32:23 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ac6f291964
					 | 
					
						
						
							
							Renamed module 'domain' to 'core' to make its purpose more clear
						
						
						
						
						
						
					 | 
					
						2016-01-17 05:42:49 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
							
							
						
					 |