| 
							
							
								 iNPUTmice | 7a90ca429b | basic arbitrary file transfer | 2014-11-15 15:34:11 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | e2fb32841b | Merge pull request #666 from SamWhited/localefixes Spelling fixes | 2014-11-15 13:12:29 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 8650bc2e13 | Make licenses info untranslatable | 2014-11-14 22:33:18 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | bae2b7ddc6 | Spelling fixes in Italian translation | 2014-11-14 22:16:58 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 62404b234c | Spelling fix in German translation | 2014-11-14 22:13:42 -05:00 |  | 
			
				
					| 
							
							
								 kriztan | fca3e3c756 | Update German language deleted 'pref_about_message' | 2014-11-12 20:09:14 +01:00 |  | 
			
				
					| 
							
							
								 kriztan | b971965697 | Update German language | 2014-11-12 13:13:59 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | e33fc26cbe | added snackbar to indicate smp. more error handling in verify activity | 2014-11-11 17:40:51 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 6cd2ff0d88 | initial smp support | 2014-11-11 17:40:51 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 26b4788733 | formating | 2014-11-09 21:27:37 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a01ff66537 | Merge pull request #645 from betheg/about_all_libs add all used libs to the pref_about_message | 2014-11-09 21:18:32 +01:00 |  | 
			
				
					| 
							
							
								 Michael | b1da9ae3cc | add libidn to pref_about_message. | 2014-11-09 21:02:35 +01:00 |  | 
			
				
					| 
							
							
								 Michael | f146c203a9 | add all used libs to the pref_about_message. also improve the notice a bit. | 2014-11-09 13:59:38 +01:00 |  | 
			
				
					| 
							
							
								 kruks23 | 6f6f15d563 | Update Spanish Translations | 2014-11-09 13:29:30 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | f8d5d6b2b5 | reformated license a bit | 2014-11-04 23:47:15 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | df786cbf01 | Shorten license text and fix height of scrollview | 2014-11-04 13:26:48 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 7b67f1a19c | Use normal text size and color | 2014-11-04 13:17:15 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 55c81eaf15 | Make links clickable in about text | 2014-11-04 13:09:56 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | f10dd428ba | Convert about dialog to activity | 2014-11-04 12:48:46 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 97b4b012d0 | Use real copyright symbol © | 2014-11-04 12:48:25 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | df54ee75b4 | Add about dialog with license info | 2014-11-04 12:47:58 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | cd5a56e8e7 | show avatar in editaccount | 2014-11-04 17:38:41 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | b3582c970e | made qr code available from muc and contact details as well | 2014-11-04 12:15:14 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d458919c8f | unfinishd qr code implemenation. thanks to @emdete | 2014-11-03 22:47:07 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 39ae34d3e6 | Wrap "last seen" time. Fixes #611 | 2014-11-03 08:28:20 -05:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 46f147a82c | Merge branch 'gradle' into development Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib | 2014-10-30 15:33:13 -04:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 281ce3105f | Make conversations the root project | 2014-10-22 15:47:11 -04:00 |  |