aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'betheg-sdk_version' into developmentDaniel Gultsch2015-08-242-7/+7
|\
| * Merge branch 'sdk_version' of https://github.com/betheg/Conversations into ↵Daniel Gultsch2015-08-242-7/+7
|/| | | | | | | betheg-sdk_version
| * 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
| | | | | | | | | | make use of the archivesBaseName and rename only 'zipaligned' release build.
* | 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 developmentdevelopmentDaniel Gultsch2015-08-233-2/+5
|\|
| * version bump to 1.6.3 and changelog1.6.3Daniel 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 detected1.6.2Daniel 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 ↵Daniel Gultsch2015-08-237-20/+18
| | | | | | | | check for error in callbacks
* | 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.11.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
| | | | | | | | Log received errors and abort processing
| * 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.1
| * | update zxing to v3.2.1Michael2015-08-231-2/+2
|/ /
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-1912-151/+397
|\|
| * pulled translations from transifex1.6.0Daniel 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 ↵Daniel Gultsch2015-08-191-0/+1
| | | | | | | | 32826ec29d28668b7f345ffcd45cd876dc980153
* | 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
|\|
| * increased version codeDaniel Gultsch2015-08-161-1/+1
| |
| * 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
| |
* | version bump to 1.7.0-alpha to start new development cycleDaniel Gultsch2015-08-151-2/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 16:46:31 +0000