| 
							
							
								 iNPUTmice | 92ad4cb736 | changed listener timing and cache clearing after muc presences | 2014-11-20 22:44:31 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 66abdfccd4 | create file and dirs before creating file | 2014-11-20 22:02:32 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8fe3b2974b | Merge pull request #698 from kriztan/patch-1 Update german translations | 2014-11-20 21:47:12 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3e8a1e5f5f | Merge pull request #699 from betheg/status_code change status codes string 'number' to a better readable constant. | 2014-11-20 21:46:40 +01:00 |  | 
			
				
					| 
							
							
								 Michael | 3e3767cb06 | change status codes string 'number' to a better readable constant. | 2014-11-20 21:37:56 +01:00 |  | 
			
				
					| 
							
							
								 kriztan | 13bb46d550 | Update german translations | 2014-11-20 19:20:49 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | a207240881 | fixed potential NPEs | 2014-11-20 18:42:47 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | a142dcc263 | import fixes | 2014-11-20 18:33:04 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8b10ea676c | Merge branch 'development' of https://github.com/siacs/Conversations into development | 2014-11-20 18:20:45 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 0ad6d0616f | brought ad hoc conferences back. fixed #688 fixed #367 | 2014-11-20 18:20:42 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6bb0eb0b98 | Merge pull request #696 from SamWhited/development Remove broken / unused imports | 2014-11-19 21:20:15 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | 73d184352e | Remove broken / unused imports | 2014-11-19 14:57:23 -05:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | e9948f6b84 | sent read marker to full jid | 2014-11-19 17:40:42 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | cbf42ee12c | some saftey checks before registering listeners in XmppActivity | 2014-11-19 17:31:28 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 4b9a507633 | Merge pull request #691 from kruks23/development Update spanish translation | 2014-11-19 17:22:57 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 393807ab2d | Merge pull request #692 from kriztan/patch-3 Update german translations | 2014-11-19 17:22:50 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c2c3923ad4 | Merge pull request #694 from beriain/development Update basque translation | 2014-11-19 17:22:35 +01:00 |  | 
			
				
					| 
							
							
								 Aitor Beriain | 24b5d0eb26 | Update basque translation | 2014-11-19 16:12:31 +01:00 |  | 
			
				
					| 
							
							
								 kriztan | 6847594363 | Update german translations | 2014-11-19 08:51:23 +01:00 |  | 
			
				
					| 
							
							
								 kruks23 | 3ccee22c86 | Update spanish translations | 2014-11-19 00:16:45 +01:00 |  | 
			
				
					| 
							
							
								 kruks23 | 8f33f3540a | Update spanish translations | 2014-11-18 23:53:37 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ad0edfb839 | added faq for srv records | 2014-11-18 23:26:22 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 66087cb360 | put error notification into notification service | 2014-11-18 15:26:28 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1122e084a0 | simplified message merge condition | 2014-11-18 14:49:49 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 10bf2b77a8 | synchronized message list in conversation fragment | 2014-11-18 14:43:15 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | dcebc120ac | show dynamic tags in contacts activity as well | 2014-11-18 14:24:06 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ab832bcff7 | properly remove conversations context menu | 2014-11-18 13:51:04 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d29c861d03 | disabled broken conversations context menu | 2014-11-18 03:12:51 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 018a0c7978 | better usage of synchronized in some places | 2014-11-18 03:10:59 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 090e6ecf09 | better exception handling in XmppConnection.connect. (never return without throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary | 2014-11-18 01:48:16 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d2a4855a1e | added rendered versions of new icons | 2014-11-18 00:42:19 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 078f0ea103 | Merge branch 'qooob-development' into development | 2014-11-18 00:41:47 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | ef681c2a96 | Merge branch 'development' of https://github.com/qooob/Conversations into qooob-development | 2014-11-18 00:28:37 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 240d2d68c8 | context menu for conversations. fixed #630 | 2014-11-18 00:07:27 +01:00 |  | 
			
				
					| 
							
							
								 Ilia Rostovtsev | a4c884829a | Update README.md | 2014-11-18 00:58:36 +03:00 |  | 
			
				
					| 
							
							
								 Ilia Rostovtsev | f9e61f154b | Updated launcher icon: Bigger circles | 2014-11-18 00:57:01 +03:00 |  | 
			
				
					| 
							
							
								 Ilia Rostovtsev | 0bf108a95d | Notification icon: Solid version | 2014-11-18 00:55:50 +03:00 |  | 
			
				
					| 
							
							
								 Ilia Rostovtsev | 853bddd07f | Notification icon: Dashed-solid version Keeping this icon in case it's needed later | 2014-11-18 00:55:20 +03:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 123036fdaa | bump to version 0.9-alpha to differentiate stack traces. no feature freeze or anything else | 2014-11-17 21:40:48 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 86241a260a | clear avatar cache with new roster push from server | 2014-11-17 21:28:16 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | abbadcb58b | avoided some null pointers | 2014-11-17 20:45:00 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | f41c3eee04 | context menu for muc participants + refactor trueCounterpart to use Jid class | 2014-11-17 20:02:46 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 283d5058e5 | synchronized around cache clear in avatar service | 2014-11-17 20:01:56 +01:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | c058594ff5 | Merge pull request #681 from SamWhited/searchlocalefix Use `Locale.US' for string comparisons in search | 2014-11-17 18:27:21 +01:00 |  | 
			
				
					| 
							
							
								 Sam Whited | b6d8977237 | Use `Locale.US' for string comparisons in search | 2014-11-17 12:19:45 -05:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | e664a0c936 | Merge pull request #680 from ferdev1/patch-2 Fix string 2 | 2014-11-17 18:14:50 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 8865cc406c | trim search before searching | 2014-11-17 17:31:26 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 1a5af45afb | Merge branch 'development' of https://github.com/siacs/Conversations into development | 2014-11-17 17:24:56 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 252c7e68d6 | split search keywords by whitespaces and imply AND operatior | 2014-11-17 17:24:33 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | e30e84c819 | slightly modified logo / launcher icon | 2014-11-17 17:23:58 +01:00 |  |