d617f099a1 
								
							 
						 
						
							
							
								
								added missing string to german translation  
							
							
							
						 
						
							2014-08-26 15:35:48 +02:00  
				
					
						
							
							
								 
						
							
								b933a34a59 
								
							 
						 
						
							
							
								
								Updated to 0.6.1  
							
							... 
							
							
							
							1. Different bug fixed.
2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages. 
							
						 
						
							2014-08-26 17:26:03 +04:00  
				
					
						
							
							
								 
						
							
								902f6c57b1 
								
							 
						 
						
							
							
								
								removed deprecated strings from translations  
							
							
							
						 
						
							2014-08-26 11:20:10 +02:00  
				
					
						
							
							
								 
						
							
								3ed29e5a8b 
								
							 
						 
						
							
							
								
								Merge pull request  #376  from wapolinar/development  
							
							... 
							
							
							
							Update strings.xml 
							
						 
						
							2014-08-25 20:25:29 +02:00  
				
					
						
							
							
								 
						
							
								5e7450adfa 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-08-25 19:49:35 +02:00  
				
					
						
							
							
								 
						
							
								03a387242c 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							... 
							
							
							
							Typo in a key for the German translation. 
							
						 
						
							2014-08-25 16:51:20 +02:00  
				
					
						
							
							
								 
						
							
								dce001369d 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							
							
						 
						
							2014-08-24 17:18:10 +02:00  
				
					
						
							
							
								 
						
							
								eae0a0aa2c 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-08-24 17:14:47 +02:00  
				
					
						
							
							
								 
						
							
								e0b759340d 
								
							 
						 
						
							
							
								
								jump right into edit account if now accounts are configured  
							
							
							
						 
						
							2014-08-23 21:31:27 +02:00  
				
					
						
							
							
								 
						
							
								d504daec16 
								
							 
						 
						
							
							
								
								changed workflow on inital avatar publication  
							
							
							
						 
						
							2014-08-23 20:00:05 +02:00  
				
					
						
							
							
								 
						
							
								ee9872277d 
								
							 
						 
						
							
							
								
								removed server compat value in favor of a (small xep list)  
							
							
							
						 
						
							2014-08-23 15:56:30 +02:00  
				
					
						
							
							
								 
						
							
								26d6835927 
								
							 
						 
						
							
							
								
								Merge pull request  #373  from kruks23/translation1  
							
							... 
							
							
							
							Update Spanish Translations 
							
						 
						
							2014-08-23 09:52:04 +02:00  
				
					
						
							
							
								 
						
							
								c40c8ee910 
								
							 
						 
						
							
							
								
								tiny redesign for private muc messages  
							
							
							
						 
						
							2014-08-22 13:22:07 +02:00  
				
					
						
							
							
								 
						
							
								9776618164 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-08-21 17:50:07 +02:00  
				
					
						
							
							
								 
						
							
								a269164458 
								
							 
						 
						
							
							
								
								added missing string resource again  
							
							
							
						 
						
							2014-08-20 11:40:01 +02:00  
				
					
						
							
							
								 
						
							
								06da080371 
								
							 
						 
						
							
							
								
								revised manage account activity. removed contexual action mode  
							
							
							
						 
						
							2014-08-20 11:32:49 +02:00  
				
					
						
							
							
								 
						
							
								3b79cc2f23 
								
							 
						 
						
							
							
								
								better error display and additional infos (stats) for the edit account activity  
							
							
							
						 
						
							2014-08-19 15:06:50 +02:00  
				
					
						
							
							
								 
						
							
								d74692e0a5 
								
							 
						 
						
							
							
								
								Merge pull request  #365  from beriain/development  
							
							... 
							
							
							
							Update strings.xml 
							
						 
						
							2014-08-19 15:06:52 +02:00  
				
					
						
							
							
								 
						
							
								9963dc63af 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-08-18 15:00:43 +02:00  
				
					
						
							
							
								 
						
							
								8c04649d6d 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-08-17 15:00:47 +02:00  
				
					
						
							
							
								 
						
							
								32c3dd4f4a 
								
							 
						 
						
							
							
								
								moved add/edit account from dialog into seperate activity  
							
							
							
						 
						
							2014-08-15 17:31:24 +02:00  
				
					
						
							
							
								 
						
							
								4f29869607 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							... 
							
							
							
							corrected missspelling 
							
						 
						
							2014-08-15 09:14:40 +02:00  
				
					
						
							
							
								 
						
							
								caaea6e830 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							... 
							
							
							
							Added German Translations and corrected misspellings. 
							
						 
						
							2014-08-15 09:05:30 +02:00  
				
					
						
							
							
								 
						
							
								7eabefe48b 
								
							 
						 
						
							
							
								
								Add Hebrew translation.  
							
							
							
						 
						
							2014-08-14 21:04:20 +03:00  
				
					
						
							
							
								 
						
							
								e2a17b4380 
								
							 
						 
						
							
							
								
								Add Hebrew translation.  
							
							
							
						 
						
							2014-08-14 21:00:49 +03:00  
				
					
						
							
							
								 
						
							
								5e8b05c31b 
								
							 
						 
						
							
							
								
								Update Spanish Translations + publish_avatar button and menu conflict  
							
							
							
						 
						
							2014-08-12 18:31:14 +02:00  
				
					
						
							
							
								 
						
							
								b35aa3ed07 
								
							 
						 
						
							
							
								
								added limited private muc chat feature (messages are now properly marked) - long press on user icon will sent private messages.  fixed   #259  
							
							
							
						 
						
							2014-08-10 15:27:44 +02:00  
				
					
						
							
							
								 
						
							
								9dec8e761e 
								
							 
						 
						
							
							
								
								changed all displays of avatars to be center crop instead of fitXY  
							
							
							
						 
						
							2014-08-09 14:25:55 +02:00  
				
					
						
							
							
								 
						
							
								937fc51b50 
								
							 
						 
						
							
							
								
								added warning lable if server doesn't support pubsub. refactored feature identification into seperate class  
							
							
							
						 
						
							2014-08-09 10:20:16 +02:00  
				
					
						
							
							
								 
						
							
								96a41b5b51 
								
							 
						 
						
							
							
								
								ability to bring default picture back with long press in publish avatar  
							
							
							
						 
						
							2014-08-09 09:38:52 +02:00  
				
					
						
							
							
								 
						
							
								313f9db1ec 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							
							
						 
						
							2014-08-06 18:36:55 +02:00  
				
					
						
							
							
								 
						
							
								2b4d9e8b60 
								
							 
						 
						
							
							
								
								fixed problems with sha sum calculation on avatar write. delete avatars with non matching sha sum  
							
							
							
						 
						
							2014-08-06 18:36:33 +02:00  
				
					
						
							
							
								 
						
							
								e8600483b2 
								
							 
						 
						
							
							
								
								Update Spanish Translations + gallery  
							
							
							
						 
						
							2014-08-05 22:39:52 +02:00  
				
					
						
							
							
								 
						
							
								9aba9a4059 
								
							 
						 
						
							
							
								
								error messages for publish avatar  
							
							
							
						 
						
							2014-08-05 12:21:08 +02:00  
				
					
						
							
							
								 
						
							
								f8b4d5f338 
								
							 
						 
						
							
							
								
								publish avatars  
							
							
							
						 
						
							2014-08-05 01:36:17 +02:00  
				
					
						
							
							
								 
						
							
								daab16bdef 
								
							 
						 
						
							
							
								
								activity for future avatar publications. not working yet  
							
							
							
						 
						
							2014-08-03 20:28:13 +02:00  
				
					
						
							
							
								 
						
							
								88d1bd356c 
								
							 
						 
						
							
							
								
								get rid of 'use phones self contact picture option'  
							
							
							
						 
						
							2014-07-31 15:18:55 +02:00  
				
					
						
							
							
								 
						
							
								990f0f6d73 
								
							 
						 
						
							
							
								
								refactored account array adapter into seperate class. added account image  
							
							
							
						 
						
							2014-07-31 15:09:34 +02:00  
				
					
						
							
							
								 
						
							
								27b306444b 
								
							 
						 
						
							
							
								
								fixed   #326   fixed   #202  
							
							
							
						 
						
							2014-07-31 13:26:05 +02:00  
				
					
						
							
							
								 
						
							
								ba2a102c07 
								
							 
						 
						
							
							
								
								added swedish translation by @andersruneson  
							
							
							
						 
						
							2014-07-26 10:43:37 +02:00  
				
					
						
							
							
								 
						
							
								60e94ee9b8 
								
							 
						 
						
							
							
								
								Update Dutch translations.  
							
							
							
						 
						
							2014-07-26 04:06:55 +02:00  
				
					
						
							
							
								 
						
							
								1b0b847880 
								
							 
						 
						
							
							
								
								Update German translation.  
							
							
							
						 
						
							2014-07-24 21:09:26 +02:00  
				
					
						
							
							
								 
						
							
								881e610636 
								
							 
						 
						
							
							
								
								Some corrections  
							
							
							
						 
						
							2014-07-24 17:34:57 +02:00  
				
					
						
							
							
								 
						
							
								438538e2da 
								
							 
						 
						
							
							
								
								french translations by @BenoitBouvarel  fixed   #311  
							
							
							
						 
						
							2014-07-24 11:48:56 +02:00  
				
					
						
							
							
								 
						
							
								39841e6f57 
								
							 
						 
						
							
							
								
								fixed spanish string. wild guessed + google translate fix for basque  
							
							
							
						 
						
							2014-07-24 10:16:05 +02:00  
				
					
						
							
							
								 
						
							
								9f9dc8f5c0 
								
							 
						 
						
							
							
								
								added some translations back that have been removed be accident  
							
							
							
						 
						
							2014-07-24 10:04:01 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								4d0d35f6bc 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-07-24 10:46:13 +04:00  
				
					
						
							
							
								 
						
							
								1a04b071a5 
								
							 
						 
						
							
							
								
								Added translations  
							
							... 
							
							
							
							Added translations per issue #309  - Missing Translations 
							
						 
						
							2014-07-24 10:44:39 +04:00  
				
					
						
							
							
								 
						
							
								3b786c34f2 
								
							 
						 
						
							
							
								
								removed outdated translations from languge files  
							
							
							
						 
						
							2014-07-24 01:35:09 +02:00  
				
					
						
							
							
								 
						
							
								983104f2f0 
								
							 
						 
						
							
							
								
								presonalized read up to this point message  
							
							
							
						 
						
							2014-07-24 01:17:34 +02:00  
				
					
						
							
							
								 
						
							
								eacf56bf37 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							
							
						 
						
							2014-07-22 18:58:38 +02:00  
				
					
						
							
							
								 
						
							
								1f4ea552cd 
								
							 
						 
						
							
							
								
								some cleanup  
							
							
							
						 
						
							2014-07-22 18:58:20 +02:00  
				
					
						
							
							
								 
						
							
								ae532ecf20 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-07-22 17:47:25 +02:00  
				
					
						
							
							
								 
						
							
								9fcc195a6d 
								
							 
						 
						
							
							
								
								brought settings and manage account menu items back  
							
							
							
						 
						
							2014-07-22 17:23:31 +02:00  
				
					
						
							
							
								 
						
							
								2345398652 
								
							 
						 
						
							
							
								
								fixed   #301  
							
							
							
						 
						
							2014-07-22 16:55:30 +02:00  
				
					
						
							
							
								 
						
							
								9b53ebd44b 
								
							 
						 
						
							
							
								
								Merge pull request  #299  from beriain/development  
							
							... 
							
							
							
							Update strings.xml 
							
						 
						
							2014-07-22 15:30:23 +02:00  
				
					
						
							
							
								 
						
							
								db91c15fcf 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-07-22 15:12:19 +02:00  
				
					
						
							
							
								 
						
							
								b223784560 
								
							 
						 
						
							
							
								
								added hint to explain the contact has read up to this point  
							
							
							
						 
						
							2014-07-21 19:54:26 +02:00  
				
					
						
							
							
								 
						
							
								2fe20ffa8e 
								
							 
						 
						
							
							
								
								fixed   #267  
							
							
							
						 
						
							2014-07-21 16:16:09 +02:00  
				
					
						
							
							
								 
						
							
								9ddd2f195e 
								
							 
						 
						
							
							
								
								fixed typos reported by @jelmer  fixed   #288  
							
							
							
						 
						
							2014-07-20 12:21:04 +02:00  
				
					
						
							
							
								 
						
							
								0ee7cd136a 
								
							 
						 
						
							
							
								
								Merge pull request  #289  from jelmer/dutch  
							
							... 
							
							
							
							Add Dutch translations. 
							
						 
						
							2014-07-20 12:17:14 +02:00  
				
					
						
							
							
								 
						
							
								cb0a87d7ff 
								
							 
						 
						
							
							
								
								Add Dutch translations.  
							
							
							
						 
						
							2014-07-20 04:00:05 +02:00  
				
					
						
							
							
								 
						
							
								88857e7721 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-07-18 18:36:22 +02:00  
				
					
						
							
							
								 
						
							
								6b74c0594e 
								
							 
						 
						
							
							
								
								show snackbar if conference was not found  
							
							
							
						 
						
							2014-07-18 12:44:33 +02:00  
				
					
						
							
							
								 
						
							
								38a9242955 
								
							 
						 
						
							
							
								
								brought muc invites back. + couple of bug fixes + refactoring  
							
							
							
						 
						
							2014-07-17 00:03:37 +02:00  
				
					
						
							
							
								 
						
							
								4e321c5187 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-07-16 16:31:18 +02:00  
				
					
						
							
							
								 
						
							
								e79a34b651 
								
							 
						 
						
							
							
								
								redesigned muc details a little bit  
							
							
							
						 
						
							2014-07-16 12:34:09 +02:00  
				
					
						
							
							
								 
						
							
								eb8253d49a 
								
							 
						 
						
							
							
								
								Merge pull request  #278  from rostovtsev/development  
							
							... 
							
							
							
							Russian Translations, fixed typos for English version 
							
						 
						
							2014-07-15 22:33:49 +02:00  
				
					
						
							
							
								 
						
							
								31b5322570 
								
							 
						 
						
							
							
								
								Russian Localization  
							
							
							
						 
						
							2014-07-16 00:10:06 +04:00  
				
					
						
							
							
								 
						
							
								88a556ec1e 
								
							 
						 
						
							
							
								
								Double-checked Russian localization  
							
							
							
						 
						
							2014-07-16 00:06:43 +04:00  
				
					
						
							
							
								 
						
							
								eab756a1c5 
								
							 
						 
						
							
							
								
								Fixed typo Ouf -> Out  
							
							
							
						 
						
							2014-07-15 22:59:32 +04:00  
				
					
						
							
							
								 
						
							
								fc5143734e 
								
							 
						 
						
							
							
								
								added confirm dialog before contact and bookmark removal  
							
							
							
						 
						
							2014-07-15 19:41:58 +02:00  
				
					
						
							
							
								 
						
							
								b6059a5687 
								
							 
						 
						
							
							
								
								Fixed typo mange -> manage  
							
							
							
						 
						
							2014-07-15 19:48:45 +04:00  
				
					
						
							
							
								 
						
							
								a5d7b9b775 
								
							 
						 
						
							
							
								
								Fixed typo Decrpytion -> Decryption  
							
							
							
						 
						
							2014-07-15 19:33:48 +04:00  
				
					
						
							
							
								 
						
							
								ed39920e6a 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-07-15 19:18:24 +04:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								3c9df212ab 
								
							 
						 
						
							
							
								
								Delete values-ru  
							
							
							
						 
						
							2014-07-15 18:04:35 +04:00  
				
					
						
							
							
								 
						
							
								cdfaa98736 
								
							 
						 
						
							
							
								
								strings.xml  
							
							... 
							
							
							
							Russian translation for Conversations 
							
						 
						
							2014-07-15 18:04:08 +04:00  
				
					
						
							
							
								 
						
							
								908bd59d21 
								
							 
						 
						
							
							
								
								Merge pull request  #275  from BenoitBouvarel/development  
							
							... 
							
							
							
							Update french translation 
							
						 
						
							2014-07-15 15:13:59 +02:00  
				
					
						
							
							
								 
						
							
								05e2aef9f8 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-07-15 14:41:30 +02:00  
				
					
						
							
							
								 
						
							
								2ebd92b7a7 
								
							 
						 
						
							
							
								
								pushing bookmarks back to server  
							
							
							
						 
						
							2014-07-15 14:32:19 +02:00  
				
					
						
							
							
								 
						
							
								3fa3d5f02b 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							
							
						 
						
							2014-07-14 11:48:01 +02:00  
				
					
						
							
							
								 
						
							
								e2f886d121 
								
							 
						 
						
							
							
								
								fetch bookmarks from server  
							
							
							
						 
						
							2014-07-14 11:47:42 +02:00  
				
					
						
							
							
								 
						
							
								c4d6775f7d 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-07-13 13:29:06 +02:00  
				
					
						
							
							
								 
						
							
								4e910eee59 
								
							 
						 
						
							
							
								
								fixed   #268  
							
							
							
						 
						
							2014-07-12 17:08:01 +02:00  
				
					
						
							
							
								 
						
							
								7a26f27212 
								
							 
						 
						
							
							
								
								switch SearchView with custom action view  
							
							
							
						 
						
							2014-07-11 23:44:59 +02:00  
				
					
						
							
							
								 
						
							
								610df2eddc 
								
							 
						 
						
							
							
								
								added join conference dialog  
							
							
							
						 
						
							2014-07-11 19:48:41 +02:00  
				
					
						
							
							
								 
						
							
								0193e0291c 
								
							 
						 
						
							
							
								
								cleanup. removed old contacts activity. WARNING: this will temporarly disable muc invites  
							
							
							
						 
						
							2014-07-11 14:07:52 +02:00  
				
					
						
							
							
								 
						
							
								e7a0040ec5 
								
							 
						 
						
							
							
								
								fixed   #255  and made some other improvements to the subscription mgmt  
							
							
							
						 
						
							2014-07-11 13:52:27 +02:00  
				
					
						
							
							
								 
						
							
								8ebd14cef4 
								
							 
						 
						
							
							
								
								Merge pull request  #262  from kruks23/development  
							
							... 
							
							
							
							Show time in messages previous days 
							
						 
						
							2014-07-11 13:12:25 +02:00  
				
					
						
							
							
								 
						
							
								a523127a80 
								
							 
						 
						
							
							
								
								fixed   #38  
							
							
							
						 
						
							2014-07-10 19:42:37 +02:00  
				
					
						
							
							
								 
						
							
								1da0845d52 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-07-10 18:12:57 +02:00  
				
					
						
							
							
								 
						
							
								e97b524455 
								
							 
						 
						
							
							
								
								added create contact dialog  
							
							
							
						 
						
							2014-07-10 13:19:42 +02:00  
				
					
						
							
							
								 
						
							
								f8763015eb 
								
							 
						 
						
							
							
								
								added contextual menu for contacts  
							
							
							
						 
						
							2014-07-10 01:55:19 +02:00  
				
					
						
							
							
								 
						
							
								2684ecda1e 
								
							 
						 
						
							
							
								
								small changes  
							
							
							
						 
						
							2014-07-10 00:53:44 +02:00  
				
					
						
							
							
								 
						
							
								7b8ed5ffbc 
								
							 
						 
						
							
							
								
								theming for tabs in start conversation  
							
							
							
						 
						
							2014-07-10 00:53:44 +02:00  
				
					
						
							
							
								 
						
							
								3bdf84b6a0 
								
							 
						 
						
							
							
								
								filter contacts and starting confercenes  
							
							
							
						 
						
							2014-07-10 00:53:44 +02:00  
				
					
						
							
							
								 
						
							
								7c3f3b2a3e 
								
							 
						 
						
							
							
								
								added group add button  
							
							
							
						 
						
							2014-07-10 00:53:43 +02:00  
				
					
						
							
							
								 
						
							
								c1ee9e682a 
								
							 
						 
						
							
							
								
								added action bar menu to start conversation  
							
							
							
						 
						
							2014-07-10 00:53:43 +02:00  
				
					
						
							
							
								 
						
							
								502a1bdb9c 
								
							 
						 
						
							
							
								
								changed support lib to v13. added tabs and fragments to start conversation activity  
							
							
							
						 
						
							2014-07-10 00:53:43 +02:00  
				
					
						
							
							
								 
						
							
								2c50ba1779 
								
							 
						 
						
							
							
								
								moved hint box to the bottom  
							
							
							
						 
						
							2014-07-10 00:13:30 +02:00  
				
					
						
							
							
								 
						
							
								da79e2cca2 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							
							
						 
						
							2014-07-09 21:45:21 +02:00  
				
					
						
							
							
								 
						
							
								6e3e1d310a 
								
							 
						 
						
							
							
								
								unified warnings/error msgs  
							
							
							
						 
						
							2014-07-09 21:45:03 +02:00  
				
					
						
							
							
								 
						
							
								0372756754 
								
							 
						 
						
							
							
								
								Merge pull request  #245  from beriain/development  
							
							... 
							
							
							
							Update strings.xml and fix some strings 
							
						 
						
							2014-07-08 17:00:47 +02:00  
				
					
						
							
							
								 
						
							
								3ac70d4b86 
								
							 
						 
						
							
							
								
								uniformed colors. made colors a little material  
							
							
							
						 
						
							2014-07-08 11:41:19 +02:00  
				
					
						
							
							
								 
						
							
								37a8b87235 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							
							
						 
						
							2014-07-07 17:20:27 +02:00  
				
					
						
							
							
								 
						
							
								98c1f2bee7 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-07-07 16:29:37 +02:00  
				
					
						
							
							
								 
						
							
								4427b6727b 
								
							 
						 
						
							
							
								
								Merge pull request  #256  from kruks23/development  
							
							... 
							
							
							
							Update Spanish Translations 
							
						 
						
							2014-07-07 15:20:54 +02:00  
				
					
						
							
							
								 
						
							
								30782d2bfb 
								
							 
						 
						
							
							
								
								Merge pull request  #257  from BenoitBouvarel/development  
							
							... 
							
							
							
							French translation updated 
							
						 
						
							2014-07-07 15:20:45 +02:00  
				
					
						
							
							
								 
						
							
								e8ba26e0aa 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-07-07 15:17:25 +02:00  
				
					
						
							
							
								 
						
							
								11f3aa5c87 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-07-07 15:15:33 +02:00  
				
					
						
							
							
								 
						
							
								f55e5feb46 
								
							 
						 
						
							
							
								
								French translation updated  
							
							
							
						 
						
							2014-07-07 15:13:17 +02:00  
				
					
						
							
							
								 
						
							
								37eb8e4ed9 
								
							 
						 
						
							
							
								
								changed icons to light  
							
							
							
						 
						
							2014-07-07 13:50:31 +02:00  
				
					
						
							
							
								 
						
							
								b0a561bac0 
								
							 
						 
						
							
							
								
								styled action bar green  
							
							
							
						 
						
							2014-07-07 10:51:06 +02:00  
				
					
						
							
							
								 
						
							
								99eb1743e3 
								
							 
						 
						
							
							
								
								small ui overhauls. unified text sizes. made text a bit smaller. moved messages more closer together  
							
							
							
						 
						
							2014-07-04 16:13:52 +02:00  
				
					
						
							
							
								 
						
							
								65d62cced4 
								
							 
						 
						
							
							
								
								fixed   #247  
							
							
							
						 
						
							2014-07-04 12:06:11 +02:00  
				
					
						
							
							
								 
						
							
								1f632ca235 
								
							 
						 
						
							
							
								
								Update translation  
							
							
							
						 
						
							2014-07-03 18:15:47 +02:00  
				
					
						
							
							
								 
						
							
								6afd918990 
								
							 
						 
						
							
							
								
								Add missing German translations  
							
							
							
						 
						
							2014-07-03 18:14:10 +02:00  
				
					
						
							
							
								 
						
							
								aa1665e359 
								
							 
						 
						
							
							
								
								fixed some tiny ui glitches  
							
							
							
						 
						
							2014-07-02 17:30:53 +02:00  
				
					
						
							
							
								 
						
							
								fcc5b3674c 
								
							 
						 
						
							
							
								
								removed old notification icon  
							
							
							
						 
						
							2014-06-30 21:07:24 +02:00  
				
					
						
							
							
								 
						
							
								53533ca74e 
								
							 
						 
						
							
							
								
								added error message for  #240  
							
							
							
						 
						
							2014-06-30 10:36:21 +02:00  
				
					
						
							
							
								 
						
							
								f7f730e804 
								
							 
						 
						
							
							
								
								Merge pull request  #237  from kruks23/development  
							
							... 
							
							
							
							Update Spanish Translations 
							
						 
						
							2014-06-30 10:30:37 +02:00  
				
					
						
							
							
								 
						
							
								d58d428874 
								
							 
						 
						
							
							
								
								more error handling for jingle connections  
							
							
							
						 
						
							2014-06-29 13:44:59 +02:00  
				
					
						
							
							
								 
						
							
								069cc51661 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-06-29 11:57:53 +02:00  
				
					
						
							
							
								 
						
							
								ed3b535e6c 
								
							 
						 
						
							
							
								
								made warnings in chats i tiny bit smaller  
							
							
							
						 
						
							2014-06-27 11:15:06 +02:00  
				
					
						
							
							
								 
						
							
								6332591902 
								
							 
						 
						
							
							
								
								Update spanish mins ago  
							
							
							
						 
						
							2014-06-24 09:21:46 +02:00  
				
					
						
							
							
								 
						
							
								2a8f9642d5 
								
							 
						 
						
							
							
								
								added rendering script for artwork  
							
							
							
						 
						
							2014-06-24 01:35:43 +02:00  
				
					
						
							
							
								 
						
							
								25e44cbf52 
								
							 
						 
						
							
							
								
								new logo  
							
							
							
						 
						
							2014-06-23 21:57:53 +02:00  
				
					
						
							
							
								 
						
							
								6409846379 
								
							 
						 
						
							
							
								
								removed duplicate entries  
							
							
							
						 
						
							2014-06-21 22:16:42 +02:00  
				
					
						
							
							
								 
						
							
								545cad41e6 
								
							 
						 
						
							
							
								
								Merge branch 'development' of  https://github.com/beriain/Conversations  into beriain-development  
							
							... 
							
							
							
							Conflicts:
	res/values-eu/strings.xml 
							
						 
						
							2014-06-20 19:49:33 +02:00  
				
					
						
							
							
								 
						
							
								b16bc24c71 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-06-18 17:15:59 +02:00  
				
					
						
							
							
								 
						
							
								febf23de1f 
								
							 
						 
						
							
							
								
								Rounded minutes ago and last seen + Update Spanish Translations  
							
							
							
						 
						
							2014-06-15 18:27:20 +02:00  
				
					
						
							
							
								 
						
							
								eb7ed78605 
								
							 
						 
						
							
							
								
								moved last seen to contact details  
							
							
							
						 
						
							2014-06-13 11:50:47 +02:00  
				
					
						
							
							
								 
						
							
								592aded106 
								
							 
						 
						
							
							
								
								finished offline otr  
							
							
							
						 
						
							2014-06-12 23:04:28 +02:00  
				
					
						
							
							
								 
						
							
								285ffa86e7 
								
							 
						 
						
							
							
								
								fixed scrolling issues  
							
							
							
						 
						
							2014-06-10 17:01:19 +02:00  
				
					
						
							
							
								 
						
							
								28b7a6c92a 
								
							 
						 
						
							
							
								
								don't display 'enter password' message if OpenKeychain is not installed. made status messages in chat not selectable  
							
							
							
						 
						
							2014-06-09 21:25:01 +02:00  
				
					
						
							
							
								 
						
							
								d0a338f814 
								
							 
						 
						
							
							
								
								Merge pull request  #188  from DerHamster/worktest  
							
							... 
							
							
							
							small fix ( zerfifikat -> zertifikat ) 
							
						 
						
							2014-06-09 20:24:51 +02:00  
				
					
						
							
							
								 
						
							
								c92db4e113 
								
							 
						 
						
							
							
								
								updated languages  
							
							
							
						 
						
							2014-06-09 20:22:43 +02:00  
				
					
						
							
							
								 
						
							
								79f09ccf61 
								
							 
						 
						
							
							
								
								small fix ( zerfifikat -> zertifikat )  
							
							
							
						 
						
							2014-06-09 20:19:08 +02:00  
				
					
						
							
							
								 
						
							
								9f48555a18 
								
							 
						 
						
							
							
								
								Update strings.xml  
							
							
							
						 
						
							2014-06-09 16:11:30 +02:00  
				
					
						
							
							
								 
						
							
								777edca0e1 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-06-09 01:01:56 +02:00  
				
					
						
							
							
								 
						
							
								71886ed2ab 
								
							 
						 
						
							
							
								
								localized date. rounded minutes, hours and dates in last seen  
							
							
							
						 
						
							2014-06-07 13:57:03 +02:00  
				
					
						
							
							
								 
						
							
								3fd371cd53 
								
							 
						 
						
							
							
								
								fixed last_seen_now  
							
							
							
						 
						
							2014-06-06 19:39:55 +02:00  
				
					
						
							
							
								 
						
							
								fc656c5571 
								
							 
						 
						
							
							
								
								removed presence from last seen  
							
							
							
						 
						
							2014-06-06 19:37:34 +02:00  
				
					
						
							
							
								 
						
							
								e820c98cb7 
								
							 
						 
						
							
							
								
								Merge branch 'development' of github.com:siacs/Conversations into development  
							
							
							
						 
						
							2014-06-06 11:39:33 +02:00  
				
					
						
							
							
								 
						
							
								5fe926b645 
								
							 
						 
						
							
							
								
								basic last seen feature. no peristancy just yet. no polish  
							
							
							
						 
						
							2014-06-06 11:39:17 +02:00  
				
					
						
							
							
								 
						
							
								356a5724f6 
								
							 
						 
						
							
							
								
								Merge pull request  #178  from kruks23/development  
							
							... 
							
							
							
							Update Spanish Translations 
							
						 
						
							2014-06-05 11:52:07 +02:00  
				
					
						
							
							
								 
						
							
								a583471af8 
								
							 
						 
						
							
							
								
								read marker is now a little less in your face  
							
							
							
						 
						
							2014-06-05 01:57:00 +02:00  
				
					
						
							
							
								 
						
							
								a4e06db14f 
								
							 
						 
						
							
							
								
								Update Spanish Translations  
							
							
							
						 
						
							2014-06-05 00:07:43 +02:00