Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | use build in method on >= lolipop devices to discover dns serverslolipop_dns_server_discovery | Daniel Gultsch | 2015-08-28 | 2 | -8/+41 |
| | |||||
* | reformating and upper bound for waiting on stanza writer | Daniel Gultsch | 2015-08-28 | 1 | -8/+16 |
| | |||||
* | fixed type=timeout | Daniel Gultsch | 2015-08-28 | 1 | -0/+2 |
| | |||||
* | added XEP number for http file upload | Daniel Gultsch | 2015-08-27 | 8 | -8/+41 |
| | |||||
* | use dedicated colors for primary and primary_dark | Daniel Gultsch | 2015-08-26 | 6 | -9/+10 |
| | |||||
* | version bump to 1.6.6 and changelog1.6.6 | Daniel Gultsch | 2015-08-26 | 2 | -2/+5 |
| | |||||
* | fixed highlight text color for white chat bubbles | Daniel Gultsch | 2015-08-26 | 1 | -0/+1 |
| | |||||
* | Fix error handling for announce check retrieval | Andreas Straub | 2015-08-26 | 1 | -3/+3 |
| | | | | | Only aborts when a timeout was received. Error conditions (most notably item-not-found) are interpreted as no other devices existing. | ||||
* | explictitly handle iq timeouts in bind and session iqs | Daniel Gultsch | 2015-08-26 | 1 | -2/+7 |
| | |||||
* | Only announce device after publishing bundle | Andreas Straub | 2015-08-26 | 2 | -8/+19 |
| | |||||
* | moved actual iq callback out of synchronized find callback block | Daniel Gultsch | 2015-08-26 | 1 | -3/+7 |
| | |||||
* | be more restrictive about marking messages as sent_received in muc parser | Daniel Gultsch | 2015-08-26 | 2 | -8/+18 |
| | |||||
* | Revert "improved compatibility with muc components that change the message id" | Daniel Gultsch | 2015-08-26 | 1 | -3/+2 |
| | | | | This reverts commit df86b0fc47cb7af8e97826f97d0e202405cff414. | ||||
* | version bump to 1.6.5 + changelog1.6.5 | Daniel Gultsch | 2015-08-26 | 2 | -2/+5 |
| | |||||
* | Fix key publishing | Andreas Straub | 2015-08-26 | 1 | -72/+68 |
| | | | | | | | Remove invalid check for result code, which prevented publishing if the node was empty to begin with. Fix pepBroken check | ||||
* | version bump to 1.6.4 and changelog1.6.4 | Daniel Gultsch | 2015-08-25 | 2 | -2/+7 |
| | |||||
* | Add more logging to pep attemp counter logic | Andreas Straub | 2015-08-25 | 1 | -0/+1 |
| | |||||
* | Limit number of PEP publish tries | Andreas Straub | 2015-08-25 | 1 | -9/+42 |
| | | | | | | If PEP publish tries are repeatedly triggered by empty PEP updates, stop attempting to publish after 3 tries. This should work around broken PEP implementations in older ejabberd and OpenFire versions. | ||||
* | Merge pull request #1365 from betheg/remove_imports | Daniel Gultsch | 2015-08-25 | 4 | -30/+1 |
|\ | | | | | remove unused imports. | ||||
| * | remove unused imports. | Michael | 2015-08-25 | 4 | -30/+1 |
| | | |||||
* | | 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 developmentdevelopment | Daniel Gultsch | 2015-08-23 | 3 | -2/+5 |
|\| | |||||
| * | version bump to 1.6.3 and changelog1.6.3 | 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 detected1.6.2 | Daniel Gultsch | 2015-08-23 | 2 | -3/+2 |
| | | |||||
* | | Merge branch 'master' into development | Daniel Gultsch | 2015-08-23 | 2 | -1/+4 |
|\| |