Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #1364 from betheg/jdk15on | Daniel Gultsch | 2015-08-25 | 1 | -1/+1 | |
|\ \ | |/ |/| | update bcprov-jdk15on to v1.52 | |||||
| * | update bcprov-jdk15on to v1.52 | Michael | 2015-08-25 | 1 | -1/+1 | |
| | | ||||||
* | | Pass through device IDs when updating own list | Andreas Straub | 2015-08-25 | 1 | -17/+17 | |
| | | ||||||
* | | cleared up some error messages in axolotl service and execute ↵ | Daniel Gultsch | 2015-08-25 | 1 | -3/+7 | |
| | | | | | | | | publishOwnDevicesWhenNeeded() only if processing our own jid | |||||
* | | catch some db query exceptions | Daniel Gultsch | 2015-08-25 | 1 | -3/+5 | |
| | | ||||||
* | | additonal null checks in file backend | Daniel Gultsch | 2015-08-25 | 1 | -0/+3 | |
| | | ||||||
* | | fixed session time | Daniel Gultsch | 2015-08-25 | 1 | -7/+2 | |
|/ | ||||||
* | Merge pull request #1363 from betheg/minidns | Daniel Gultsch | 2015-08-25 | 1 | -1/+1 | |
|\ | | | | | update minidns to v0.1.7 | |||||
| * | update minidns to v0.1.7 | Michael | 2015-08-25 | 1 | -1/+1 | |
|/ | ||||||
* | Merge pull request #1362 from betheg/roundedimageview | Daniel Gultsch | 2015-08-25 | 1 | -1/+1 | |
|\ | | | | | update roundedimageview to v2.2.0 | |||||
| * | update roundedimageview to v2.2.0 | Michael | 2015-08-25 | 1 | -1/+1 | |
|/ | ||||||
* | Merge branch 'betheg-sdk_version' into development | Daniel Gultsch | 2015-08-24 | 2 | -7/+7 | |
|\ | ||||||
| * | Merge branch 'sdk_version' of https://github.com/betheg/Conversations into ↵ | Daniel Gultsch | 2015-08-24 | 2 | -7/+7 | |
|/| | | | | | | | betheg-sdk_version | |||||
| * | add the the previously deleted build-tools. | Michael | 2015-08-24 | 1 | -0/+3 | |
| | | ||||||
| * | update travis.yml | Michael | 2015-08-24 | 1 | -4/+2 | |
| | | ||||||
| * | update android sdk and support library. | Michael | 2015-08-24 | 1 | -6/+5 | |
| | | | | | | | | | | make use of the archivesBaseName and rename only 'zipaligned' release build. | |||||
* | | version bump to 1.7.0-beta | Daniel Gultsch | 2015-08-24 | 1 | -2/+2 | |
| | | ||||||
* | | increased carbon grace period to 90s | Daniel Gultsch | 2015-08-24 | 1 | -1/+1 | |
| | | ||||||
* | | pulled translations from transifex | Daniel Gultsch | 2015-08-24 | 25 | -49/+18 | |
| | | ||||||
* | | renamed plain text to unencrypted. fixes #1331 | Daniel Gultsch | 2015-08-24 | 28 | -53/+53 | |
| | | ||||||
* | | fixed regression with mlinks stream managment. fixes #1206 | Daniel Gultsch | 2015-08-24 | 1 | -1/+1 | |
| | | ||||||
* | | added setting to allow for white backgrounds in incoming message bubbles | Daniel Gultsch | 2015-08-24 | 27 | -36/+234 | |
| | | ||||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-24 | 1 | -1/+1 | |
|\ \ | |/ |/| | ||||||
| * | catch invalid base64 in axolotl key parsing | Daniel Gultsch | 2015-08-24 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 3 | -2/+5 | |
|\| | ||||||
| * | version bump to 1.6.3 and changelog | Daniel Gultsch | 2015-08-23 | 2 | -2/+5 | |
| | | ||||||
| * | open files with capital extensions as well. fixes #1354 | Daniel Gultsch | 2015-08-23 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 2 | -3/+2 | |
|\| | ||||||
| * | bugfix: next encryption is now being properly detected | Daniel Gultsch | 2015-08-23 | 2 | -3/+2 | |
| | | ||||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 2 | -1/+4 | |
|\| | ||||||
| * | version bump to 1.6.2 and changelog | Daniel Gultsch | 2015-08-23 | 2 | -2/+5 | |
| | | ||||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 7 | -18/+16 | |
|\| | ||||||
| * | introduce special iq type for internal timeouts. always use != result to ↵ | Daniel Gultsch | 2015-08-23 | 7 | -20/+18 | |
| | | | | | | | | check for error in callbacks | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 1 | -10/+10 | |
|\| | ||||||
| * | reformating | Daniel Gultsch | 2015-08-23 | 1 | -3/+1 | |
| | | ||||||
| * | deal with another set of stream:features after bind | Daniel Gultsch | 2015-08-23 | 1 | -7/+9 | |
| | | ||||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 8 | -178/+218 | |
|\| | ||||||
| * | added changelog for 1.6.1 | Daniel Gultsch | 2015-08-23 | 1 | -0/+3 | |
| | | ||||||
| * | version bump to 1.6.1 | Daniel Gultsch | 2015-08-23 | 1 | -2/+2 | |
| | | ||||||
| * | Add error handling to OMEMO PEP code | Andreas Straub | 2015-08-23 | 1 | -116/+131 | |
| | | | | | | | | Log received errors and abort processing | |||||
| * | remove the READ_PHONE_STATE permission. | Michael | 2015-08-23 | 1 | -0/+2 | |
| | | ||||||
| * | remove callbacks directly from iterator | Daniel Gultsch | 2015-08-23 | 1 | -2/+2 | |
| | | ||||||
| * | don't make subsequent iq request when original stanza returned an error | Daniel Gultsch | 2015-08-23 | 2 | -51/+67 | |
| | | ||||||
| * | modified clearIqCallbacks into 2-step process | Daniel Gultsch | 2015-08-23 | 3 | -19/+23 | |
| | | ||||||
* | | Merge pull request #1348 from betheg/zxing | Daniel Gultsch | 2015-08-23 | 1 | -2/+2 | |
|\ \ | | | | | | | update zxing to v3.2.1 | |||||
| * | | update zxing to v3.2.1 | Michael | 2015-08-23 | 1 | -2/+2 | |
|/ / | ||||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-19 | 12 | -151/+397 | |
|\| | ||||||
| * | pulled translations from transifex | Daniel Gultsch | 2015-08-19 | 12 | -151/+397 | |
| | | ||||||
* | | simulate old behaviour with messages being set to waiting while offline | Daniel Gultsch | 2015-08-19 | 2 | -3/+10 | |
| | | ||||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-19 | 1 | -0/+1 | |
|\| |