| 
							
							
								 Alethea Butler | 3e9627dc50 | Capitalized openPGP -> OpenPGP | 2014-05-31 00:11:47 -04:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6f2a0c0107 | Merge pull request #160 from alethea/development Spelling and changed "unsuccessful delivery" to "delivery failed" | 2014-05-30 12:36:38 +02:00 |  | 
			
				
					| 
							
							
								 Alethea Butler | cb127add56 | Changed "unsuccessful delivery" to "delivery failed" | 2014-05-30 02:04:24 -04:00 |  | 
			
				
					| 
							
							
								 Alethea Butler | 732848fc0e | Added question mark to remove_contact_text | 2014-05-30 02:03:24 -04:00 |  | 
			
				
					| 
							
							
								 kruks23 | 75b14a1d5c | More harcoded translations + updated Spanish | 2014-05-29 18:17:21 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7f825f8027 | error msg on offline subscription changes | 2014-05-24 11:17:55 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | d74faa3f7c | More harcoded translations + Spanish | 2014-05-24 00:17:42 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | d6fd0343ae | Title activities translations + contacts translations + update Spanish Translations | 2014-05-23 16:20:49 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 950165033b | Contact details translations + update spanish translations | 2014-05-22 22:58:25 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a9d384875b | added missing strings | 2014-05-21 20:37:55 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | aba1ca7918 | Update Spanish Translations + harcoded just_now | 2014-05-20 18:49:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7fc7201abb | cleaned up edit account dialog a little | 2014-05-18 11:49:44 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 736e09fbb5 | added record audio button | 2014-05-17 19:21:16 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 225447f2f5 | updated german translation | 2014-05-16 16:16:35 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c8f8bab2a1 | formating | 2014-05-16 13:18:52 +02:00 |  | 
			
				
					| 
							
							
								 Benoit Bouvarel | 3d0f08e319 | French translation + hard-coded string > @string | 2014-05-16 01:13:07 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f4eebd091c | fixed #105 | 2014-05-14 18:32:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 65e7294802 | Merge branch 'development' into feature/take_picture | 2014-05-14 00:09:38 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ebae779d73 | one more entry to strings file | 2014-05-13 18:06:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6dfd885d34 | submenu for attach file | 2014-05-13 15:25:04 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f38c7b22fd | further translations | 2014-05-13 11:23:11 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3455d10a4a | Better error handling if attach file doesnt work (on permission denied) and unified encrypted and unencrypted file attachment | 2014-05-12 14:59:46 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4d0bf7971e | transfered preferences descritpions into strings.xml | 2014-05-11 13:55:15 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ef0bc6714a | added dialog for otr file transfer | 2014-05-09 21:20:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a14a28973a | nicer descriptions in notificaton for images and encrypted messages | 2014-05-09 20:46:43 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 0ed29c1c77 | more informative dialog if contact doesn't announce public key | 2014-05-08 14:23:09 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | dc73a25ae4 | code cleanup | 2014-05-08 11:53:00 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | be2f7e047a | more cleanup in res files | 2014-05-03 17:06:54 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3cfb4a0cd6 | added restart button to openkeychain dialog | 2014-05-03 15:24:19 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 82bccedf70 | nicer dialog screen if openkeychain is not installed | 2014-05-02 12:02:18 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 37c8e157d0 | reworked openpgp integration part #1 | 2014-05-01 22:33:49 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f36f218469 | unified presence selection for otr and file transfer | 2014-04-26 12:40:21 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | bf2d0d5596 | smoother scrolling (first step) | 2014-04-25 16:24:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 77da0c6b5d | allow images to be opened with gallary app | 2014-04-21 19:51:03 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8006931f80 | put more string into strings.xml | 2014-04-18 00:17:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 4a36abf30f | added clear history dialog (no funcionality) | 2014-04-18 00:17:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | bdf9770a61 | made ui with sending images a little smoother | 2014-04-15 15:19:02 +02:00 |  | 
			
				
					| 
							
							
								 Jelmer Vernooij | 802c21a793 | Fix two typos: assoziated -> associated. | 2014-04-14 02:22:03 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7dfe4ae082 | some code cleanup. added setting to auto accept files. socks5 connections are now threaded | 2014-04-13 18:09:40 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 51100ab48b | failed messages get now marked inline | 2014-04-11 09:13:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 644473205a | incomming jingle packets are routed to their connection. added presence chooser in gui | 2014-04-10 14:12:08 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7749103909 | added attach file action | 2014-04-06 15:28:19 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | cc977eee90 | renamed [Archive conversation|Leave conference] to End this conversation | 2014-04-06 15:23:40 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 21be7bc160 | added permenant notification when one or more accounts are unable to connect | 2014-04-03 09:21:45 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ea766d970f | crash reporter | 2014-03-27 16:09:23 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f4c9c19ec0 | spelling | 2014-03-26 21:07:16 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a9e34d3492 | tryed to fix more otr bugs. new resource setting | 2014-03-21 22:14:52 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8cd59bb944 | better muc invitations. clearified the creation of ad hoc mucs with an alert dialog | 2014-03-15 15:13:35 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 841c6e04a9 | muc invites in conference details | 2014-03-15 06:20:59 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | afe1244709 | muc creation | 2014-03-15 04:59:18 +01:00 |  |