| 
							
							
								 Daniel Gultsch | bab69ffcf9 | fixed #108 | 2014-05-17 11:08:32 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 836366bf2d | added translators to readme | 2014-05-17 10:50:29 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 84a4620649 | version bump to 0.2.2 | 2014-05-17 10:04:57 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8bf0945f2f | permanent notification disapears now when account is being deleted + code clean up | 2014-05-17 10:03:15 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | b84b67268b | fixed #113 | 2014-05-17 09:43:47 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f9394e2e69 | Merge pull request #120 from kruks23/development Update Spanish Translations + harcoded pref_advanced_options | 2014-05-16 23:13:08 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 9b95b07b97 | Merge branch 'development' of https://github.com/siacs/Conversations into development | 2014-05-16 22:49:52 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | cd1afbd39a | reworked message to conferences | 2014-05-16 22:46:15 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a0a5ca9585 | fixed npe for otr sessions with non contacts | 2014-05-16 22:44:54 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | e50f009004 | Update Spanish Translations + harcoded pref_advanced_settings | 2014-05-16 22:35:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 225447f2f5 | updated german translation | 2014-05-16 16:16:35 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | aa68045c58 | offline sending of pgp fixed | 2014-05-16 13:42:20 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c8f8bab2a1 | formating | 2014-05-16 13:18:52 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 1cf1e62e30 | fixed null in shared link | 2014-05-16 12:07:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | afd1ba657a | Merge pull request #117 from BenoitBouvarel/development French translation + hard-coded string > @string | 2014-05-16 11:55:17 +02:00 |  | 
			
				
					| 
							
							
								 Benoit Bouvarel | 3d0f08e319 | French translation + hard-coded string > @string | 2014-05-16 01:13:07 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3426df21c1 | Merge pull request #109 from kruks23/development Update Spanish Translations | 2014-05-15 12:07:41 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 13d73a196c | fixed npe | 2014-05-15 10:27:36 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | ad19100b9d | Update Spanish Translations | 2014-05-14 19:18:07 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ca7e24c30d | hiding the prepare image toast after error or success | 2014-05-14 18:43:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 08a26d2772 | fixed possible npe | 2014-05-14 18:39:59 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f4eebd091c | fixed #105 | 2014-05-14 18:32:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 81d2760505 | made message parser non static | 2014-05-14 12:56:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 1f600be4dd | code clean up | 2014-05-14 11:49:43 +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 | bc87f59600 | version bump | 2014-05-13 17:57:10 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a1a90a03e0 | added presence selection | 2014-05-13 17:42:23 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 888de850cf | Merge branch 'development' into feature/take_picture | 2014-05-13 17:23:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a3d241020a | Merge branch 'beriain-development' into development | 2014-05-13 17:22:45 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c0f5b26d1a | Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development | 2014-05-13 17:22:06 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f1bdf1d4c5 | Merge branch 'development' into feature/take_picture | 2014-05-13 17:11:36 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 71545f4f66 | code cleanup | 2014-05-13 17:11:27 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | efac008ffb | Fix | 2014-05-13 16:52:35 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 9492e28902 | takeing pictures over intent | 2014-05-13 16:48:39 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 8d27d0c44a | Merge https://github.com/siacs/Conversations into development | 2014-05-13 16:46:03 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 1150f47add | Update basque translation and include preferences | 2014-05-13 16:42:26 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a8010e7133 | Merge branch 'development' into feature/take_picture | 2014-05-13 15:40:59 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 84e79040df | static method for providing content uri | 2014-05-13 15:37:11 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6dfd885d34 | submenu for attach file | 2014-05-13 15:25:04 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 7e66731960 | ensure that iq response is being send out for jingle packets. remove jingle connection from manager after termination | 2014-05-13 14:49:09 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3cd369fb7b | german translation | 2014-05-13 13:51:13 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f38c7b22fd | further translations | 2014-05-13 11:23:11 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ad9b9b9096 | fixed npe in tag writer | 2014-05-13 10:23:26 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | cce12af766 | fixed french language | 2014-05-13 10:18:59 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 32d2efd459 | Merge pull request #88 from BenoitBouvarel/development Translation into French | 2014-05-12 23:29:26 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | dee1ba3bdd | Merge pull request #101 from kruks23/development Preferences Spanish Translations | 2014-05-12 23:28:19 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | ae768598fe | Preferences Spanish Translations | 2014-05-12 23:22:47 +02:00 |  | 
			
				
					| 
							
							
								 alvar | cb706e9e82 | Fix a typo in catalan translation | 2014-05-12 23:15:18 +02:00 |  | 
			
				
					| 
							
							
								 alvar | d07139d3c4 | Translation into catalan language | 2014-05-12 23:14:58 +02:00 |  |