| 
							
							
								 iNPUTmice | 27b306444b | fixed #326 fixed #202 | 2014-07-31 13:26:05 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | e3cec50d1f | Merge branch 'master' into development Conflicts:
	AndroidManifest.xml | 2014-07-31 10:22:02 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 9b34f39cd2 | version bump to 0.5.2 | 2014-07-31 10:20:46 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 98e9bd43b6 | fixed npe in start conversation activity | 2014-07-31 09:56:49 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ad8c5b6874 | fixed generation of muc pictures with copyonwrite user list | 2014-07-31 09:56:13 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8a5f9f1488 | fixed rare npe in loading of selfi | 2014-07-31 09:55:55 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | f765dc8423 | fixed npe for the rare case that user has disabled his action bar | 2014-07-31 09:55:33 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | 9e42bff014 | Allow mdns multicast / unicast reply queries | 2014-07-30 22:38:02 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | 858251d52c | Remove System.out code | 2014-07-30 22:37:09 +02:00 |  | 
			
				
					| 
							
							
								 Rene Treffer | 64f25e1783 | Fix style on build.gradle | 2014-07-30 22:29:16 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 3d9eb0e8fe | added 'how to logcat' to readme | 2014-07-30 21:48:11 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 511f74116f | fixed npe for the rare case that user has disabled his action bar | 2014-07-30 21:30:55 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 88e5713a80 | fixed npe in start conversation activity | 2014-07-30 21:26:33 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | bc24cf93ab | fixed generation of muc pictures with copyonwrite user list | 2014-07-30 21:25:59 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | fe46d36137 | fixed rare npe in loading of selfi | 2014-07-30 21:24:42 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1521b91b27 | fixed #239 - show contact names and pictures in muc if real jid is known | 2014-07-29 14:42:17 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 861af75576 | started development for 0.6 | 2014-07-28 14:15:08 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | b9f920ebf6 | added changelog | 2014-07-28 14:12:35 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 52643ac88c | bumped to version 0.5.1 | 2014-07-28 14:11:08 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 9f7f0afc62 | added more features to readme | 2014-07-28 13:47:20 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 6224bc5d17 | line break for readme | 2014-07-27 22:32:39 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4c90bd9b46 | fixed bug in message parser | 2014-07-27 22:31:33 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | af85964820 | updated readme a bit | 2014-07-27 19:06:37 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 0e93e5ce52 | trying to work around npe in androids xml parser | 2014-07-27 19:06:08 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | f8fedeb697 | fixe race conditons with newIntent | 2014-07-27 19:05:39 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schürmann | e515a49027 | Update gradle plugin to 0.12.2 | 2014-07-27 18:28:20 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 2e080401b1 | migrated some ArrayLists to CopyOnWriteArrayLists | 2014-07-27 18:07:04 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 29f089c954 | fixed npe with unsuccesfull bind | 2014-07-26 15:44:32 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 5182a92e58 | fixed npe when user was very quick with starting to type in startConversationactivity | 2014-07-26 15:44:13 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ba2a102c07 | added swedish translation by @andersruneson | 2014-07-26 10:43:37 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 39aeb4cc3d | Merge branch 'development' of github.com:siacs/Conversations into development | 2014-07-26 10:30:05 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 251b8fd58b | Merge pull request #315 from jelmer/dutch Update Dutch translations. | 2014-07-26 10:29:31 +02:00 |  | 
			
				
					| 
							
							
								 Jelmer Vernooij | 60e94ee9b8 | Update Dutch translations. | 2014-07-26 04:06:55 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 0e1c8467a3 | Merge branch 'development' of github.com:siacs/Conversations into development | 2014-07-25 08:11:45 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | deb5046e95 | Merge pull request #313 from suraia/translation-de Update German translation | 2014-07-25 08:08:10 +02:00 |  | 
			
				
					| 
							
							
								 Michael Kuhn | 1b0b847880 | Update German translation. | 2014-07-24 21:09:26 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 16e5139d5e | version bump to 0.5 | 2014-07-24 19:37:11 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 36434d8576 | Merge pull request #312 from beriain/development Some corrections | 2014-07-24 19:35:29 +02:00 |  | 
			
				
					| 
							
							
								 Aitor Beriain | 881e610636 | Some corrections | 2014-07-24 17:34:57 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | a6f8954bee | updated screenshots | 2014-07-24 17:24:52 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 52ad718251 | removed duplicates from muc suggestions | 2014-07-24 17:21:21 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | c7c3db478a | included version string in crash reports | 2014-07-24 12:33:56 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 438538e2da | french translations by @BenoitBouvarel fixed #311 | 2014-07-24 11:48:56 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 39841e6f57 | fixed spanish string. wild guessed + google translate fix for basque | 2014-07-24 10:16:05 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 9f9dc8f5c0 | added some translations back that have been removed be accident | 2014-07-24 10:04:01 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4c84cf78e0 | Merge branch 'rostovtsev-development' into development | 2014-07-24 09:56:05 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 76de9dba79 | Merge branch 'development' of https://github.com/rostovtsev/Conversations into rostovtsev-development Conflicts:
	res/values-ru/strings.xml | 2014-07-24 09:55:45 +02:00 |  | 
			
				
					| 
							
							
								 Ilia | 4d0d35f6bc | Update strings.xml | 2014-07-24 10:46:13 +04:00 |  | 
			
				
					| 
							
							
								 Ilia | 1a04b071a5 | Added translations Added translations per issue #309 - Missing Translations | 2014-07-24 10:44:39 +04:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8d5f2a9195 | added jelmer to the list of translators | 2014-07-24 01:41:56 +02:00 |  |