aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-102-7/+8
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-022-4/+4
|\|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-194-530/+0
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-0/+10
|/
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-11/+11
* migrated more jid parsing to use getAttributeAsJid. added error loggingiNPUTmice2014-12-151-0/+4
* very basic mam supportiNPUTmice2014-12-101-0/+5
* more refactoring for presence selection. removed getTo, getFrom and getJid fr...iNPUTmice2014-11-101-27/+3
* Update more files to use JID objectsSam Whited2014-11-091-2/+40
* Make conversations the root projectSam Whited2014-10-224-0/+507