aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* Merge pull request #1363 from betheg/minidnsDaniel Gultsch2015-08-251-1/+1
|\
| * update minidns to v0.1.7Michael2015-08-251-1/+1
|/
* Merge pull request #1362 from betheg/roundedimageviewDaniel Gultsch2015-08-251-1/+1
|\
| * update roundedimageview to v2.2.0Michael2015-08-251-1/+1
|/
* Merge branch 'betheg-sdk_version' into developmentDaniel Gultsch2015-08-242-7/+7
|\
| * Merge branch 'sdk_version' of https://github.com/betheg/Conversations into be...Daniel Gultsch2015-08-242-7/+7
|/|
| * add the the previously deleted build-tools.Michael2015-08-241-0/+3
| * update travis.ymlMichael2015-08-241-4/+2
| * update android sdk and support library.Michael2015-08-241-6/+5
* | version bump to 1.7.0-betaDaniel Gultsch2015-08-241-2/+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-2427-36/+234
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-241-1/+1
|\ \ | |/ |/|
| * catch invalid base64 in axolotl key parsingDaniel Gultsch2015-08-241-1/+1
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-233-2/+5
|\|
| * version bump to 1.6.3 and changelogDaniel Gultsch2015-08-232-2/+5
| * 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-232-1/+4
|\|
| * version bump to 1.6.2 and changelogDaniel Gultsch2015-08-232-2/+5
* | 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-238-178/+218
|\|
| * added changelog for 1.6.1Daniel Gultsch2015-08-231-0/+3
| * version bump to 1.6.1Daniel Gultsch2015-08-231-2/+2
| * 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
* | Merge pull request #1348 from betheg/zxingDaniel Gultsch2015-08-231-2/+2
|\ \
| * | update zxing to v3.2.1Michael2015-08-231-2/+2
|/ /
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-1912-151/+397
|\|
| * pulled translations from transifexDaniel Gultsch2015-08-1912-151/+397
* | 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
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 13:06:26 +0000