Commit Graph

5967 Commits

Author SHA1 Message Date
Daniel Gultsch e275fd8143 Merge pull request #2027 from danielegobbetti/wear-reply-dismiss-notification
Dismiss the notification when replying from a wear notification [needs review!]
2016-09-28 12:39:00 +02:00
Daniel Gultsch 43f5dfe174 simplified code that invokes the export logs service 2016-09-28 12:35:52 +02:00
Daniel Gultsch f0dbcce58f expert 'setting' to remove omemo identity. fixes #2038 2016-09-28 12:24:50 +02:00
Daniele Gobbetti 41db773b08 Allow to dismiss the notification from a wear reply.
- use different IDs in the same method for the PendingIntent
- fix reply for GPG encrypted replies (untested)
2016-09-27 17:39:23 +02:00
Daniel Gultsch 5cd8917122 remove dubplicate play service dependency from build 2016-09-27 11:45:11 +02:00
Daniel Gultsch bb48f67a30 always use ipv4 localhost for Orbot connections 2016-09-27 11:44:50 +02:00
Daniel Gultsch 1339b9c464 don't reset encryption choice to auto on archiving 2016-09-24 21:29:00 +02:00
Daniel Gultsch cee3c98a23 version bump to 1.14.4 + changelog 2016-09-24 21:24:55 +02:00
Daniel Gultsch 343d895a26 don't react to null and empty voice replies 2016-09-21 19:04:16 +02:00
Daniel Gultsch 13ed27f91e don't use file provider for photo uris on android < N. fixes #2030 2016-09-21 18:20:53 +02:00
Daniel Gultsch 401759cdc7 don't wait for disco when not having stream managment 2016-09-21 12:55:40 +02:00
Daniel Gultsch 61f58b3dbd add timeouts to HTTPUrlConnections and allow cancelation of all sending files 2016-09-20 20:02:25 +02:00
Daniel Gultsch de7c0c5121 Merge pull request #2028 from Mishiranu/feature-more-tables
Fix "Server info" table layout
2016-09-20 16:43:51 +02:00
Mishiranu 9aaa5b78f4 Update Russian translation 2016-09-20 16:15:46 +03:00
Mishiranu 18ab826413 Fix "More table" layout
Retain "More table" visibility on screen orientation change
2016-09-20 16:10:25 +03:00
Daniel Gultsch 5790d4c4ab fixed styling in blocking dialog 2016-09-20 14:21:41 +02:00
Daniel Gultsch 98ab9beec7 version bump to 1.14.3 + changelog 2016-09-20 11:25:33 +02:00
Daniel Gultsch 7bda624723 pulled translations from transifex 2016-09-20 11:22:26 +02:00
Daniel Gultsch 7eac903277 add support for XEP-0377: Spam Reporting 2016-09-18 23:21:05 +02:00
Daniel Gultsch badc97e280 don't simply ignore null in message body but try to avoid it 2016-09-18 22:15:02 +02:00
Daniel Gultsch 7c608c8862 recreate activities when theme changed 2016-09-18 20:26:47 +02:00
Daniel Gultsch 6b904d4de1 use proper paddings in dialogs on android < 5 2016-09-18 20:09:39 +02:00
Mishiranu 858a327299 Retain TextView selection after list updating 2016-09-18 16:35:14 +03:00
Daniel Gultsch 7bdd4166c0 catch all throwables when loading contacts 2016-09-17 11:31:35 +02:00
Daniel Gultsch 00c04cd413 version bump to 1.14.2 + changelog 2016-09-17 11:30:52 +02:00
Mishiranu 3e6747c880 Add "Select text" context menu option 2016-09-17 01:18:34 +03:00
Daniel Gultsch 9d0a333372 Merge branch 'master' of github.com:siacs/Conversations 2016-09-16 12:35:57 +02:00
Daniel Gultsch af55aeca58 pulled translations from transifex 2016-09-16 12:29:26 +02:00
Daniel Gultsch 521469a57d dont show delete file button when outside conversations directory. fixes #2007 2016-09-16 12:29:12 +02:00
Daniel Gultsch 569b7bf6d0 hint that you should use latest version of ejabberd 2016-09-16 11:59:46 +02:00
Daniel Gultsch 3cdf5f9afc Merge branch 'Mishiranu-master' 2016-09-16 11:14:06 +02:00
Daniel Gultsch 15c807730e Merge branch 'master' of https://github.com/Mishiranu/Conversations into Mishiranu-master 2016-09-16 11:08:37 +02:00
Daniel Gultsch 7b445bc4c7 use history clear date as minimum date for mam 2016-09-16 11:07:52 +02:00
Mishiranu 8ca5eb4429 Allow text selection with multiple links in message 2016-09-16 02:15:07 +03:00
Daniel Gultsch ab63dba8aa deal with null bodys in message preview 2016-09-15 18:51:51 +02:00
Daniel Gultsch 4359afacb4 store jid if it was changed during bind 2016-09-14 12:26:38 +02:00
Daniel Gultsch 7b52e6984c Merge pull request #2018 from SamWhited/sasl_anonymous
SASL ANONYMOUS (no UI)
2016-09-14 09:34:20 +02:00
Daniel Gultsch 869ee3d438 Merge branch 'pebble-notification' of https://github.com/danielegobbetti/Conversations into danielegobbetti-pebble-notification 2016-09-12 22:49:22 +02:00
Daniel Gultsch d3dfecae8a don't use display version of jids 2016-09-12 22:48:51 +02:00
Daniel Gultsch 6cb2b0b5d1 remember scroll position on rotate. fixes #2011 2016-09-12 21:18:56 +02:00
Sam Whited 1a0b538166 Use JID returned by the server during bind
Not just the resourcepart
2016-09-12 11:33:36 -05:00
Sam Whited 805717673c Support ANONYMOUS SASL 2016-09-12 11:30:03 -05:00
Daniele Gobbetti e6e46651c9 Use the last message in the content text instead of the first.
This fixes the issue where the first message in the notification was sent to pebble
(and possibly to other wear devices) for every update in the conversation, as
reported in #1249.

This is the same patch propoed in https://github.com/siacs/Conversations/issues/1249#issuecomment-245878335
2016-09-11 18:42:05 +02:00
Daniel Gultsch 75fcab3170 Merge pull request #2014 from licaon-kter/patch-1
Fix typo
2016-09-11 17:40:27 +02:00
licaon-kter 59b2e281a3 Fix typo 2016-09-10 22:16:14 +03:00
Daniel Gultsch 6fd9888b3b add xep-0084 to docs/xep.md. wikipedia was complaining about it missing 2016-09-10 16:24:41 +02:00
Daniel Gultsch c3b11e515e download own vcard avatar if none is set. fixes #2008 2016-09-09 11:04:05 +02:00
Daniel Gultsch edf0ae9aa6 version bump to 1.14.1 + changelog 2016-09-09 11:03:22 +02:00
Daniel Gultsch 00cbf8458a pulled translations from transifex 2016-09-08 11:19:03 +02:00
Daniel Gultsch ac9f13a9f2 provide hint on why conference can not be encrypted 2016-09-08 11:01:27 +02:00