aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-151-35/+64
|\
| * fixed description in notifications and conversation overviewiNPUTmice2014-11-151-42/+14
| * fixed resending for files as welliNPUTmice2014-11-151-3/+3
| * made file transfers cancelableiNPUTmice2014-11-151-0/+5
| * support for pgp filesiNPUTmice2014-11-151-3/+11
| * copy non local files to private storage firstiNPUTmice2014-11-151-17/+28
| * bug fixes and various improvements for file transferiNPUTmice2014-11-151-1/+1
| * basic arbitrary file transferiNPUTmice2014-11-151-3/+36
* | turn on foreground service in expert settingsiNPUTmice2014-11-151-5/+14
|/
* temporarliy got rid of some insane work arounds in favor of some maybe less i...iNPUTmice2014-11-111-8/+8
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-101-208/+231
* migrated some otr stuff to new jid classesiNPUTmice2014-11-091-7/+9
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-17/+17
* refactored code to always contain full jid for counterpartiNPUTmice2014-11-091-25/+41
* It builds again!Sam Whited2014-11-091-5/+2
* Update more files to use JID objectsSam Whited2014-11-091-6/+6
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-84/+89
* fixed arrayoutofbounds + spellingiNPUTmice2014-11-011-1/+1
* Merge branch 'gradle' into developmentSam Whited2014-10-301-6/+28
* Make conversations the root projectSam Whited2014-10-221-0/+1927