aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* version bump to 1.14.7 + changelog1.14.7Daniel Gultsch2016-10-262-2/+7
|
* add error message to failed messages. accessible via context menuDaniel Gultsch2016-10-2610-27/+98
|
* use file provider on android M as wellDaniel Gultsch2016-10-232-2/+2
|
* connect instantly in low ping mode after going offlineDaniel Gultsch2016-10-231-2/+7
|
* don't leave low timeout mode prematurelyDaniel Gultsch2016-10-201-3/+3
|
* Merge branch 'feature-remove-merge-separator' of ↵Daniel Gultsch2016-10-203-40/+41
|\ | | | | | | https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-merge-separator
| * Remove MERGE_SEPARATORMishiranu2016-10-203-40/+41
| |
* | Merge branch 'feature-remove-spans' of ↵Daniel Gultsch2016-10-205-7/+118
|\ \ | | | | | | | | | https://github.com/Mishiranu/Conversations into Mishiranu-feature-remove-spans
| * | Remove spans on copying or pasting a textMishiranu2016-10-195-7/+118
| |/
* | introduced low ping timeout mode after gcm pushDaniel Gultsch2016-10-202-2/+13
| |
* | write prepped string to db. use display version everywhere elseDaniel Gultsch2016-10-206-32/+45
| |
* | include pgp signature only in non anonymous mucsDaniel Gultsch2016-10-192-3/+7
| |
* | retrigger key selection if openpgp key was deletedDaniel Gultsch2016-10-192-3/+15
|/
* update conversation in database background threadDaniel Gultsch2016-10-185-18/+18
|
* don't trigger context menu in message adapter manually. fixes #2077Daniel Gultsch2016-10-183-13/+6
|
* Merge branch 'feature-selection' of ↵Daniel Gultsch2016-10-176-0/+252
|\ | | | | | | https://github.com/Mishiranu/Conversations into Mishiranu-feature-selection
| * Retain TextView selection after list updatingMishiranu2016-09-183-39/+216
| |
| * Add "Select text" context menu optionMishiranu2016-09-175-0/+75
| |
* | add exception handling when loading default resourceDaniel Gultsch2016-10-171-2/+10
| |
* | small code reformation in pgp decryption serviceDaniel Gultsch2016-10-171-2/+4
| |
* | Merge pull request #2063 from thacoon/patch-1Daniel Gultsch2016-10-131-1/+1
|\ \ | | | | | | Fix OpenPGP link
| * | Fix OpenPGP linkConstantin Soffner2016-10-081-1/+1
| | | | | | | | | I have just updated the link to the OpenPGP website.
* | | clarified fineprint a little bitDaniel Gultsch2016-10-136-8/+10
| | |
* | | synchronize access to json key storage in account modelDaniel Gultsch2016-10-133-73/+75
| | |
* | | version bump to 1.14.6 + changelog1.14.6Daniel Gultsch2016-10-102-2/+7
| | |
* | | don't use sending state on muc pms without smacksDaniel Gultsch2016-10-091-2/+4
| | |
* | | add password to direct muc inviteDaniel Gultsch2016-10-091-0/+4
| | |
* | | pulled more translations from transifexDaniel Gultsch2016-10-092-0/+7
| | |
* | | pulled translations from transifexDaniel Gultsch2016-10-0929-170/+301
| | |
* | | added disclaimer that conversations.im account is 8 euro / yearDaniel Gultsch2016-10-086-4/+40
| | |
* | | fetch new conference configuration on every conf updateDaniel Gultsch2016-10-082-20/+20
|/ /
* | reset sending to waiting on every errorDaniel Gultsch2016-10-072-2/+11
| |
* | fixed account hash calculationDaniel Gultsch2016-10-071-1/+1
| |
* | respond to chat marker request only when mutual presence subscription existsDaniel Gultsch2016-10-075-6/+13
| |
* | create new instances of key manager every time it's usedDaniel Gultsch2016-10-071-3/+6
| |
* | warn user if account is offline during avatar publicationDaniel Gultsch2016-10-062-4/+11
| |
* | refresh error notification after 'try again'Daniel Gultsch2016-10-061-0/+1
| |
* | be more careful parsing integers in omemoDaniel Gultsch2016-10-062-4/+12
| |
* | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-10-061-0/+8
|\ \
| * | Add client recommandition to readme. fixes #2048Daniel Gultsch2016-10-051-0/+8
| | |
* | | issue ping after push was receivedDaniel Gultsch2016-10-062-1/+13
| | |
* | | parse smacks delay from messagesDaniel Gultsch2016-10-061-1/+1
| | |
* | | try to fix messages stuck at sendingDaniel Gultsch2016-10-062-1/+3
|/ /
* | make error notification dismissable. fixes #1815Daniel Gultsch2016-10-043-40/+47
| |
* | fixed omemo shown as unavailable in 1:1 chatsDaniel Gultsch2016-10-035-5/+12
| |
* | resolve take photo uri for internal useDaniel Gultsch2016-10-032-5/+5
| |
* | properly index take photo uris from file providerDaniel Gultsch2016-10-032-8/+15
| |
* | add more logging to attaching file processDaniel Gultsch2016-10-031-0/+14
| |
* | when activating omemo in conference always check preferencesDaniel Gultsch2016-10-031-14/+14
| |
* | explicit logging when copying files to storageDaniel Gultsch2016-10-032-6/+3
| |