Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2027 from danielegobbetti/wear-reply-dismiss-notification | Daniel Gultsch | 2016-09-28 | 2 | -10/+20 |
|\ | | | | | Dismiss the notification when replying from a wear notification [needs review!] | ||||
| * | Allow to dismiss the notification from a wear reply. | Daniele Gobbetti | 2016-09-27 | 2 | -10/+20 |
| | | | | | | | | | | - use different IDs in the same method for the PendingIntent - fix reply for GPG encrypted replies (untested) | ||||
* | | simplified code that invokes the export logs service | Daniel Gultsch | 2016-09-28 | 3 | -39/+9 |
| | | |||||
* | | expert 'setting' to remove omemo identity. fixes #2038 | Daniel Gultsch | 2016-09-28 | 4 | -4/+68 |
|/ | |||||
* | always use ipv4 localhost for Orbot connections | Daniel Gultsch | 2016-09-27 | 1 | -1/+3 |
| | |||||
* | don't reset encryption choice to auto on archiving | Daniel Gultsch | 2016-09-24 | 1 | -2/+0 |
| | |||||
* | don't react to null and empty voice replies | Daniel Gultsch | 2016-09-21 | 1 | -3/+4 |
| | |||||
* | don't use file provider for photo uris on android < N. fixes #2030 | Daniel Gultsch | 2016-09-21 | 1 | -1/+5 |
| | |||||
* | don't wait for disco when not having stream managment | Daniel Gultsch | 2016-09-21 | 1 | -1/+1 |
| | |||||
* | add timeouts to HTTPUrlConnections and allow cancelation of all sending files | Daniel Gultsch | 2016-09-20 | 3 | -4/+11 |
| | |||||
* | Merge pull request #2028 from Mishiranu/feature-more-tables | Daniel Gultsch | 2016-09-20 | 4 | -21/+73 |
|\ | | | | | Fix "Server info" table layout | ||||
| * | Update Russian translation | Mishiranu | 2016-09-20 | 1 | -8/+8 |
| | | |||||
| * | Fix "More table" layout | Mishiranu | 2016-09-20 | 3 | -13/+65 |
| | | | | | | | | Retain "More table" visibility on screen orientation change | ||||
* | | fixed styling in blocking dialog | Daniel Gultsch | 2016-09-20 | 2 | -5/+16 |
| | | |||||
* | | pulled translations from transifex | Daniel Gultsch | 2016-09-20 | 2 | -5/+15 |
|/ | |||||
* | add support for XEP-0377: Spam Reporting | Daniel Gultsch | 2016-09-18 | 6 | -7/+53 |
| | |||||
* | don't simply ignore null in message body but try to avoid it | Daniel Gultsch | 2016-09-18 | 3 | -5/+10 |
| | |||||
* | recreate activities when theme changed | Daniel Gultsch | 2016-09-18 | 5 | -5/+36 |
| | |||||
* | use proper paddings in dialogs on android < 5 | Daniel Gultsch | 2016-09-18 | 7 | -20/+43 |
| | |||||
* | catch all throwables when loading contacts | Daniel Gultsch | 2016-09-17 | 2 | -3/+3 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-09-16 | 10 | -4/+68 |
| | |||||
* | dont show delete file button when outside conversations directory. fixes #2007 | Daniel Gultsch | 2016-09-16 | 1 | -2/+5 |
| | |||||
* | Merge branch 'master' of https://github.com/Mishiranu/Conversations into ↵ | Daniel Gultsch | 2016-09-16 | 2 | -37/+56 |
|\ | | | | | | | Mishiranu-master | ||||
| * | Allow text selection with multiple links in message | Mishiranu | 2016-09-16 | 2 | -37/+56 |
| | | |||||
* | | use history clear date as minimum date for mam | Daniel Gultsch | 2016-09-16 | 5 | -10/+40 |
| | | |||||
* | | deal with null bodys in message preview | Daniel Gultsch | 2016-09-15 | 1 | -5/+3 |
| | | |||||
* | | store jid if it was changed during bind | Daniel Gultsch | 2016-09-14 | 2 | -3/+8 |
|/ | |||||
* | Merge pull request #2018 from SamWhited/sasl_anonymous | Daniel Gultsch | 2016-09-14 | 2 | -1/+32 |
|\ | | | | | SASL ANONYMOUS (no UI) | ||||
| * | Use JID returned by the server during bind | Sam Whited | 2016-09-12 | 1 | -1/+1 |
| | | | | | | | | Not just the resourcepart | ||||
| * | Support ANONYMOUS SASL | Sam Whited | 2016-09-12 | 2 | -0/+31 |
| | | |||||
* | | Merge branch 'pebble-notification' of ↵ | Daniel Gultsch | 2016-09-12 | 1 | -1/+1 |
|\ \ | | | | | | | | | | https://github.com/danielegobbetti/Conversations into danielegobbetti-pebble-notification | ||||
| * | | Use the last message in the content text instead of the first. | Daniele Gobbetti | 2016-09-11 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | 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 | ||||
* | | don't use display version of jids | Daniel Gultsch | 2016-09-12 | 2 | -95/+99 |
| | | |||||
* | | remember scroll position on rotate. fixes #2011 | Daniel Gultsch | 2016-09-12 | 2 | -11/+57 |
|/ | |||||
* | Fix typo | licaon-kter | 2016-09-10 | 1 | -1/+1 |
| | |||||
* | download own vcard avatar if none is set. fixes #2008 | Daniel Gultsch | 2016-09-09 | 4 | -11/+23 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2016-09-08 | 14 | -2/+109 |
| | |||||
* | provide hint on why conference can not be encrypted | Daniel Gultsch | 2016-09-08 | 3 | -2/+71 |
| | |||||
* | be a bit more careful when deleting and deactivating accounts | Daniel Gultsch | 2016-09-07 | 6 | -22/+47 |
| | |||||
* | show server not found muc error | Daniel Gultsch | 2016-09-06 | 4 | -2/+11 |
| | |||||
* | remove explicit pebble support. treat as wear device | Daniel Gultsch | 2016-09-06 | 1 | -25/+0 |
| | |||||
* | show reply action on wear devices | Daniel Gultsch | 2016-09-06 | 1 | -2/+4 |
| | |||||
* | don't use fileprovider when opening files on android M and below | Daniel Gultsch | 2016-09-04 | 2 | -7/+18 |
| | |||||
* | don't crash when correcting waiting pgp encrypted messages | Daniel Gultsch | 2016-09-04 | 1 | -4/+12 |
| | |||||
* | fixed recreation issues in StartConversationActivity | Daniel Gultsch | 2016-08-31 | 3 | -977/+1031 |
| | |||||
* | fixed typo | Daniel Gultsch | 2016-08-31 | 1 | -2/+2 |
| | |||||
* | don't show duplicate nofications on android 4 | Daniel Gultsch | 2016-08-31 | 1 | -15/+14 |
| | |||||
* | broader exception catchers | Daniel Gultsch | 2016-08-30 | 2 | -2/+3 |
| | |||||
* | use file provider for taking pictures | Daniel Gultsch | 2016-08-30 | 2 | -3/+5 |
| | |||||
* | don't show up navigation in startConversation when there are no open ↵ | Daniel Gultsch | 2016-08-30 | 1 | -1/+3 |
| | | | | conversations |