Commit Graph

3202 Commits

Author SHA1 Message Date
Michael
7800647885 otr: switch to the otr-state the partner alternate.
should also fixed #877
2015-01-25 13:07:31 +01:00
Daniel Gultsch
90d06d38d6 Merge pull request #927 from betheg/otr_query_message
MessageParser: fix the regex for otr query messages.
2015-01-25 01:07:09 +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
ed3d76bcf6 mentioned hide offline feature in the changelog 2015-01-22 00:08:48 +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
Daniel Gultsch
7df6ae9ef8 Merge pull request #912 from SamWhited/update-foreground-notification
Add color / category to foreground notification
2015-01-21 11:48:36 +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
Daniel Gultsch
a93dd1b0c4 Merge pull request #905 from svetlemodry/development
Czech translation updated
2015-01-20 11:25:43 +01:00
Jaroslav Lichtblau
7e4053abff Czech translation updated
for Conversations
2015-01-19 19:07:43 +01:00
Daniel Gultsch
ea37fb9ffa Merge pull request #904 from SamWhited/remove-ssl
Remove legacy SSL support
2015-01-19 17:15:57 +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
Daniel Gultsch
d8c9e12d45 Merge pull request #898 from SamWhited/unknown_filetype_string_fix
Fix string substitutions with unknown filetypes
2015-01-18 11:57:17 +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
Daniel Gultsch
c17005218f Merge pull request #897 from SamWhited/download_file_fixes
Correct the download file string on notifications
2015-01-17 15:41:12 +01:00
Sam Whited
dfc1cea882 Correct the download file string on notifications
Fixes #896
2015-01-17 09:11:04 -05:00
iNPUTmice
be169215ca Merge branch 'SamWhited-download-button-notification' into development 2015-01-16 16:10:27 +01: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
92ed6c2015 Merge pull request #886 from rtreffer/development
Switch to maven central minidns
2015-01-14 23:39:21 +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