aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * Merge branch 'master' of https://github.com/moparisthebest/Conversations into...Daniel Gultsch2016-01-122-116/+226
| | |\
| | | * Implement XEP-0368: SRV records for XMPP over TLSmoparisthebest2016-01-112-104/+220
| | | * reworked that loop that iterates over various serversreworked_host_finder_loopDaniel Gultsch2016-01-111-16/+10
| | * | use match_parent as height in conversations overviewDaniel Gultsch2016-01-121-2/+2
| | * | Revert "Add additional warnings to OMEMO purge key function"Daniel Gultsch2016-01-122-28/+2
| | * | Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-122-2/+28
| | |/
| | * new art rendersDaniel Gultsch2016-01-1125-0/+0
| | * Merge branch 'logo_fixes' of https://github.com/fiaxh/Conversations into logo...Daniel Gultsch2016-01-111-338/+361
| | |\
| | | * Cleaned up logofiaxh2016-01-111-327/+364
| | * | don't use the word phone in stringsDaniel Gultsch2016-01-111-6/+5
| | * | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-01-111-19/+33
| | |\ \
| | | * | Clean up Conversations logo SVGAndreas Straub2016-01-101-19/+33
| | | |/
| | * | pulled translations from transifexDaniel Gultsch2016-01-1125-63/+14
| | * | add changelog for 1.9.0Daniel Gultsch2016-01-111-1/+6
| | * | ask to be excluded from battery optimizationDaniel Gultsch2016-01-117-242/+361
| | |/
| | * bump version code for betaDaniel Gultsch2016-01-091-2/+2
| | * let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-094-13/+41
| | * automatically adjust image compression to keep files under 512MiBDaniel Gultsch2016-01-092-8/+15
| | * added Config.java variable to change the default notification behaviour to al...Daniel Gultsch2016-01-082-1/+3
| | * don't show snackbar when notifications are disabled or pausedDaniel Gultsch2016-01-082-11/+0
| | * show per conference notification settings in details activityDaniel Gultsch2016-01-0812-17/+114
| | * show icon in conversations overview when notifications are disabledDaniel Gultsch2016-01-0817-76/+109
| | * Merge pull request #1641 from fiaxh/uuid-fixDaniel Gultsch2016-01-081-1/+1
| | |\
| | | * Correct uuid check according to RFC 4122fiaxh2016-01-051-1/+1
| | * | avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
| | * | added missing synchronize when pushing messages from mam backlogDaniel Gultsch2016-01-041-1/+3
| | * | null check in getOriginalPathDaniel Gultsch2016-01-042-1/+3
| | |/
| | * version bump to 1.8.4 and changelog1.8.4Daniel Gultsch2016-01-042-2/+7
| | * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-047-63/+230
| | * only report error after third unsuccesful attempt to connectDaniel Gultsch2016-01-041-1/+1
| | * properly rotate avatarsDaniel Gultsch2016-01-044-52/+48
| | * show trust keys activties if own keys are undecidedDaniel Gultsch2016-01-041-4/+5
| | * add obb url to unencrypted messagesDaniel Gultsch2016-01-031-0/+1
| | * edit account activity was still showing the omemo key with leading 0x05. fixe...Daniel Gultsch2016-01-031-2/+2
| | * removed xhtml body. fixes #1594Daniel Gultsch2016-01-011-12/+0
| | * use actual message timestamp instead of delay when updating last seen. fixes ...Daniel Gultsch2015-12-312-7/+8
| | * Fix OMEMO session creating logginAndreas Straub2015-12-311-1/+1
| | * version bump and changelog1.8.3Daniel Gultsch2015-12-292-2/+9
| | * handle null names in getColorForNameDaniel Gultsch2015-12-291-1/+1
| | * strip leading 0x05 off omemo fingerprintsDaniel Gultsch2015-12-271-4/+7
| | * lower case all fingerprints. fixes #1521Daniel Gultsch2015-12-271-1/+2
| | * dedublicate bookmarksDaniel Gultsch2015-12-271-3/+7
| | * fixed stuck at omemo encryption when x509 verification is being usedDaniel Gultsch2015-12-271-7/+7
| | * register context menu long click listener on message text. fixes #1614Daniel Gultsch2015-12-271-1/+1
| | * made text selectable again unless text contains more than 1 linkDaniel Gultsch2015-12-261-0/+11
| | * code cleanupDaniel Gultsch2015-12-233-25/+5
| | * show certificate informationDaniel Gultsch2015-12-2310-10/+240
| | * save certificate when verifying with x509Daniel Gultsch2015-12-233-4/+39
| | * version bump to 1.8.21.8.2Daniel Gultsch2015-12-201-2/+2
| | * pulled translations from transifexDaniel Gultsch2015-12-202-6/+44