iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								d1076588f4
								
							
						 | 
						
							
							
								
								version bump to 1.0.2
							
							
							
							
							
						 | 
						
							2015-02-09 16:41:29 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								af0c979f45
								
							
						 | 
						
							
							
								
								disabled cipher logging
							
							
							
							
							
						 | 
						
							2015-02-09 16:41:13 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								c3260d620e
								
							
						 | 
						
							
							
								
								Merge pull request #959 from SamWhited/ciphers_fix
							
							
							
							
							
							
							
							Ciphers fix 
							
						 | 
						
							2015-02-09 16:04:54 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								026be61b72
								
							
						 | 
						
							
							
								
								don't show 'enter pgp key' in non encrypted chats
							
							
							
							
							
						 | 
						
							2015-02-09 16:01:30 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								16dc13e4df
								
							
						 | 
						
							
							
								
								always add a non resolved SRV record to the list
							
							
							
							
							
						 | 
						
							2015-02-09 11:54:20 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								ac309efcc8
								
							
						 | 
						
							
							
								
								made delay timestamp parser accept nano seconds
							
							
							
							
							
						 | 
						
							2015-02-09 11:53:35 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								ae8c021c16
								
							
						 | 
						
							
							
								
								sort users in muc
							
							
							
							
							
						 | 
						
							2015-02-07 12:29:32 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								00b2e30938
								
							
						 | 
						
							
							
								
								trim message bodys on display
							
							
							
							
							
						 | 
						
							2015-02-07 12:29:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e1e09d5cba
								
							
						 | 
						
							
							
								
								refactored how snackbar is displayed
							
							
							
							
							
						 | 
						
							2015-02-07 12:17:03 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								03d30e4fdb
								
							
						 | 
						
							
							
								
								Use platform ciphers as well, just prefer ours
							
							
							
							
							
						 | 
						
							2015-02-02 11:16:22 -05:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								ecbceae88b
								
							
						 | 
						
							
							
								
								version bump
							
							
							
							
							
						 | 
						
							2015-02-02 14:23:35 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								bd3fccd2dc
								
							
						 | 
						
							
							
								
								don't disable any ciphers
							
							
							
							
							
						 | 
						
							2015-02-02 14:22:49 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								206fd3fc4b
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2015-02-02 13:56:32 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								6674a3d757
								
							
						 | 
						
							
							
								
								added more ciphers for old openssl versions
							
							
							
							
							
						 | 
						
							2015-02-02 13:55:56 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								722031ab11
								
							
						 | 
						
							
							
								
								Merge pull request #956 from SamWhited/unused_resources
							
							
							
							
							
							
							
							Remove another unused resource 
							
						 | 
						
							2015-02-02 10:45:38 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								1650565bb0
								
							
						 | 
						
							
							
								
								Remove another unused resource
							
							
							
							
							
						 | 
						
							2015-02-01 16:02:59 -05:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								b5131bbd76
								
							
						 | 
						
							
							
								
								bumped version code again
							
							
							
							
							
						 | 
						
							2015-02-01 21:32:57 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								a4f4fe95ac
								
							
						 | 
						
							
							
								
								Merge pull request #955 from SamWhited/unused_resources
							
							
							
							
							
							
							
							Remove unused resources 
							
						 | 
						
							2015-02-01 17:41:42 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								e0af29f0a3
								
							
						 | 
						
							
							
								
								pulled spanish translations again
							
							
							
							
							
						 | 
						
							2015-02-01 17:33:36 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								735fc655e9
								
							
						 | 
						
							
							
								
								Remove unused resources
							
							
							
							
							
						 | 
						
							2015-02-01 11:32:11 -05:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								4e00798d41
								
							
						 | 
						
							
							
								
								mentioned material theme in changelog
							
							
							
							
							
						 | 
						
							2015-02-01 17:04:59 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								33530a9e30
								
							
						 | 
						
							
							
								
								pulled translations from transifex
							
							
							
							
							
						 | 
						
							2015-02-01 17:04:29 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f5b1f69936
								
							
						 | 
						
							
							
								
								Merge pull request #953 from SamWhited/remove_unused_strings
							
							
							
							
							
							
							
							Removes some unused strings (the legacy SSL stuff) 
							
						 | 
						
							2015-02-01 15:23:17 +01:00 | 
						
					
				
					
						
							
							
								 
								Sam Whited
							
						 | 
						
							
							
							
							
							
								
							
							
								ce5c6c6257
								
							
						 | 
						
							
							
								
								Removes some unused strings (the legacy SSL stuff)
							
							
							
							
							
						 | 
						
							2015-02-01 08:58:35 -05:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								d0e764c1a5
								
							
						 | 
						
							
							
								
								fixed text preview for images
							
							
							
							
							
						 | 
						
							2015-02-01 12:32:19 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								f542783761
								
							
						 | 
						
							
							
								
								Merge pull request #949 from kruks23/title_activity
							
							
							
							
							
							
							
							Remove title_activity_conversations and use app_name instead 
							
						 | 
						
							2015-02-01 09:37:40 +01:00 | 
						
					
				
					
						
							
							
								 
								kruks23
							
						 | 
						
							
							
							
							
							
								
							
							
								e76a9c06c3
								
							
						 | 
						
							
							
								
								Remove title_activity_conversations and use app_name instead
							
							
							
							
							
						 | 
						
							2015-01-30 17:02:53 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								3216813e49
								
							
						 | 
						
							
							
								
								made version codes ready for release candidate in beta channel
							
							
							
							
							
						 | 
						
							2015-01-29 23:56:04 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								3a52f31824
								
							
						 | 
						
							
							
								
								don't count when attempt failed completly
							
							
							
							
							
						 | 
						
							2015-01-29 23:35:31 +01:00 | 
						
					
				
					
						
							
							
								 
								iNPUTmice
							
						 | 
						
							
							
							
							
							
								
							
							
								6c3ea7f2bd
								
							
						 | 
						
							
							
								
								Merge branch 'development' of https://github.com/siacs/Conversations into development
							
							
							
							
							
						 | 
						
							2015-01-29 23:26:41 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								26bc2d387f
								
							
						 | 
						
							
							
								
								Merge pull request #923 from SamWhited/material-design-icons
							
							
							
							
							
							
							
							Start experimenting with material design icons 
							
						 | 
						
							2015-01-29 23:28: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 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								e5700f075c
								
							
						 | 
						
							
							
								
								Merge pull request #932 from svetlemodry/development
							
							
							
							
							
							
							
							Czech translation 
							
						 | 
						
							2015-01-25 16:29:16 +01:00 | 
						
					
				
					
						
							
							
								 
								Jaroslav Lichtblau
							
						 | 
						
							
							
							
							
							
								
							
							
								0f3fb3ab43
								
							
						 | 
						
							
							
								
								Czech translation
							
							
							
							
							
							
							
							for "hide offline" added 
							
						 | 
						
							2015-01-25 16:18:09 +01:00 | 
						
					
				
					
						
							
							
								 
								Daniel Gultsch
							
						 | 
						
							
							
							
							
							
								
							
							
								48dbf57c1a
								
							
						 | 
						
							
							
								
								Merge pull request #931 from betheg/gradle_plugin
							
							
							
							
							
							
							
							update android gradle plugin to 1.0.1 
							
						 | 
						
							2015-01-25 15:55:43 +01:00 |