Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-11-08 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Fix typo | licaon-kter | 2016-11-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | fixed regression of showing delivery failed after receipt | Daniel Gultsch | 2016-11-07 | 1 | -2/+1 | |
|/ / | ||||||
* | | show warning in account details when data saver is enabled | Daniel Gultsch | 2016-11-07 | 4 | -29/+75 | |
| | | ||||||
* | | handle file attachment when missing connection | Daniel Gultsch | 2016-11-02 | 1 | -1/+3 | |
| | | ||||||
* | | removed unnecessary push_mode | Daniel Gultsch | 2016-11-02 | 3 | -37/+10 | |
| | | ||||||
* | | leaving low ping timeout mode after coming online | Daniel Gultsch | 2016-11-02 | 1 | -35/+46 | |
| | | ||||||
* | | fixed npe when jingle partner is using unknown candidate | Daniel Gultsch | 2016-11-01 | 1 | -0/+4 | |
| | | ||||||
* | | extracting stanza-id where by=account | Daniel Gultsch | 2016-10-31 | 3 | -2/+19 | |
| | | ||||||
* | | always use ipv4 localhost when using orbot http proxy | Daniel Gultsch | 2016-10-31 | 1 | -1/+1 | |
| | | ||||||
* | | Revert "use file provider on android M as well" | Daniel Gultsch | 2016-10-30 | 2 | -2/+2 | |
| | | | | | | | | This reverts commit a4020e85f627f9af2142213a4c34cb4efaa8ac9a. | |||||
* | | schedule correct wakeup call when in low ping timeout mode | Daniel Gultsch | 2016-10-29 | 1 | -2/+3 | |
| | | ||||||
* | | add error message to failed messages. accessible via context menu | Daniel Gultsch | 2016-10-26 | 10 | -27/+98 | |
| | | ||||||
* | | use file provider on android M as well | Daniel Gultsch | 2016-10-23 | 2 | -2/+2 | |
| | | ||||||
* | | connect instantly in low ping mode after going offline | Daniel Gultsch | 2016-10-23 | 1 | -2/+7 | |
| | | ||||||
* | | don't leave low timeout mode prematurely | Daniel Gultsch | 2016-10-20 | 1 | -3/+3 | |
| | | ||||||
* | | Merge branch 'feature-remove-merge-separator' of ↵ | Daniel Gultsch | 2016-10-20 | 3 | -40/+41 | |
|\ \ | | | | | | | | | | https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-merge-separator | |||||
| * | | Remove MERGE_SEPARATOR | Mishiranu | 2016-10-20 | 3 | -40/+41 | |
| | | | ||||||
* | | | Merge branch 'feature-remove-spans' of ↵ | Daniel Gultsch | 2016-10-20 | 5 | -7/+118 | |
|\ \ \ | | | | | | | | | | | | | https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-spans | |||||
| * | | | Remove spans on copying or pasting a text | Mishiranu | 2016-10-19 | 5 | -7/+118 | |
| |/ / | ||||||
* | | | introduced low ping timeout mode after gcm push | Daniel Gultsch | 2016-10-20 | 2 | -2/+13 | |
| | | | ||||||
* | | | write prepped string to db. use display version everywhere else | Daniel Gultsch | 2016-10-20 | 6 | -32/+45 | |
| | | | ||||||
* | | | include pgp signature only in non anonymous mucs | Daniel Gultsch | 2016-10-19 | 2 | -3/+7 | |
| | | | ||||||
* | | | retrigger key selection if openpgp key was deleted | Daniel Gultsch | 2016-10-19 | 2 | -3/+15 | |
|/ / | ||||||
* | | update conversation in database background thread | Daniel Gultsch | 2016-10-18 | 5 | -18/+18 | |
| | | ||||||
* | | don't trigger context menu in message adapter manually. fixes #2077 | Daniel Gultsch | 2016-10-18 | 3 | -13/+6 | |
| | | ||||||
* | | Merge branch 'feature-selection' of ↵ | Daniel Gultsch | 2016-10-17 | 6 | -0/+252 | |
|\ \ | | | | | | | | | | https://github.com/Mishiranu/Conversations into Mishiranu-feature-selection | |||||
| * | | Retain TextView selection after list updating | Mishiranu | 2016-09-18 | 3 | -39/+216 | |
| | | | ||||||
| * | | Add "Select text" context menu option | Mishiranu | 2016-09-17 | 5 | -0/+75 | |
| | | | ||||||
* | | | add exception handling when loading default resource | Daniel Gultsch | 2016-10-17 | 1 | -2/+10 | |
| | | | ||||||
* | | | small code reformation in pgp decryption service | Daniel Gultsch | 2016-10-17 | 1 | -2/+4 | |
| |/ |/| | ||||||
* | | clarified fineprint a little bit | Daniel Gultsch | 2016-10-13 | 6 | -8/+10 | |
| | | ||||||
* | | synchronize access to json key storage in account model | Daniel Gultsch | 2016-10-13 | 3 | -73/+75 | |
| | | ||||||
* | | don't use sending state on muc pms without smacks | Daniel Gultsch | 2016-10-09 | 1 | -2/+4 | |
| | | ||||||
* | | add password to direct muc invite | Daniel Gultsch | 2016-10-09 | 1 | -0/+4 | |
| | | ||||||
* | | pulled more translations from transifex | Daniel Gultsch | 2016-10-09 | 2 | -0/+7 | |
| | | ||||||
* | | pulled translations from transifex | Daniel Gultsch | 2016-10-09 | 29 | -170/+301 | |
| | | ||||||
* | | added disclaimer that conversations.im account is 8 euro / year | Daniel Gultsch | 2016-10-08 | 6 | -4/+40 | |
| | | ||||||
* | | fetch new conference configuration on every conf update | Daniel Gultsch | 2016-10-08 | 2 | -20/+20 | |
| | | ||||||
* | | reset sending to waiting on every error | Daniel Gultsch | 2016-10-07 | 2 | -2/+11 | |
| | | ||||||
* | | fixed account hash calculation | Daniel Gultsch | 2016-10-07 | 1 | -1/+1 | |
| | | ||||||
* | | respond to chat marker request only when mutual presence subscription exists | Daniel Gultsch | 2016-10-07 | 5 | -6/+13 | |
| | | ||||||
* | | create new instances of key manager every time it's used | Daniel Gultsch | 2016-10-07 | 1 | -3/+6 | |
| | | ||||||
* | | warn user if account is offline during avatar publication | Daniel Gultsch | 2016-10-06 | 2 | -4/+11 | |
| | | ||||||
* | | refresh error notification after 'try again' | Daniel Gultsch | 2016-10-06 | 1 | -0/+1 | |
| | | ||||||
* | | be more careful parsing integers in omemo | Daniel Gultsch | 2016-10-06 | 2 | -4/+12 | |
| | | ||||||
* | | issue ping after push was received | Daniel Gultsch | 2016-10-06 | 2 | -1/+13 | |
| | | ||||||
* | | parse smacks delay from messages | Daniel Gultsch | 2016-10-06 | 1 | -1/+1 | |
| | | ||||||
* | | try to fix messages stuck at sending | Daniel Gultsch | 2016-10-06 | 2 | -1/+3 | |
| | | ||||||
* | | make error notification dismissable. fixes #1815 | Daniel Gultsch | 2016-10-04 | 3 | -40/+47 | |
| | |