| 
							
							
								 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 | 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 |  | 
			
				
					| 
							
							
								 Sam Whited | 1650565bb0 | Remove another unused resource | 2015-02-01 16:02:59 -05: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 | 33530a9e30 | pulled translations from transifex | 2015-02-01 17:04:29 +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 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 |  |