aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities/Presences.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-011-1/+3
|\
| * don't show empty templatesDaniel Gultsch2016-06-011-1/+3
| |
| * don't show duplicate status message in contact detailsDaniel Gultsch2016-05-131-3/+3
| |
| * show presence of other resources as templateDaniel Gultsch2016-05-131-0/+11
| |
| * make omemo default when all resources support itDaniel Gultsch2016-05-121-2/+15
| |
* | optimize importsChristian Schneppe2016-05-311-4/+0
| |
* | don't show duplicate status message in contact detailsDaniel Gultsch2016-05-131-3/+3
| |
* | show presence of other resources as templateDaniel Gultsch2016-05-131-0/+11
| |
* | make omemo default when all resources support itDaniel Gultsch2016-05-131-2/+15
|/
* show status messages in contact detailsDaniel Gultsch2016-04-231-0/+14
|
* Use a Presence class for presence informationStephen Paul Weber2016-01-241-38/+8
| | | | Only has status for now, but doing it so I can add disco to it
* Don't synchronize on non-final fieldSam Whited2015-10-261-1/+1
|
* made presences synchronizediNPUTmice2014-11-131-13/+27
|
* Make conversations the root projectSam Whited2014-10-221-0/+76