sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4,737 Commits 5 Branches 297 Tags 50 MiB
Commit Graph

4737 Commits

Author SHA1 Message Date
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
Daniel Gultsch a54a7dca30 Merge branch 'master' of github.com:siacs/Conversations 2016-09-07 16:14:33 +02:00
Daniel Gultsch 416481bb65 be a bit more careful when deleting and deactivating accounts 2016-09-07 14:34:58 +02:00
Daniel Gultsch ba6b4763d2 add faq about grayed out omemo 2016-09-07 13:01:02 +02:00
Daniel Gultsch e1d2c32e63 show server not found muc error 2016-09-06 12:15:08 +02:00
Daniel Gultsch 257d1e42d8 remove explicit pebble support. treat as wear device 2016-09-06 12:14:49 +02:00
Daniel Gultsch 7e81149869 show reply action on wear devices 2016-09-06 12:13:50 +02:00
Daniel Gultsch 1dc55f72e3 don't use fileprovider when opening files on android M and below 2016-09-04 22:59:40 +02:00
Daniel Gultsch d2c475d501 don't crash when correcting waiting pgp encrypted messages 2016-09-04 22:59:15 +02:00
Daniel Gultsch ad09d7dc49 version bump to 1.14.0 2016-09-02 23:49:32 +02:00
Daniel Gultsch aca7054174 fixed recreation issues in StartConversationActivity 2016-08-31 17:04:43 +02:00
Daniel Gultsch f7d8580969 fixed typo 2016-08-31 17:02:50 +02:00
Daniel Gultsch f14ab4c391 don't show duplicate nofications on android 4 2016-08-31 17:02:42 +02:00
Daniel Gultsch 7917c19d18 broader exception catchers 2016-08-30 13:15:00 +02:00
Daniel Gultsch 3685c8cd2a use file provider for taking pictures 2016-08-30 13:14:38 +02:00
Daniel Gultsch d32cbcc70d don't show up navigation in startConversation when there are no open conversations 2016-08-30 13:13:06 +02:00
Daniel Gultsch af329eff46 add more logging to pgp engine 2016-08-30 13:12:09 +02:00
Daniel Gultsch b747afb44c version bump to 1.14.0-beta + changelog 2016-08-27 15:30:41 +02:00
Daniel Gultsch 2c187d0e7c mark conversation as read when swiping a notification with quick reply away 2016-08-27 15:25:37 +02:00
Daniel Gultsch caafd03130 don't automatically download files and avatars when datasaver is on 2016-08-27 13:35:52 +02:00
Daniel Gultsch 3d5940cb76 bring back connectivity changed events on android n 2016-08-27 12:15:25 +02:00
Daniel Gultsch 78e962ce67 don't overwrite edited information in editaccount on rotate 2016-08-26 21:48:14 +02:00
Daniel Gultsch ea0e6d0619 don't set notification mode to background when on pause 2016-08-26 21:13:33 +02:00
Daniel Gultsch ad994a2f4c add missing depency to gradle file 2016-08-26 16:43:30 +02:00
Daniel Gultsch fd54dc5aff wrap dynamic tags into multiple lines. fixes #2003 2016-08-26 16:34:42 +02:00
Daniel Gultsch 76cbb4f727 some multi-window optimizations. set min width to 300 2016-08-26 16:05:38 +02:00
Daniel Gultsch e33d8451a8 attach contact to notification 2016-08-26 13:35:01 +02:00
Daniel Gultsch f931c08da7 add snackbar for request presence subscription 2016-08-26 10:19:59 +02:00
Daniel Gultsch b52f079292 always display allow contact perm dialog after intro 2016-08-26 10:19:42 +02:00
Daniel Gultsch 9e0145a8f6 survive rotation in editaccount 2016-08-26 09:10:59 +02:00
Daniel Gultsch e98ab37c9d made payment required error standard compliant 2016-08-25 23:42:42 +02:00