aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'refs/heads/siacs-master' into developmentChristian S2016-01-0419-143/+303
|\
| * copy commitsChristian S2016-01-0419-143/+303
|/|
| * version bump to 1.8.4 and changelogDaniel 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
* | Update CHANGELOG.mdChristian S2015-12-291-0/+1
* | Merge branch 'refs/heads/siacs-master' into developmentChristian S2015-12-292-1/+4
|\ \
| * | copy commitsChristian S2015-12-292-1/+4
| |\|
| | * version bump and changelogDaniel Gultsch2015-12-292-2/+9
| | * handle null names in getColorForNameDaniel Gultsch2015-12-291-1/+1
| * | hide settings, accounts and updater in all menus except in main windowChristian S2015-12-294-31/+8
* | | hide settings, accounts and updater in all menus except in main windowChristian S2015-12-294-31/+8
* | | translated readme into GermanChristian S2015-12-291-200/+100
|/ /
* | version 1.8.3 + changesChristian S2015-12-282-2/+5
* | deduplicate stringsChristian S2015-12-281-8/+2
* | Merge branch 'refs/heads/siacs-master' into developmentChristian S2015-12-2817-71/+362
|\ \
| * | copy commitsChristian S2015-12-2817-71/+362
|/| | | |/
| * 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.2Daniel Gultsch2015-12-201-2/+2
| * pulled translations from transifexDaniel Gultsch2015-12-202-6/+44
| * store identity key in XmppAxolotlSession instead of the fingerprintDaniel Gultsch2015-12-192-23/+27
| * use presence name not server name when verification is being usedDaniel Gultsch2015-12-191-3/+3
| * add more debugging to certificate checks after new omemo session was establishedDaniel Gultsch2015-12-191-0/+4
| * only offer plain and omemo encryption when x509 verification is enabledDaniel Gultsch2015-12-192-3/+13
| * prefer server name over address book name when x509 verification is being usedDaniel Gultsch2015-12-191-1/+4
* | version 1.8.2 + changelogChristian S2015-12-182-2/+5
* | changed app name in readmeChristian S2015-12-181-31/+26
* | Merge branch 'refs/heads/siacs-master' into developmentChristian S2015-12-183-132/+127
|\ \
| * | copy commitsChristian S2015-12-183-132/+127
|/| | | |/
| * add 'store' message hint to displayed chat markersDaniel Gultsch2015-12-171-0/+1
| * pulled translations from transifexDaniel Gultsch2015-12-175-35/+429
| * throw exception at the end of the streamDaniel Gultsch2015-12-171-128/+122
| * let message parser not artifically fail on messages with no to attributeDaniel Gultsch2015-12-171-4/+4
* | corrected stringsChristian S2015-12-161-21/+0
* | Merge branch 'refs/heads/siacs-master' into developmentChristian S2015-12-1612-43/+116
|\ \