aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/AbstractConnectionManager.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixed merge issue for resolving FS#47 (preferences involved in the decision f...steckbrief2016-02-241-10/+0
* Imports organizedsteckbrief2016-02-121-1/+0
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-0/+129
|\
| * fix cancelation of http downloads and enable resumeDaniel Gultsch2015-12-111-1/+9
| * request storage permission when needed on Android 6.0Daniel Gultsch2015-12-071-0/+11
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-111-9/+5
| * put wake locks on out of band file transfersDaniel Gultsch2015-08-101-0/+7
| * report wrong file size in otr encrypted jingle file transfers to be compatibl...Daniel Gultsch2015-08-101-1/+2
| * enable axolotl encryption for jingle supported file transfersDaniel Gultsch2015-08-011-0/+97
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-4/+0
|\ \
* | | Merge trz/rename into trz/rebasesteckbrief2015-10-221-7/+3
|\| | | |/ |/|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-23/+0
|/
* Make conversations the root projectSam Whited2014-10-221-0/+23