|  Sam Whited | 5e3b713286 | Add non-project files back | 2014-10-22 18:26:47 -04:00 | 
				
					
						|  Sam Whited | 5f4b6e39bc | Use proguard on release builds We don't need obfuscation (it's an open source project), but proguard
wil shrink the apk by stripping out unused code. | 2014-10-22 18:22:49 -04:00 | 
				
					
						|  Sam Whited | 1f49e99c46 | Suppress lint errors and remove bcprov | 2014-10-22 18:17:49 -04:00 | 
				
					
						|  Sam Whited | bf0c447fec | Add proguard rules | 2014-10-22 15:49:48 -04:00 | 
				
					
						|  Sam Whited | 281ce3105f | Make conversations the root project | 2014-10-22 15:47:11 -04:00 | 
				
					
						|  Sam Whited | 07b47172a0 | Add build deps and move build props to build file | 2014-10-22 15:39:53 -04:00 | 
				
					
						|  iNPUTmice | de3739970b | Merge branch 'development' of github.com:siacs/Conversations into development | 2014-10-22 19:05:28 +02:00 | 
				
					
						|  iNPUTmice | d04afe453a | ability to download pgp encrypted files over http as well | 2014-10-22 19:05:15 +02:00 | 
				
					
						|  Sam Whited | 038f7afd88 | Add gradle directory | 2014-10-22 12:42:28 -04:00 | 
				
					
						|  Sam Whited | 64bdd7e731 | Use Gradle build system | 2014-10-22 12:38:44 -04:00 | 
				
					
						|  Daniel Gultsch | f6cf5e9c2f | Merge pull request #577 from beriain/development Update strings.xml for 0.8 | 2014-10-22 17:34:20 +02:00 | 
				
					
						|  iNPUTmice | c067bf96b0 | small bug fixes for the conversation activity | 2014-10-22 17:32:59 +02:00 | 
				
					
						|  Aitor Beriain | 451bc8e4eb | Update strings.xml | 2014-10-22 16:04:21 +02:00 | 
				
					
						|  iNPUTmice | 62b0fc3fda | made httpconnection accept aes encrypted files | 2014-10-22 13:06:46 +02:00 | 
				
					
						|  iNPUTmice | 45bdadd915 | better aproach on thread saftey | 2014-10-22 00:25:28 +02:00 | 
				
					
						|  iNPUTmice | 9f9c3d3c2f | changed version to 0.8 alpha | 2014-10-22 00:00:19 +02:00 | 
				
					
						|  iNPUTmice | df2257aed6 | added hostname verifier to httpconnection | 2014-10-22 00:00:01 +02:00 | 
				
					
						|  iNPUTmice | 40c74b432e | made iterating over hashmap in notification service thread safe | 2014-10-21 23:59:02 +02:00 | 
				
					
						|  iNPUTmice | 63704b114c | throw exception when no servers are left to try | 2014-10-21 20:13:06 +02:00 | 
				
					
						|  iNPUTmice | 3821a72644 | fixed #564 | 2014-10-21 19:43:34 +02:00 | 
				
					
						|  iNPUTmice | a56ee63a3e | update ui when new avatar was found | 2014-10-21 15:26:17 +02:00 | 
				
					
						|  iNPUTmice | 0d767c3971 | proper avatar caching | 2014-10-21 14:57:16 +02:00 | 
				
					
						|  iNPUTmice | 21961673cb | refactored avatar generation. first step | 2014-10-20 21:08:33 +02:00 | 
				
					
						|  iNPUTmice | 0bb2c3c4d5 | keep reference to previous and next message in message | 2014-10-20 17:01:37 +02:00 | 
				
					
						|  Daniel Gultsch | a8a37ec08d | Merge pull request #569 from kriztan/patch-1 Set default preference ... | 2014-10-20 09:24:39 +02:00 | 
				
					
						|  Daniel Gultsch | b9288ed050 | Merge pull request #570 from SamWhited/typo-fixes Minor typo fixes, and big changes to README | 2014-10-20 09:24:20 +02:00 | 
				
					
						|  Sam Whited | 843a978ca1 | Went a bit wild on the README... | 2014-10-19 22:16:41 -04:00 | 
				
					
						|  Sam Whited | 268f790b4c | A few typo fixes in the README | 2014-10-19 19:03:13 -04:00 | 
				
					
						|  Sam Whited | 47485fe0c6 | Fixed some strange wording in a string Still doesn't sound right to me though... | 2014-10-19 18:22:06 -04:00 | 
				
					
						|  Daniel Gultsch | 0b61fb0129 | Merge pull request #554 from SamWhited/tls Enable TLSv1.1 and 1.2 and add option to enable/disable SSLv3 | 2014-10-20 00:03:32 +02:00 | 
				
					
						|  iNPUTmice | 8263e07336 | mtm support for image downloader | 2014-10-19 23:42:53 +02:00 | 
				
					
						|  iNPUTmice | 44f9022d95 | use new 'api' to add messages to a conversation | 2014-10-19 23:15:24 +02:00 | 
				
					
						|  iNPUTmice | c9238ef5ae | force tls for registrations as well | 2014-10-19 23:14:17 +02:00 | 
				
					
						|  iNPUTmice | a201f9e53f | got rid of copyonwrite array list for messages | 2014-10-19 23:13:55 +02:00 | 
				
					
						|  Sam Whited | 99ee049115 | Make legacy SSL option default to false | 2014-10-19 16:11:35 -04:00 | 
				
					
						|  Sam Whited | 6c7c3ddf15 | Add "Enable legacy SSL" preference | 2014-10-19 15:53:03 -04:00 | 
				
					
						|  iNPUTmice | e8bf75d79b | force tls | 2014-10-19 20:48:01 +02:00 | 
				
					
						|  iNPUTmice | 9372a98c0c | Merge branch 'lactide-srv_fix' into development | 2014-10-19 20:19:35 +02:00 | 
				
					
						|  iNPUTmice | f824193c56 | Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lactide-srv_fix | 2014-10-19 20:17:12 +02:00 | 
				
					
						|  iNPUTmice | 713cd6ef89 | fixed typo in french translation | 2014-10-19 18:15:02 +02:00 | 
				
					
						|  Daniel Gultsch | 30648a835d | Merge pull request #555 from SamWhited/build-fixes Fix problem when merging manifests during a Gradle build | 2014-10-19 18:01:45 +02:00 | 
				
					
						|  Daniel Gultsch | 7539261491 | Merge pull request #566 from BenoitBouvarel/patch-1 Update french strings.xml | 2014-10-19 18:00:55 +02:00 | 
				
					
						|  Daniel Gultsch | 3f280134bb | Merge pull request #565 from the-solipsist/patch-2 Update README.md | 2014-10-19 18:00:32 +02:00 | 
				
					
						|  kriztan | f20c43d1a2 | Set default preference ... ... for MUC notifications to true | 2014-10-19 09:32:49 +02:00 | 
				
					
						|  Sam Whited | 113b7d1736 | Remove support for legacy SSL | 2014-10-18 20:22:26 -04:00 | 
				
					
						|  the-solipsist | ac3c96b0db | Update README.md | 2014-10-18 18:01:19 +05:30 | 
				
					
						|  Benoit Bouvarel | 09abf7b9f8 | Update strings.xml French translation update | 2014-10-18 19:20:41 +07:00 | 
				
					
						|  the-solipsist | 1d9bd64e1d | Update README.md Changed "little" to the grammatically correct "few", and corrected the spelling of "permissions". | 2014-10-17 23:55:41 +05:30 | 
				
					
						|  iNPUTmice | 0605390144 | do not attempt to download images when not connected | 2014-10-17 13:09:02 +02:00 | 
				
					
						|  iNPUTmice | 3372e50155 | made grace period on a per account basis | 2014-10-17 11:01:38 +02:00 |