iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6c3ea7f2bd 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-29 23:26:41 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f2bf64d19d 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-29 23:20:01 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							48604a6620 
							
						 
					 
					
						
						
							
							Use Material Design Icons on API 21+  
						
						
						
					 
					
						2015-01-29 15:28:26 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0eeead495f 
							
						 
					 
					
						
						
							
							properly clear notifications.  fixed   #921  
						
						
						
					 
					
						2015-01-29 13:20:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c237a55093 
							
						 
					 
					
						
						
							
							Merge pull request  #941  from SamWhited/snackbar_ordering  
						
						... 
						
						
						
						Show errors before mute snackbar 
						
					 
					
						2015-01-28 13:08:26 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3c64839daf 
							
						 
					 
					
						
						
							
							fixed broken caps  
						
						
						
					 
					
						2015-01-28 00:28:00 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8cbf610bb2 
							
						 
					 
					
						
						
							
							Show errors before mute snackbar  
						
						... 
						
						
						
						See #939  
						
					 
					
						2015-01-27 08:49:03 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8b662e7f8 
							
						 
					 
					
						
						
							
							muc tics for consistency  
						
						
						
					 
					
						2015-01-26 01:25:47 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2a14a0d9b8 
							
						 
					 
					
						
						
							
							changed version code and version name to 1.0-beta2  
						
						
						
					 
					
						2015-01-26 00:50:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							91e85d2faf 
							
						 
					 
					
						
						
							
							adapt caps on whether or not message confirmation is on  
						
						
						
					 
					
						2015-01-26 00:48:56 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							94086bb9b7 
							
						 
					 
					
						
						
							
							don't put ejabberds status code muc messages into an actual conversation  
						
						
						
					 
					
						2015-01-26 00:26:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f0d428a56d 
							
						 
					 
					
						
						
							
							made connect time out more failsave  
						
						
						
					 
					
						2015-01-25 20:52:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4afdd6480a 
							
						 
					 
					
						
						
							
							Merge pull request  #930  from betheg/otr  
						
						... 
						
						
						
						otr: switch to the otr-state the partner alternate. 
						
					 
					
						2015-01-25 20:53:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1559144701 
							
						 
					 
					
						
						
							
							Merge pull request  #933  from betheg/mergeable  
						
						... 
						
						
						
						fix mergable() for /me command. 
						
					 
					
						2015-01-25 19:30:00 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							29331e49b9 
							
						 
					 
					
						
						
							
							fix mergable() for /me command.  
						
						
						
					 
					
						2015-01-25 16:58:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							14fc520ec0 
							
						 
					 
					
						
						
							
							updated translations  
						
						
						
					 
					
						2015-01-25 16:36:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							82a74fabc9 
							
						 
					 
					
						
						
							
							set jingle file transfer to offer after iq offer has returned  
						
						
						
					 
					
						2015-01-25 16:32:59 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							0f3fb3ab43 
							
						 
					 
					
						
						
							
							Czech translation  
						
						... 
						
						
						
						for "hide offline" added 
						
					 
					
						2015-01-25 16:18:09 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							7800647885 
							
						 
					 
					
						
						
							
							otr: switch to the otr-state the partner alternate.  
						
						... 
						
						
						
						should also fixed  #877  
						
					 
					
						2015-01-25 13:07:31 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							8041d23cb1 
							
						 
					 
					
						
						
							
							MessageParser: fix the regex for otr query messages.  
						
						
						
					 
					
						2015-01-24 16:19:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7769d305e6 
							
						 
					 
					
						
						
							
							Merge pull request  #924  from andersruneson/changeonlinecolor  
						
						... 
						
						
						
						Changed online color to green instead of primary 
						
					 
					
						2015-01-24 00:28:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b9af38464e 
							
						 
					 
					
						
						
							
							fixed mam to work with muc  
						
						
						
					 
					
						2015-01-24 00:22:51 +01:00 
						 
				 
			
				
					
						
							
							
								Anders Sandblad 
							
						 
					 
					
						
						
						
						
							
						
						
							cbebd14dbd 
							
						 
					 
					
						
						
							
							Changed online color to green instead of primary  
						
						
						
					 
					
						2015-01-23 22:28:10 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4e50098e31 
							
						 
					 
					
						
						
							
							show checkbox to hide offline contacts  
						
						
						
					 
					
						2015-01-21 17:24:02 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2dc69eea68 
							
						 
					 
					
						
						
							
							fixed bug in find conference in database method  
						
						
						
					 
					
						2015-01-21 16:18:57 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							00c74503ab 
							
						 
					 
					
						
						
							
							deal with user entering full jids in join conference dialog  
						
						
						
					 
					
						2015-01-21 16:18:38 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							be9af442ef 
							
						 
					 
					
						
						
							
							always allow access to contact details. provide add button in contact details  
						
						
						
					 
					
						2015-01-21 15:31:40 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							764ef3c8cd 
							
						 
					 
					
						
						
							
							Add block/unblock to contact details menu  
						
						... 
						
						
						
						See #889  
						
					 
					
						2015-01-21 13:07:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							818c0e609c 
							
						 
					 
					
						
						
							
							Merge pull request  #908  from betheg/otr4j  
						
						... 
						
						
						
						otr4j: update to 0.22 
						
					 
					
						2015-01-21 11:48:42 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e42e0f88e1 
							
						 
					 
					
						
						
							
							Add color / category to foreground notification  
						
						
						
					 
					
						2015-01-20 20:32:27 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7839438f51 
							
						 
					 
					
						
						
							
							changed message duplicate finder  
						
						
						
					 
					
						2015-01-20 22:54:58 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6dc53c2b35 
							
						 
					 
					
						
						
							
							fixed missing image preview  
						
						
						
					 
					
						2015-01-20 22:54:26 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							04f4680582 
							
						 
					 
					
						
						
							
							fixed up button on v21 devices  
						
						
						
					 
					
						2015-01-20 22:53:45 +01:00 
						 
				 
			
				
					
						
							
							
								Michael 
							
						 
					 
					
						
						
						
						
							
						
						
							fa7d748c3f 
							
						 
					 
					
						
						
							
							otr4j: update to 0.22  
						
						
						
					 
					
						2015-01-20 18:01:39 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							32a16137df 
							
						 
					 
					
						
						
							
							Fixed action bar search for Android 5.0  
						
						
						
					 
					
						2015-01-20 14:53:47 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							7e4053abff 
							
						 
					 
					
						
						
							
							Czech translation updated  
						
						... 
						
						
						
						for Conversations 
						
					 
					
						2015-01-19 19:07:43 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							503237087f 
							
						 
					 
					
						
						
							
							Remove legacy SSL support  
						
						
						
					 
					
						2015-01-19 11:02:13 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1e607d7b1b 
							
						 
					 
					
						
						
							
							don't trim bodies  
						
						
						
					 
					
						2015-01-19 12:15:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c5d087ad55 
							
						 
					 
					
						
						
							
							fetched translations from transifex  
						
						
						
					 
					
						2015-01-19 12:14:55 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4cbf8120f5 
							
						 
					 
					
						
						
							
							fixed legacy translation of image received  
						
						
						
					 
					
						2015-01-19 12:14:30 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e5dffcfb07 
							
						 
					 
					
						
						
							
							added changelog for 1.0  
						
						
						
					 
					
						2015-01-19 11:32:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							100ba6e7e7 
							
						 
					 
					
						
						
							
							check for deleted files when loading more messages from history  
						
						
						
					 
					
						2015-01-19 11:23:05 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							7af588c8b3 
							
						 
					 
					
						
						
							
							account for rounding errors when rescheduling wake up  
						
						
						
					 
					
						2015-01-19 11:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fc2e458053 
							
						 
					 
					
						
						
							
							fixed bug when sharing files from google drive  
						
						
						
					 
					
						2015-01-18 20:27:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							149a6716b8 
							
						 
					 
					
						
						
							
							proper desc for offering and sending images in conversations overview  
						
						
						
					 
					
						2015-01-18 20:26:22 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6756386eee 
							
						 
					 
					
						
						
							
							explain read marker  
						
						
						
					 
					
						2015-01-18 13:44:18 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d58fadd05f 
							
						 
					 
					
						
						
							
							use same helper methods for images and files  
						
						
						
					 
					
						2015-01-18 13:00:57 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d453e5501b 
							
						 
					 
					
						
						
							
							Merge pull request  #899  from SamWhited/api21_notifications  
						
						... 
						
						
						
						Add some Android 21 notification features 
						
					 
					
						2015-01-18 11:58:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							78ac43cfa2 
							
						 
					 
					
						
						
							
							Merge pull request  #901  from kriztan/patch-2  
						
						... 
						
						
						
						Added new file type names for file transfers 
						
					 
					
						2015-01-18 11:57:34 +01:00 
						 
				 
			
				
					
						
							
							
								Christian S 
							
						 
					 
					
						
						
						
						
							
						
						
							ae16439bd6 
							
						 
					 
					
						
						
							
							Added new file type names for file transfers  
						
						... 
						
						
						
						- apk
- vcard 
						
					 
					
						2015-01-18 11:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							99989cd1d5 
							
						 
					 
					
						
						
							
							Add some Android 21 notification features  
						
						
						
					 
					
						2015-01-17 23:41:57 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							83c806a774 
							
						 
					 
					
						
						
							
							Fix string substitutions with unknown filetypes  
						
						
						
					 
					
						2015-01-17 20:53:25 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							dfc1cea882 
							
						 
					 
					
						
						
							
							Correct the download file string on notifications  
						
						... 
						
						
						
						Fixes  #896  
					
						2015-01-17 09:11:04 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							edd58f19b4 
							
						 
					 
					
						
						
							
							Add download button on notification if applicable  
						
						
						
					 
					
						2015-01-16 01:10:01 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							dc8b467cf6 
							
						 
					 
					
						
						
							
							sending read marker when resuming activity and conversation is open  
						
						
						
					 
					
						2015-01-15 16:32:24 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c0993a9acb 
							
						 
					 
					
						
						
							
							show toast when avatar has been published -  fixed   #874  
						
						
						
					 
					
						2015-01-15 16:26:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							994c9495ba 
							
						 
					 
					
						
						
							
							added dedicated button to disable foreground service in perma notification  
						
						
						
					 
					
						2015-01-15 16:17:55 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							351e5d7065 
							
						 
					 
					
						
						
							
							fixed   #888  
						
						
						
					 
					
						2015-01-15 15:45:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a3f9f30a6c 
							
						 
					 
					
						
						
							
							Merge pull request  #885  from SamWhited/display-enter-key  
						
						... 
						
						
						
						Add option to swap enter/emoticon key 
						
					 
					
						2015-01-14 22:54:02 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a6a9ed4877 
							
						 
					 
					
						
						
							
							handle muc nicks with white spaces.  fixed   #884  
						
						
						
					 
					
						2015-01-14 22:48:14 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0a96bec3c1 
							
						 
					 
					
						
						
							
							Add option to swap enter/emoticon key  
						
						
						
					 
					
						2015-01-14 16:14:14 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							548a585b2c 
							
						 
					 
					
						
						
							
							Harden the TLS connection cipher suites  
						
						
						
					 
					
						2015-01-14 13:10:15 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a88824bb1d 
							
						 
					 
					
						
						
							
							Merge pull request  #882  from SamWhited/apiandjavafixes  
						
						... 
						
						
						
						Type safety and deprecated API forward-compatibility fixes for Notifications 
						
					 
					
						2015-01-14 10:47:37 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							caf861d96f 
							
						 
					 
					
						
						
							
							Ensure type safety in Pebble notifications  
						
						... 
						
						
						
						Also use forward-compatible screen-on detection 
						
					 
					
						2015-01-13 23:18:35 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							acb3aed99c 
							
						 
					 
					
						
						
							
							Fix bottom padding on about page  
						
						
						
					 
					
						2015-01-13 21:29:47 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							7d2a9624b5 
							
						 
					 
					
						
						
							
							make use of different dimensions for different screen sizes  
						
						
						
					 
					
						2015-01-13 11:52:41 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1262a7cba7 
							
						 
					 
					
						
						
							
							Merge pull request  #872  from Elinvention/development  
						
						... 
						
						
						
						Updated Italian translations 
						
					 
					
						2015-01-13 10:48:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1fac4754d8 
							
						 
					 
					
						
						
							
							Merge pull request  #873  from SamWhited/about-margin-fix  
						
						... 
						
						
						
						Use margin instead of padding on about screen 
						
					 
					
						2015-01-13 10:12:33 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d9c2fa39cd 
							
						 
					 
					
						
						
							
							Use margin instead of padding in about screen  
						
						
						
					 
					
						2015-01-12 23:08:26 -05:00 
						 
				 
			
				
					
						
							
							
								Elia 
							
						 
					 
					
						
						
						
						
							
						
						
							8f6ee1fe22 
							
						 
					 
					
						
						
							
							Updated Italian translations  
						
						
						
					 
					
						2015-01-13 01:32:51 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							c920a09a0c 
							
						 
					 
					
						
						
							
							Czech translation  
						
						... 
						
						
						
						updated 
						
					 
					
						2015-01-12 20:07:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							dd5101ff5c 
							
						 
					 
					
						
						
							
							catch bug in guessContentType  
						
						
						
					 
					
						2015-01-12 18:40:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d3323e384 
							
						 
					 
					
						
						
							
							context menu for files and offered files.  fixed   #848   fixed   #849  
						
						
						
					 
					
						2015-01-12 16:42:20 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							77e4e1c2ac 
							
						 
					 
					
						
						
							
							reworked message preview / message meta information (ie file offered, received * file)  
						
						... 
						
						
						
						fixed  #837  
					
						2015-01-12 16:09:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							50c8065015 
							
						 
					 
					
						
						
							
							Merge pull request  #866  from SamWhited/xep0245  
						
						... 
						
						
						
						Add XEP-0245 (/me command) support 
						
					 
					
						2015-01-12 01:22:40 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5224251c 
							
						 
					 
					
						
						
							
							Add XEP-0245 (/me command) support  
						
						
						
					 
					
						2015-01-11 18:32:00 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef6e4c5dd5 
							
						 
					 
					
						
						
							
							do not check image file size over http if accepted file size is 0  
						
						
						
					 
					
						2015-01-11 22:18:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b07b7519a6 
							
						 
					 
					
						
						
							
							keep proper image file extension  
						
						
						
					 
					
						2015-01-11 15:19:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0aa50cb5a1 
							
						 
					 
					
						
						
							
							shortened some string  
						
						
						
					 
					
						2015-01-11 01:01:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e34bc920e4 
							
						 
					 
					
						
						
							
							fixed   #860  
						
						
						
					 
					
						2015-01-10 23:56:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							18eb187949 
							
						 
					 
					
						
						
							
							make room persistant when changing subject or other muc options  
						
						
						
					 
					
						2015-01-10 23:10:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							158f5dd17c 
							
						 
					 
					
						
						
							
							don't crash when selecting a conversation by uuid did not work  
						
						
						
					 
					
						2015-01-10 19:43:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c89fdec0b1 
							
						 
					 
					
						
						
							
							fixed regression in tablet ui  
						
						
						
					 
					
						2015-01-09 22:24:50 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							06eae476ee 
							
						 
					 
					
						
						
							
							Introduced expert options to control enter-is-send  
						
						... 
						
						
						
						(default == off) 
						
					 
					
						2015-01-09 19:23:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0a48f777ac 
							
						 
					 
					
						
						
							
							code cleanup for jingle proxy discovery  
						
						
						
					 
					
						2015-01-09 14:42:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d9f88c4669 
							
						 
					 
					
						
						
							
							ensure that everyone is member before making a room private  
						
						
						
					 
					
						2015-01-09 13:28:01 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							734a9934a3 
							
						 
					 
					
						
						
							
							make project translatable via transifex  
						
						
						
					 
					
						2015-01-09 02:06:03 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ffa97c48f5 
							
						 
					 
					
						
						
							
							added missing drawables  
						
						
						
					 
					
						2015-01-08 23:02:31 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a9159568b9 
							
						 
					 
					
						
						
							
							allow for very basic muc configuration  
						
						
						
					 
					
						2015-01-08 21:29:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0fe193b027 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2015-01-08 14:45:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8aa1bfec4 
							
						 
					 
					
						
						
							
							kick after ban  
						
						
						
					 
					
						2015-01-08 01:23:53 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f8dc59be81 
							
						 
					 
					
						
						
							
							fixed german translation  
						
						
						
					 
					
						2015-01-08 00:41:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							061de5205e 
							
						 
					 
					
						
						
							
							some clean ups for affiliation change context menu  
						
						
						
					 
					
						2015-01-08 00:23:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							cff9a937f2 
							
						 
					 
					
						
						
							
							Merge pull request  #851  from kriztan/patch-2  
						
						... 
						
						
						
						Updated German translations for more muc options 
						
					 
					
						2015-01-07 23:53:36 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							20aa7bea47 
							
						 
					 
					
						
						
							
							Merge pull request  #852  from SamWhited/ellipsis  
						
						... 
						
						
						
						s/.../…/ in CS strings 
						
					 
					
						2015-01-07 23:53:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8505102cee 
							
						 
					 
					
						
						
							
							Merge pull request  #850  from plsng/dutch  
						
						... 
						
						
						
						Update Dutch translations 
						
					 
					
						2015-01-07 23:53:08 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e1ea20b392 
							
						 
					 
					
						
						
							
							s/.../…/ in CS strings  
						
						... 
						
						
						
						[ci skip] 
						
					 
					
						2015-01-07 13:42:49 -05:00 
						 
				 
			
				
					
						
							
							
								Christian S. 
							
						 
					 
					
						
						
						
						
							
						
						
							45c1e88a08 
							
						 
					 
					
						
						
							
							Updated German translations for more muc options  
						
						
						
					 
					
						2015-01-07 19:06:18 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Follens 
							
						 
					 
					
						
						
						
						
							
						
						
							c9dc82d134 
							
						 
					 
					
						
						
							
							Update Dutch translations  
						
						
						
					 
					
						2015-01-07 18:49:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d655f445a 
							
						 
					 
					
						
						
							
							more muc options  
						
						... 
						
						
						
						* show invite button only with admin privileges or on public conferences
* Offer to ban user in public conferences.
Thanks to @betheg for the awesome ground work for this 
						
					 
					
						2015-01-07 18:34:24 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d70b5f93f3 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-07 18:32:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8ab19faddd 
							
						 
					 
					
						
						
							
							Merge pull request  #847  from kriztan/patch-1  
						
						... 
						
						
						
						Updated German translations... 
						
					 
					
						2015-01-07 18:30:16 +01:00 
						 
				 
			
				
					
						
							
							
								Christian S 
							
						 
					 
					
						
						
						
						
							
						
						
							9d43ddbf59 
							
						 
					 
					
						
						
							
							Updated German translations...  
						
						... 
						
						
						
						...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation?
I've changed the translations.
Updated German translations...
Updated German translations... 
						
					 
					
						2015-01-07 18:08:18 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0ad8796b44 
							
						 
					 
					
						
						
							
							fixed invites  
						
						
						
					 
					
						2015-01-07 16:45:44 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							af1410b02a 
							
						 
					 
					
						
						
							
							Merge pull request  #845  from SamWhited/material  
						
						... 
						
						
						
						Add materials theme for v21 devices 
						
					 
					
						2015-01-07 15:57:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef525fb10e 
							
						 
					 
					
						
						
							
							basic affiliation changes in muc  
						
						
						
					 
					
						2015-01-07 15:03:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							81e9afdf19 
							
						 
					 
					
						
						
							
							reset next encryption when archiving conversations  
						
						
						
					 
					
						2015-01-07 12:20:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							943a01b9bf 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-07 10:49:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a7ee9cc41b 
							
						 
					 
					
						
						
							
							Merge pull request  #846  from kruks23/translation4  
						
						... 
						
						
						
						Update spanish translation 
						
					 
					
						2015-01-07 10:28:37 +01:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							a1a2a39108 
							
						 
					 
					
						
						
							
							Update affiliation in MUC details and advance mode  
						
						
						
					 
					
						2015-01-07 08:50:19 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							45bb59dba8 
							
						 
					 
					
						
						
							
							Add materials theme  
						
						
						
					 
					
						2015-01-06 21:37:49 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a22c8c04d8 
							
						 
					 
					
						
						
							
							use copyonwritearraylist in for phone helper  
						
						
						
					 
					
						2015-01-07 01:01:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d502e57661 
							
						 
					 
					
						
						
							
							refactored UiHelper  
						
						
						
					 
					
						2015-01-07 00:59:42 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							066f60a23c 
							
						 
					 
					
						
						
							
							Czech translation for - show affiliation instead of role in MucDetails  
						
						
						
					 
					
						2015-01-06 21:15:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f02f510c18 
							
						 
					 
					
						
						
							
							fixed bug in new ping strategy  
						
						
						
					 
					
						2015-01-06 19:46:52 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							353f4e38bb 
							
						 
					 
					
						
						
							
							mark sent images as sent_received instead of sent  
						
						... 
						
						
						
						fixed  #842  
					
						2015-01-06 18:44:34 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8a3ccfd456 
							
						 
					 
					
						
						
							
							Merge pull request  #841  from BenoitBouvarel/patch-2  
						
						... 
						
						
						
						Update strings.xml 
						
					 
					
						2015-01-06 18:33:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							562699c745 
							
						 
					 
					
						
						
							
							run invalidateOptionsMenu on uiThread  
						
						
						
					 
					
						2015-01-06 18:26:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4b0043ba91 
							
						 
					 
					
						
						
							
							fixed potential NPEs in ShareWithActivity  
						
						
						
					 
					
						2015-01-06 18:25:31 +01:00 
						 
				 
			
				
					
						
							
							
								Benoit Bouvarel 
							
						 
					 
					
						
						
						
						
							
						
						
							352af145f8 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						... 
						
						
						
						char ">" was missing at line 285 
						
					 
					
						2015-01-06 01:23:51 +01:00 
						 
				 
			
				
					
						
							
							
								Benoit Bouvarel 
							
						 
					 
					
						
						
						
						
							
						
						
							f8758b7bd5 
							
						 
					 
					
						
						
							
							Update strings.xml  
						
						... 
						
						
						
						French translation updated 
						
					 
					
						2015-01-05 23:42:37 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							777e060100 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2015-01-05 18:47:04 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fdcbdfdc05 
							
						 
					 
					
						
						
							
							added debug info + possible platform bug work arounds to message adapter  
						
						
						
					 
					
						2015-01-05 18:46:42 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c51245ff5 
							
						 
					 
					
						
						
							
							reworked ping scheduling strategy. very experimental  
						
						
						
					 
					
						2015-01-05 18:45:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							85f24c9106 
							
						 
					 
					
						
						
							
							avoid requesting blocklist after stream resumption  
						
						
						
					 
					
						2015-01-05 16:17:05 +01:00 
						 
				 
			
				
					
						
							
							
								Christian Schneppe 
							
						 
					 
					
						
						
						
						
							
						
						
							47a8a39595 
							
						 
					 
					
						
						
							
							corrected German spellings  
						
						... 
						
						
						
						and shorten some strings 
						
					 
					
						2015-01-05 15:59:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2679824770 
							
						 
					 
					
						
						
							
							prevent QR code parser from crashing  fixed   #839  
						
						
						
					 
					
						2015-01-05 15:08:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bdb335e6b0 
							
						 
					 
					
						
						
							
							Show affiliation instead of role in MucDetails and offer 'advanced mode' to display role  
						
						
						
					 
					
						2015-01-05 15:06:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8264474a0c 
							
						 
					 
					
						
						
							
							Merge pull request  #838  from shtrom/pebble-notifications-squash  
						
						... 
						
						
						
						Send notification to Pebble on new message 
						
					 
					
						2015-01-05 13:14:48 +01:00 
						 
				 
			
				
					
						
							
							
								Olivier Mehani 
							
						 
					 
					
						
						
						
						
							
						
						
							f1ebece866 
							
						 
					 
					
						
						
							
							Send notification to Pebble on new message  
						
						... 
						
						
						
						This implements basic notifications to the Pebble through the app (using
an intent).  This simply hooks into NotificationService.notify().
This is pretty basic, but it works (I haven't tested to see how the
intent is received when the Pebble app is not around, though). More
fancy stuff could probably be added to avoid getting flooded, but the
Pebble app already does a good job a filtering notification (e.g.,
screen on or quiet times).
Signed-off-by: Olivier Mehani <shtrom@ssji.net> 
						
					 
					
						2015-01-05 23:06:46 +11:00 
						 
				 
			
				
					
						
							
							
								Christian Schneppe 
							
						 
					 
					
						
						
						
						
							
						
						
							ddee804a01 
							
						 
					 
					
						
						
							
							Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB  
						
						
						
					 
					
						2015-01-05 12:46:13 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2723c9ccb9 
							
						 
					 
					
						
						
							
							made checks for valid image extensions case insensitive  
						
						
						
					 
					
						2015-01-04 23:04:23 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3522243835 
							
						 
					 
					
						
						
							
							do not run mam queries in findOrCreateConversation() when isn't available  
						
						
						
					 
					
						2015-01-04 18:16:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e6cd92a663 
							
						 
					 
					
						
						
							
							added higher auto accept file sizes  
						
						... 
						
						
						
						also changed labeling to MiB and KiB 
						
					 
					
						2015-01-04 17:53:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0d6d09b7e9 
							
						 
					 
					
						
						
							
							code cleanup + logging of spoofed iq packets  
						
						
						
					 
					
						2015-01-04 15:40:09 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							88704ce5cd 
							
						 
					 
					
						
						
							
							Verify IQ responses  
						
						... 
						
						
						
						Fixes  #20 
Move fromServer/toServer to AbstractStanza 
					
						2015-01-04 08:28:13 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							eb7e683403 
							
						 
					 
					
						
						
							
							Make IqPacket type an enum  
						
						
						
					 
					
						2015-01-04 08:20:30 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							00fdac42a9 
							
						 
					 
					
						
						
							
							Merge pull request  #832  from svetlemodry/development  
						
						... 
						
						
						
						Czech translation update 
						
					 
					
						2015-01-04 12:45:48 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							3a4fbcd4cc 
							
						 
					 
					
						
						
							
							Czech translation update  
						
						
						
					 
					
						2015-01-04 12:43:32 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5c190487bc 
							
						 
					 
					
						
						
							
							deal with prosodys muc namespace tagging of messages  
						
						
						
					 
					
						2015-01-04 12:37:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e32a927300 
							
						 
					 
					
						
						
							
							Use packet callbacks only for IqPackets. Removed unnecessary code  
						
						
						
					 
					
						2015-01-04 12:09:39 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							51f5b84ee4 
							
						 
					 
					
						
						
							
							Merge pull request  #829  from kriztan/patch-1  
						
						... 
						
						
						
						corrected German 'private_message_to' 
						
					 
					
						2015-01-04 11:28:38 +01:00 
						 
				 
			
				
					
						
							
							
								sergio 
							
						 
					 
					
						
						
						
						
							
						
						
							c674e9c3e9 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						
						
					 
					
						2015-01-04 11:24:53 +01:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							b739a0d200 
							
						 
					 
					
						
						
							
							corrected German 'private_message_to'  
						
						
						
					 
					
						2015-01-04 11:16:21 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f338d89753 
							
						 
					 
					
						
						
							
							no longer use ConcurrentHashMap in favor of synchronize on a final HashMap  
						
						
						
					 
					
						2015-01-04 00:14:40 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							4f4eff2353 
							
						 
					 
					
						
						
							
							Merge branch 'development'  
						
						
						
					 
					
						2015-01-03 22:39:50 +01:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							58b7e71e58 
							
						 
					 
					
						
						
							
							Added and modified German translations  
						
						
						
					 
					
						2015-01-03 19:35:58 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							e89e54a04a 
							
						 
					 
					
						
						
							
							version bump to 0.10  
						
						
						
					 
					
						2015-01-03 19:11:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fc8bd64bfd 
							
						 
					 
					
						
						
							
							void messages getting reloaded through mam after clear history  
						
						
						
					 
					
						2015-01-03 18:22:26 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							be7de054be 
							
						 
					 
					
						
						
							
							record voice and attachment refactor  
						
						
						
					 
					
						2015-01-03 16:06:59 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							960b7343d3 
							
						 
					 
					
						
						
							
							disable / enable all accounts  
						
						
						
					 
					
						2015-01-03 13:36:48 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							521c289db1 
							
						 
					 
					
						
						
							
							update last presence only for messages  
						
						
						
					 
					
						2015-01-03 13:01:38 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							715c8545f4 
							
						 
					 
					
						
						
							
							added missing layout file  
						
						
						
					 
					
						2015-01-03 10:35:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8bda54d48c 
							
						 
					 
					
						
						
							
							code cleanup  
						
						
						
					 
					
						2015-01-03 00:47:22 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							969044b113 
							
						 
					 
					
						
						
							
							migrated change password into separate activity  
						
						
						
					 
					
						2015-01-03 00:11:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							1988e244ef 
							
						 
					 
					
						
						
							
							some further otr improvements  
						
						
						
					 
					
						2015-01-02 15:14:06 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f58f27a1f7 
							
						 
					 
					
						
						
							
							click on dynamic tag to filter for that tag  
						
						
						
					 
					
						2015-01-02 14:47:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							093c5275c6 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/development' into development  
						
						
						
					 
					
						2015-01-02 14:28:02 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3df23a4f75 
							
						 
					 
					
						
						
							
							allow cancellation of waiting files  
						
						
						
					 
					
						2015-01-02 14:27:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							f178f23177 
							
						 
					 
					
						
						
							
							Merge pull request  #826  from kriztan/patch-1  
						
						... 
						
						
						
						Added German translations 
						
					 
					
						2015-01-02 12:15:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bcd3be59ce 
							
						 
					 
					
						
						
							
							put Conversations into background mode earlier  
						
						
						
					 
					
						2015-01-02 12:04:33 +01:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							eca826caf3 
							
						 
					 
					
						
						
							
							Added German translations  
						
						
						
					 
					
						2015-01-02 09:12:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8d2f454479 
							
						 
					 
					
						
						
							
							prefer PLAIN over DIGEST-MD5  
						
						... 
						
						
						
						DIGEST-MD5 seems to be broken for a lot of cases (OpenFire)
switched priority of PLAIN to not cause any security errors 
						
					 
					
						2015-01-02 01:39:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							bb3bf25523 
							
						 
					 
					
						
						
							
							fixed layout file  
						
						
						
					 
					
						2015-01-02 01:37:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3833e6dfef 
							
						 
					 
					
						
						
							
							improved OTR verification part one  
						
						
						
					 
					
						2015-01-02 01:21:14 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							b71740f0d4 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/development' into development  
						
						
						
					 
					
						2014-12-30 09:36:17 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							8f93f9c314 
							
						 
					 
					
						
						
							
							improved fromServer filter  
						
						
						
					 
					
						2014-12-30 09:36:00 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0882da2568 
							
						 
					 
					
						
						
							
							Make `app_name' string untranslatable  
						
						... 
						
						
						
						Remove untranslatable about message
Escape single quote in NL translation 
						
					 
					
						2014-12-29 19:38:47 -05:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							3c5d7d4f1b 
							
						 
					 
					
						
						
							
							refactor swithOverToTls stuff  
						
						
						
					 
					
						2014-12-30 01:17:11 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							fb8737ed9f 
							
						 
					 
					
						
						
							
							fixed npe in block menu item  
						
						
						
					 
					
						2014-12-30 01:16:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							c78dc5b494 
							
						 
					 
					
						
						
							
							fixed nl strings  
						
						
						
					 
					
						2014-12-30 01:15:12 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							04de77261b 
							
						 
					 
					
						
						
							
							fixed   #818  
						
						
						
					 
					
						2014-12-30 01:13:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5df8e6a5b3 
							
						 
					 
					
						
						
							
							Merge pull request  #812  from kriztan/patch-1  
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-12-30 00:22:49 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							55b84d0895 
							
						 
					 
					
						
						
							
							Merge pull request  #813  from plsng/translation  
						
						... 
						
						
						
						Update Dutch translations 
						
					 
					
						2014-12-30 00:22:33 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							d1d4e361ad 
							
						 
					 
					
						
						
							
							Merge pull request  #814  from kruks23/translation1  
						
						... 
						
						
						
						Update spanish translations 
						
					 
					
						2014-12-30 00:22:02 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Follens 
							
						 
					 
					
						
						
						
						
							
						
						
							800520b27b 
							
						 
					 
					
						
						
							
							Update Dutch translations  
						
						
						
					 
					
						2014-12-29 23:08:07 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							b48bddb852 
							
						 
					 
					
						
						
							
							Fix typo in method name  
						
						
						
					 
					
						2014-12-29 14:21:20 -05:00 
						 
				 
			
				
					
						
							
							
								sergio 
							
						 
					 
					
						
						
						
						
							
						
						
							164c41661e 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						
						
					 
					
						2014-12-27 13:04:37 +01:00 
						 
				 
			
				
					
						
							
							
								Nathan Follens 
							
						 
					 
					
						
						
						
						
							
						
						
							4a8342a378 
							
						 
					 
					
						
						
							
							Update Dutch translations  
						
						
						
					 
					
						2014-12-27 12:53:15 +01:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							3b3d51b39a 
							
						 
					 
					
						
						
							
							Update german translations  
						
						
						
					 
					
						2014-12-27 10:42:15 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							193d2645e6 
							
						 
					 
					
						
						
							
							code cleanup for change password stuff  
						
						
						
					 
					
						2014-12-25 22:28:19 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							0c22a8d1c6 
							
						 
					 
					
						
						
							
							added callback to change account password to notify UI on success / failure  
						
						
						
					 
					
						2014-12-25 22:08:13 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e4d9dca2fe 
							
						 
					 
					
						
						
							
							Add ability to change password on server  
						
						... 
						
						
						
						Fixes  #260  
					
						2014-12-25 21:38:55 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							2081c1bef7 
							
						 
					 
					
						
						
							
							proper call to invalidateViews()  
						
						
						
					 
					
						2014-12-25 19:53:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							ef1f72ea27 
							
						 
					 
					
						
						
							
							catch another exception in fingerprint generation  
						
						
						
					 
					
						2014-12-25 19:53:35 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							94aeca7c8a 
							
						 
					 
					
						
						
							
							Merge pull request  #810  from kriztan/patch-2  
						
						... 
						
						
						
						Update german translations 
						
					 
					
						2014-12-25 10:23:03 +01:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							3b127ab743 
							
						 
					 
					
						
						
							
							Update german translations  
						
						
						
					 
					
						2014-12-25 09:14:34 +01:00 
						 
				 
			
				
					
						
							
							
								pulser 
							
						 
					 
					
						
						
						
						
							
						
						
							3ada834839 
							
						 
					 
					
						
						
							
							Show server info option when blocking is unavailable  
						
						... 
						
						
						
						Current head of development branch doesn't show server information if
blocking is disabled. This is due to slightly wrong logic on an if
statement. This patch ensures only the blocking option is disabled when
blocking is not supported by the server, and that the feature remains
available. 
						
					 
					
						2014-12-24 20:54:56 +00:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							afbe727b17 
							
						 
					 
					
						
						
							
							Don't allow user to register domain only jids  
						
						
						
					 
					
						2014-12-23 17:35:36 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							8a467e33dd 
							
						 
					 
					
						
						
							
							Don't show menu on create account screen  
						
						
						
					 
					
						2014-12-23 17:12:52 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							d454788011 
							
						 
					 
					
						
						
							
							Remove old JID validator  
						
						
						
					 
					
						2014-12-23 13:23:13 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							01107e31ae 
							
						 
					 
					
						
						
							
							Add more server compatibility info.  
						
						... 
						
						
						
						Hide server info behind a checkbox.
Add XEP-0352 support to the server info list
Add XEP-0237 to server info list
Add XEP-0352 support to the server info list
Add MaM and Blocking to the account XEPs list
Also add a toggle button to hide some of the list
Rebase on current codebase
Make MAM string more descriptive
Change show more button to checkbox menu item
Shorten `MAM (History)' to `MAM'
Order XEP list and hide all by default
Supress warning (which is wrong anyways)
Change `Show more' to `Show more info' 
						
					 
					
						2014-12-23 12:44:30 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							d5f99560ff 
							
						 
					 
					
						
						
							
							made method private that is no longer required to be public  
						
						
						
					 
					
						2014-12-23 18:09:29 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e152ed1e07 
							
						 
					 
					
						
						
							
							Simplify roster handling code  
						
						... 
						
						
						
						Merge result handling code into IqParser
Fixes  #20  
						
					 
					
						2014-12-22 12:53:31 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							e1cb72b9ef 
							
						 
					 
					
						
						
							
							Fix NPEs in blocking code  
						
						
						
					 
					
						2014-12-22 11:24:08 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							af7a64491f 
							
						 
					 
					
						
						
							
							Add support for XEP-0191 (Blocking command)  
						
						... 
						
						
						
						Fixes  #791 
Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1 
					
						2014-12-22 08:19:00 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1517641713 
							
						 
					 
					
						
						
							
							get rid of special self presence object and incorporate that into roster  
						
						
						
					 
					
						2014-12-20 17:23:03 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ce4848f742 
							
						 
					 
					
						
						
							
							more null checks for otr fingerprints  
						
						
						
					 
					
						2014-12-20 16:01:28 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							40335785aa 
							
						 
					 
					
						
						
							
							don't include empty fingerprints in list of otrfingerprints  
						
						
						
					 
					
						2014-12-20 15:21:03 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6b047bed97 
							
						 
					 
					
						
						
							
							fixed another break continue bug  
						
						
						
					 
					
						2014-12-20 12:52:45 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							88f43643bf 
							
						 
					 
					
						
						
							
							inject ui callback into running mam query  
						
						
						
					 
					
						2014-12-20 12:52:08 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							675bac7255 
							
						 
					 
					
						
						
							
							Merge pull request  #794  from svetlemodry/development  
						
						... 
						
						
						
						Czech image transfer string fix 
						
					 
					
						2014-12-20 12:14:11 +01:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							6dd75cbb07 
							
						 
					 
					
						
						
							
							Update spanish translations  
						
						
						
					 
					
						2014-12-20 10:54:23 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							c8cfd1b084 
							
						 
					 
					
						
						
							
							Czech image transfer string fix  
						
						
						
					 
					
						2014-12-19 22:50:43 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							a68cb5d364 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2014-12-19 13:40:35 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							627982df90 
							
						 
					 
					
						
						
							
							fixed   #755  
						
						
						
					 
					
						2014-12-19 13:40:16 +01:00 
						 
				 
			
				
					
						
							
							
								Jaroslav Lichtblau 
							
						 
					 
					
						
						
						
						
							
						
						
							7c4a306ae4 
							
						 
					 
					
						
						
							
							Czech translation updated  
						
						... 
						
						
						
						added missing strings 
						
					 
					
						2014-12-18 18:42:50 +01:00 
						 
				 
			
				
					
						
							
							
								kriztan 
							
						 
					 
					
						
						
						
						
							
						
						
							948112c2f3 
							
						 
					 
					
						
						
							
							Update german translations  
						
						
						
					 
					
						2014-12-18 12:10:03 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f00e168752 
							
						 
					 
					
						
						
							
							clean up conversation history after swtiching to a different conversation  
						
						
						
					 
					
						2014-12-17 21:05:47 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de952cc959 
							
						 
					 
					
						
						
							
							show error if jid couldn't be parsed in new contact dialog  
						
						
						
					 
					
						2014-12-17 21:04:54 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							c30108eb17 
							
						 
					 
					
						
						
							
							Merge branch 'development' of  https://github.com/siacs/Conversations  into development  
						
						
						
					 
					
						2014-12-17 10:51:28 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							741a0c129d 
							
						 
					 
					
						
						
							
							made scroling smoother + bug fixes for history loading  
						
						
						
					 
					
						2014-12-17 10:50:51 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							80435eca5c 
							
						 
					 
					
						
						
							
							smoothed out scrolling a bit  
						
						
						
					 
					
						2014-12-17 09:32:51 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							5603440a91 
							
						 
					 
					
						
						
							
							Merge pull request  #783  from SamWhited/quiet-hours  
						
						... 
						
						
						
						Update summary in TimePreference change listener 
						
					 
					
						2014-12-17 07:15:31 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1a7ed4ed7c 
							
						 
					 
					
						
						
							
							properly detect images in share with  
						
						
						
					 
					
						2014-12-17 07:12:38 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fd4cf499a2 
							
						 
					 
					
						
						
							
							Merge branch 'issue756' of  https://github.com/SamWhited/Conversations  into SamWhited-issue756  
						
						
						
					 
					
						2014-12-17 07:00:42 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							3f6638cb64 
							
						 
					 
					
						
						
							
							properly count mam messages  
						
						
						
					 
					
						2014-12-17 06:59:58 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							0b4987581f 
							
						 
					 
					
						
						
							
							Handle time comparisons using longs  
						
						
						
					 
					
						2014-12-16 18:03:16 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							6659339eff 
							
						 
					 
					
						
						
							
							Allow sending of any filetype via intent  
						
						... 
						
						
						
						Fixes  #756  
					
						2014-12-15 22:31:55 -05:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							f9c783085d 
							
						 
					 
					
						
						
							
							Update summary in TimePreference change listener  
						
						... 
						
						
						
						Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener. 
						
					 
					
						2014-12-15 17:46:32 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e2f50ab855 
							
						 
					 
					
						
						
							
							go through mam history page by page. load mam dynamically on scroll  
						
						
						
					 
					
						2014-12-15 23:06:29 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							03ca971e2e 
							
						 
					 
					
						
						
							
							Merge pull request  #782  from SamWhited/quiet-hours  
						
						... 
						
						
						
						Make some magic number constants final 
						
					 
					
						2014-12-15 19:28:21 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							ea61142d7e 
							
						 
					 
					
						
						
							
							Make some magic number constants final  
						
						
						
					 
					
						2014-12-15 11:39:18 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ab2187dbdf 
							
						 
					 
					
						
						
							
							fixed crashing on unparsed jids  
						
						
						
					 
					
						2014-12-15 17:36:16 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							183e31ade1 
							
						 
					 
					
						
						
							
							Merge branch 'quiet-hours' of  https://github.com/SamWhited/Conversations  into SamWhited-quiet-hours  
						
						
						
					 
					
						2014-12-15 17:35:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							e084266595 
							
						 
					 
					
						
						
							
							migrated more jid parsing to use getAttributeAsJid. added error logging  
						
						
						
					 
					
						2014-12-15 17:29:17 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							af0f8e87bb 
							
						 
					 
					
						
						
							
							Make silent notification when quiet hours are on  
						
						... 
						
						
						
						Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh! 
						
					 
					
						2014-12-15 11:23:50 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							25d8546ae8 
							
						 
					 
					
						
						
							
							Merge branch 'quiet-hours' of  https://github.com/SamWhited/Conversations  into SamWhited-quiet-hours  
						
						
						
					 
					
						2014-12-15 17:16:49 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2bd4621245 
							
						 
					 
					
						
						
							
							fixed history deletion.  fixed   #780  
						
						
						
					 
					
						2014-12-15 17:14:27 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							a6cfbf2f2d 
							
						 
					 
					
						
						
							
							Merge pull request  #775  from kruks23/translation1  
						
						... 
						
						
						
						Update spanish translations. 
						
					 
					
						2014-12-15 16:57:56 +01:00 
						 
				 
			
				
					
						
							
							
								Daniel Gultsch 
							
						 
					 
					
						
						
						
						
							
						
						
							16360242d1 
							
						 
					 
					
						
						
							
							Merge pull request  #781  from drizzt/patch-1  
						
						... 
						
						
						
						fixed typo in italian translation 
						
					 
					
						2014-12-15 16:57:48 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							209e62d68b 
							
						 
					 
					
						
						
							
							avoid npe on weird platform bugs  
						
						
						
					 
					
						2014-12-15 16:55:38 +01:00 
						 
				 
			
				
					
						
							
							
								drizzt 
							
						 
					 
					
						
						
						
						
							
						
						
							9f6537acdc 
							
						 
					 
					
						
						
							
							fixed typo in italian translation  
						
						... 
						
						
						
						s/gallaria/galleria/ 
						
					 
					
						2014-12-15 14:19:18 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f8a496a5f1 
							
						 
					 
					
						
						
							
							run mam queries only when online  
						
						
						
					 
					
						2014-12-14 23:23:56 +01:00 
						 
				 
			
				
					
						
							
							
								Sam Whited 
							
						 
					 
					
						
						
						
						
							
						
						
							a6d4b0aec5 
							
						 
					 
					
						
						
							
							Add quiet hours feature  
						
						
						
					 
					
						2014-12-14 15:07:41 -05:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							5cbae25808 
							
						 
					 
					
						
						
							
							more patches for dns helper  
						
						
						
					 
					
						2014-12-14 19:02:29 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							50410dad33 
							
						 
					 
					
						
						
							
							possible dns fixes  
						
						
						
					 
					
						2014-12-14 18:31:52 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							de06cb38d1 
							
						 
					 
					
						
						
							
							refactored the way certain messages are being found within a conversation  
						
						
						
					 
					
						2014-12-14 18:10:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							fc293aaede 
							
						 
					 
					
						
						
							
							avoiding concurrent modification  
						
						
						
					 
					
						2014-12-13 22:17:27 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							6148f04d7b 
							
						 
					 
					
						
						
							
							fixed regression  
						
						
						
					 
					
						2014-12-13 20:05:46 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							899802646c 
							
						 
					 
					
						
						
							
							reverse through mam history when loading larger chuncks  
						
						
						
					 
					
						2014-12-13 15:32:11 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							02a89f4ce2 
							
						 
					 
					
						
						
							
							Merge branch 'feature/mam' into development  
						
						... 
						
						
						
						Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java 
						
					 
					
						2014-12-13 13:55:24 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							2368ba518d 
							
						 
					 
					
						
						
							
							refactored phone contacts merger  
						
						
						
					 
					
						2014-12-13 13:52:57 +01:00 
						 
				 
			
				
					
						
							
							
								kruks23 
							
						 
					 
					
						
						
						
						
							
						
						
							1ffdae80a6 
							
						 
					 
					
						
						
							
							Update spanish translations.  
						
						
						
					 
					
						2014-12-13 13:24:17 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							b523518e4b 
							
						 
					 
					
						
						
							
							various mam improvments  
						
						
						
					 
					
						2014-12-13 12:25:52 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							f2510ae9f6 
							
						 
					 
					
						
						
							
							mark otr messages as no-store for mam  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							1dcdc79a71 
							
						 
					 
					
						
						
							
							changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack)  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							ccdb0fd971 
							
						 
					 
					
						
						
							
							save server id from mam messages. check for dups before adding mam  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							0ab530932a 
							
						 
					 
					
						
						
							
							added max history age (default 1w). automatically sort newly added mam messages  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00 
						 
				 
			
				
					
						
							
							
								iNPUTmice 
							
						 
					 
					
						
						
						
						
							
						
						
							4a94389f05 
							
						 
					 
					
						
						
							
							very basic mam support  
						
						
						
					 
					
						2014-12-10 14:08:06 +01:00