aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* add missing stringsChristian S2016-01-102-1/+17
* Merge branch 'development' of https://github.com/kriztan/Pix-Art-Messenger in...Christian S2016-01-101-0/+2
|\
| * Merge pull request #61 from siacs/masterChristian S2016-01-064-4/+16
| |\
| * | added missing german stringsChristian S2016-01-051-0/+2
* | | Merge branch 'siacs/master' into developmentChristian S2016-01-1035-131/+300
|\ \ \ | |/ / |/| |
| * | 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
| |/
* | copy commitsChristian S2016-01-0417-140/+295
|\|
| * 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
* | copy commitsChristian S2015-12-291-1/+1
|\|
| * 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
* | deduplicate stringsChristian S2015-12-281-8/+2
* | 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
| * 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
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 12:15:16 +0000