| 
							
							
								 iNPUTmice | 45de788773 | use time instead of uptime for unmute | 2015-02-12 18:52:10 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 44ee746681 | added actions to error notification | 2015-02-10 17:13:34 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 6c8b82dd66 | strip fractional seconds from timestamp before parsing | 2015-02-10 11:11:01 +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 | bd3fccd2dc | don't disable any ciphers | 2015-02-02 14:22:49 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 6674a3d757 | added more ciphers for old openssl versions | 2015-02-02 13:55:56 +01:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | d0e764c1a5 | fixed text preview for images | 2015-02-01 12:32:19 +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 |  | 
			
				
					| 
							
							
								 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 | 82a74fabc9 | set jingle file transfer to offer after iq offer has returned | 2015-01-25 16:32:59 +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 |  | 
			
				
					| 
							
							
								 Sam Whited | 503237087f | Remove legacy SSL support | 2015-01-19 11:02:13 -05:00 |  |