aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * 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
| * renamed plain text to unencrypted. fixes #1331Daniel Gultsch2015-08-241-1/+1
| * 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-243-36/+61
| * 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-2412-208/+240
|\| |
| * | 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-235-177/+212
| |\|
| | * Add error handling to OMEMO PEP codeAndreas Straub2015-08-231-116/+131
| | * 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
* | | some little image preview changesChristian S2015-08-191-21/+21
* | | forked NotificationService from siacs/developmentChristian S2015-08-191-16/+18
* | | removed duplicatesChristian S2015-08-191-13/+0
* | | copy commitsChristian S2015-08-195-38/+53
|\| |
| * | simulate old behaviour with messages being set to waiting while offlineDaniel Gultsch2015-08-192-3/+10
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-191-0/+1
| |\|
| | * fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d28668b7f3...Daniel Gultsch2015-08-191-0/+1
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-192-1/+7
| |\|
| | * check if inputstream is null before cropping avatar imagesDaniel Gultsch2015-08-191-0/+6
| | * catch package manager has died exceptionDaniel Gultsch2015-08-191-1/+1
| * | Merge branch 'master' into developmentDaniel Gultsch2015-08-163-34/+35
| |\|
| | * deal with broken frameworksDaniel Gultsch2015-08-161-4/+1
| | * catch broken base64 in avatarsDaniel Gultsch2015-08-161-5/+1
| | * synchronize packetCallbacksDaniel Gultsch2015-08-161-25/+30
| | * catch null pointer in ScramSHA1 saslDaniel Gultsch2015-08-161-0/+3
* | | Merge pull request #23 from kriztan/SubtitleChristian S.2015-08-181-0/+13
|\ \ \
| * | | add subtitle to ActionBar in chatviewsChristian S2015-08-183-4/+32
* | | | reduced image preview sizeChristian S.2015-08-161-1/+1
* | | | Merge branch 'siacs/development' into developmentChristian S2015-08-157-86/+76
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'depend_on_sm' into developmentDaniel Gultsch2015-08-157-86/+76
| |\ \ \ | | |_|/ | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 20:36:56 +0000