aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* copy commitsChristian S2015-08-2932-56/+126
|\
| * use build in method on >= lolipop devices to discover dns serversDaniel Gultsch2015-08-282-8/+41
| * pulled updated translations from transifexDaniel Gultsch2015-08-2820-20/+7
| * reformating and upper bound for waiting on stanza writerDaniel Gultsch2015-08-281-8/+16
| * fixed type=timeoutDaniel Gultsch2015-08-281-0/+2
| * added XEP number for http file uploadDaniel Gultsch2015-08-277-7/+40
| * use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-266-9/+10
| * fixed highlight text color for white chat bubblesDaniel Gultsch2015-08-261-0/+1
| * Fix error handling for announce check retrievalAndreas Straub2015-08-261-3/+3
| * explictitly handle iq timeouts in bind and session iqsDaniel Gultsch2015-08-261-2/+7
* | changed string backChristian S2015-08-261-1/+1
* | Version 1.6.5Christian S2015-08-2661-235/+265
|\|
| * Only announce device after publishing bundleAndreas Straub2015-08-262-8/+19
| * moved actual iq callback out of synchronized find callback blockDaniel Gultsch2015-08-261-3/+7
| * be more restrictive about marking messages as sent_received in muc parserDaniel Gultsch2015-08-262-8/+18
| * Revert "improved compatibility with muc components that change the message id"Daniel Gultsch2015-08-261-3/+2
| * Fix key publishingAndreas Straub2015-08-261-72/+68
| * Add more logging to pep attemp counter logicAndreas Straub2015-08-251-0/+1
| * Limit number of PEP publish triesAndreas Straub2015-08-251-9/+42
| * remove unused imports.Michael2015-08-254-30/+1
| * Pass through device IDs when updating own listAndreas Straub2015-08-251-17/+17
| * cleared up some error messages in axolotl service and execute publishOwnDevic...Daniel Gultsch2015-08-251-3/+7
| * catch some db query exceptionsDaniel Gultsch2015-08-251-3/+5
| * additonal null checks in file backendDaniel Gultsch2015-08-251-0/+3
| * fixed session timeDaniel Gultsch2015-08-251-7/+2
| * increased carbon grace period to 90sDaniel Gultsch2015-08-241-1/+1
| * pulled translations from transifexDaniel Gultsch2015-08-2425-49/+18
| * renamed plain text to unencrypted. fixes #1331Daniel Gultsch2015-08-2428-53/+53
| * fixed regression with mlinks stream managment. fixes #1206Daniel Gultsch2015-08-241-1/+1
| * added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-2425-36/+68
| * Merge branch 'master' into developmentDaniel Gultsch2015-08-241-1/+1
| |\
| | * catch invalid base64 in axolotl key parsingDaniel Gultsch2015-08-241-1/+1
* | | Merge pull request #27 from siacs/developmentChristian S.2015-08-2413-208/+242
|\| |
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-231-1/+1
| |\|
| | * open files with capital extensions as well. fixes #1354Daniel Gultsch2015-08-231-1/+1
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-232-3/+2
| |\|
| | * bugfix: next encryption is now being properly detectedDaniel Gultsch2015-08-232-3/+2
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-237-18/+16
| |\|
| | * introduce special iq type for internal timeouts. always use != result to chec...Daniel Gultsch2015-08-237-20/+18
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-231-10/+10
| |\|
| | * reformatingDaniel Gultsch2015-08-231-3/+1
| | * deal with another set of stream:features after bindDaniel Gultsch2015-08-231-7/+9
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-236-177/+214
| |\|
| | * Add error handling to OMEMO PEP codeAndreas Straub2015-08-231-116/+131
| | * remove the READ_PHONE_STATE permission.Michael2015-08-231-0/+2
| | * remove callbacks directly from iteratorDaniel Gultsch2015-08-231-2/+2
| | * don't make subsequent iq request when original stanza returned an errorDaniel Gultsch2015-08-232-51/+67
| | * modified clearIqCallbacks into 2-step processDaniel Gultsch2015-08-233-19/+23
* | | replaced ... with …Christian S2015-08-192-4/+4
* | | some little image preview changesChristian S2015-08-194-24/+25