aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/Config.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ssh://git.fucktheforce.de/conversationslookshe2015-01-031-0/+8
|\
| * clean up conversation history after swtiching to a different conversationiNPUTmice2014-12-171-0/+1
| * Handle time comparisons using longsSam Whited2014-12-161-1/+1
| * go through mam history page by page. load mam dynamically on scrolliNPUTmice2014-12-151-2/+4
| * various mam improvmentsiNPUTmice2014-12-131-1/+3
| * added max history age (default 1w). automatically sort newly added mam messagesiNPUTmice2014-12-101-0/+2
| * cleanup: removed unused emoticon parsingiNPUTmice2014-12-091-1/+0
* | remaining part of my patchlookshe2015-01-031-0/+1
|/
* progress for ibb transfersiNPUTmice2014-11-151-0/+2
* support for pgp filesiNPUTmice2014-11-151-1/+1
* progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-151-0/+1
* Merge branch 'gradle' into developmentSam Whited2014-10-301-0/+1
* Make conversations the root projectSam Whited2014-10-221-0/+25