Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							eb8253d49a
							
						
					 | 
					
						
						
							
							Merge pull request #278 from rostovtsev/development
						
						
						
						
						
						
						
						Russian Translations, fixed typos for English version 
						
					 | 
					
						2014-07-15 22:33:49 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia
							
						 
					 | 
					
						
						
						
						
							
						
						
							31b5322570
							
						
					 | 
					
						
						
							
							Russian Localization
						
						
						
						
						
					 | 
					
						2014-07-16 00:10:06 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia
							
						 
					 | 
					
						
						
						
						
							
						
						
							88a556ec1e
							
						
					 | 
					
						
						
							
							Double-checked Russian localization
						
						
						
						
						
					 | 
					
						2014-07-16 00:06:43 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							9532a9889b
							
						
					 | 
					
						
						
							
							couple of bug fixes related to muc renaming
						
						
						
						
						
					 | 
					
						2014-07-15 21:54:11 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia
							
						 
					 | 
					
						
						
						
						
							
						
						
							eab756a1c5
							
						
					 | 
					
						
						
							
							Fixed typo Ouf -> Out
						
						
						
						
						
					 | 
					
						2014-07-15 22:59:32 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							177e802a77
							
						
					 | 
					
						
						
							
							fixed #276
						
						
						
						
						
					 | 
					
						2014-07-15 20:41:32 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							e20842608b
							
						
					 | 
					
						
						
							
							unregister bookmark on conversation when bookmark is deleted
						
						
						
						
						
					 | 
					
						2014-07-15 20:41:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc5143734e
							
						
					 | 
					
						
						
							
							added confirm dialog before contact and bookmark removal
						
						
						
						
						
					 | 
					
						2014-07-15 19:41:58 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia
							
						 
					 | 
					
						
						
						
						
							
						
						
							b6059a5687
							
						
					 | 
					
						
						
							
							Fixed typo mange -> manage
						
						
						
						
						
					 | 
					
						2014-07-15 19:48:45 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia
							
						 
					 | 
					
						
						
						
						
							
						
						
							a5d7b9b775
							
						
					 | 
					
						
						
							
							Fixed typo Decrpytion -> Decryption
						
						
						
						
						
					 | 
					
						2014-07-15 19:33:48 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed4d0d38e3
							
						
					 | 
					
						
						
							
							bug fix on deleting conference bookmarks
						
						
						
						
						
					 | 
					
						2014-07-15 17:19:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia
							
						 
					 | 
					
						
						
						
						
							
						
						
							ed39920e6a
							
						
					 | 
					
						
						
							
							Update strings.xml
						
						
						
						
						
					 | 
					
						2014-07-15 19:18:24 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f5d7071af
							
						
					 | 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development
						
						
						
						
						
					 | 
					
						2014-07-15 17:11:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a82f23f36
							
						
					 | 
					
						
						
							
							use nick from bookmark if available
						
						
						
						
						
					 | 
					
						2014-07-15 17:11:43 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia
							
						 
					 | 
					
						
						
						
						
							
						
						
							ae0c660cf4
							
						
					 | 
					
						
						
							
							Russian Translation for Conversations
						
						
						
						
						
						
						
						Russian Translation for Conversations - an open source XMPP client for Android 4.0+ smart phones. 
						
					 | 
					
						2014-07-15 18:09:48 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c9df212ab
							
						
					 | 
					
						
						
							
							Delete values-ru
						
						
						
						
						
					 | 
					
						2014-07-15 18:04:35 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Ilia
							
						 
					 | 
					
						
						
						
						
							
						
						
							cdfaa98736
							
						
					 | 
					
						
						
							
							strings.xml
						
						
						
						
						
						
						
						Russian translation for Conversations 
						
					 | 
					
						2014-07-15 18:04:08 +04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							908bd59d21
							
						
					 | 
					
						
						
							
							Merge pull request #275 from BenoitBouvarel/development
						
						
						
						
						
						
						
						Update french translation 
						
					 | 
					
						2014-07-15 15:13:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Benoit Bouvarel
							
						 
					 | 
					
						
						
						
						
							
						
						
							05e2aef9f8
							
						
					 | 
					
						
						
							
							Update strings.xml
						
						
						
						
						
					 | 
					
						2014-07-15 14:41:30 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							2ebd92b7a7
							
						
					 | 
					
						
						
							
							pushing bookmarks back to server
						
						
						
						
						
					 | 
					
						2014-07-15 14:32:19 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							6031af8606
							
						
					 | 
					
						
						
							
							use proper picture on bookmarked conferences when joined. use bookmark title when no subject is set
						
						
						
						
						
					 | 
					
						2014-07-14 17:13:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							3fa3d5f02b
							
						
					 | 
					
						
						
							
							Merge branch 'development' of github.com:siacs/Conversations into development
						
						
						
						
						
					 | 
					
						2014-07-14 11:48:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2f886d121
							
						
					 | 
					
						
						
							
							fetch bookmarks from server
						
						
						
						
						
					 | 
					
						2014-07-14 11:47:42 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							876a076e12
							
						
					 | 
					
						
						
							
							fixed spelling in README and added mission statement to docs
						
						
						
						
						
					 | 
					
						2014-07-14 11:45:55 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4c99d9e242
							
						
					 | 
					
						
						
							
							Merge pull request #273 from kruks23/development
						
						
						
						
						
						
						
						Update Spanish Translations 
						
					 | 
					
						2014-07-13 13:58:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							c4d6775f7d
							
						
					 | 
					
						
						
							
							Update Spanish Translations
						
						
						
						
						
					 | 
					
						2014-07-13 13:29:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							d0f5c9c9cc
							
						
					 | 
					
						
						
							
							more faq
						
						
						
						
						
					 | 
					
						2014-07-12 23:16:12 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							bab9618755
							
						
					 | 
					
						
						
							
							spelling in readme
						
						
						
						
						
					 | 
					
						2014-07-12 22:17:10 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							5ee9f2d2d9
							
						
					 | 
					
						
						
							
							added two more qna to the faq
						
						
						
						
						
					 | 
					
						2014-07-12 22:07:09 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							e69ac99290
							
						
					 | 
					
						
						
							
							added statement about status and priority to faq
						
						
						
						
						
					 | 
					
						2014-07-12 21:31:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							4e910eee59
							
						
					 | 
					
						
						
							
							fixed #268
						
						
						
						
						
					 | 
					
						2014-07-12 17:08:01 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							9968ae5260
							
						
					 | 
					
						
						
							
							refactored ui listeners a little bit
						
						
						
						
						
					 | 
					
						2014-07-12 13:42:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							fd5760d27a
							
						
					 | 
					
						
						
							
							made conversation list thread safe
						
						
						
						
						
					 | 
					
						2014-07-12 12:41:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							c512d98b74
							
						
					 | 
					
						
						
							
							moved iq parser to seperate class as well
						
						
						
						
						
					 | 
					
						2014-07-12 12:28:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							99fe44a737
							
						
					 | 
					
						
						
							
							cleanup for presence parser
						
						
						
						
						
					 | 
					
						2014-07-12 11:13:18 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							99935dd630
							
						
					 | 
					
						
						
							
							moved most of the message/presence generation into seperate classes
						
						
						
						
						
					 | 
					
						2014-07-12 03:44:23 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							789383e5cb
							
						
					 | 
					
						
						
							
							made message parser and presence parser implement interface On*PacketReceived
						
						
						
						
						
					 | 
					
						2014-07-12 02:36:37 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							7a26f27212
							
						
					 | 
					
						
						
							
							switch SearchView with custom action view
						
						
						
						
						
					 | 
					
						2014-07-11 23:44:59 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							610df2eddc
							
						
					 | 
					
						
						
							
							added join conference dialog
						
						
						
						
						
					 | 
					
						2014-07-11 19:48:41 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							690ee4988e
							
						
					 | 
					
						
						
							
							improved iterating over hashmap
						
						
						
						
						
					 | 
					
						2014-07-11 19:48:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							2b14ad51ec
							
						
					 | 
					
						
						
							
							fishing invites and delivery reports out of carbon copied messages
						
						
						
						
						
					 | 
					
						2014-07-11 14:49:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							beb82310da
							
						
					 | 
					
						
						
							
							made jingle connection array thread safe
						
						
						
						
						
					 | 
					
						2014-07-11 14:26:02 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							0193e0291c
							
						
					 | 
					
						
						
							
							cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites
						
						
						
						
						
					 | 
					
						2014-07-11 14:07:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							f6649ef838
							
						
					 | 
					
						
						
							
							changed 'show time threshold' to 6h
						
						
						
						
						
					 | 
					
						2014-07-11 13:55:29 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7a0040ec5
							
						
					 | 
					
						
						
							
							fixed #255 and made some other improvements to the subscription mgmt
						
						
						
						
						
					 | 
					
						2014-07-11 13:52:27 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							8ebd14cef4
							
						
					 | 
					
						
						
							
							Merge pull request #262 from kruks23/development
						
						
						
						
						
						
						
						Show time in messages previous days 
						
					 | 
					
						2014-07-11 13:12:25 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							355a6d1723
							
						
					 | 
					
						
						
							
							dirty push / delete flags are not set/reset correctly
						
						
						
						
						
					 | 
					
						2014-07-10 23:49:34 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							0078aee343
							
						
					 | 
					
						
						
							
							added bitcoin address
						
						
						
						
						
					 | 
					
						2014-07-10 22:19:31 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							fb2193fac9
							
						
					 | 
					
						
						
							
							formating and paypal disclaimer
						
						
						
						
						
					 | 
					
						2014-07-10 22:00:06 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							8476101f40
							
						
					 | 
					
						
						
							
							add donate button
						
						
						
						
						
					 | 
					
						2014-07-10 21:49:23 +02:00 | 
					
					
						
						
							
							
							
						
					 |