aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Expand)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
* | optimize importsChristian Schneppe2016-05-318-14/+6
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-311-1/+1
|\|
| * use whitespace as message seperatorDaniel Gultsch2016-05-301-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-301-1/+1
|\|
| * Revert "always notify by default in conferences"Daniel Gultsch2016-05-291-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-291-0/+1
|\|
| * don't merge messages over the char limitDaniel Gultsch2016-05-291-0/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-281-1/+1
|\|
| * use EOT as message seperatorDaniel Gultsch2016-05-281-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-273-4/+17
|\|
| * don't push default muc conf twiceDaniel Gultsch2016-05-271-0/+10
| * add 'create conference' dialogDaniel Gultsch2016-05-261-3/+2
| * make newly created conferences private by defaultDaniel Gultsch2016-05-261-0/+1
| * show regitration failed try again later in UIDaniel Gultsch2016-05-241-1/+4
* | don't make OMEMO defaultChristian Schneppe2016-05-221-1/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-221-0/+15
|\|
| * show first unread message on top after reinitDaniel Gultsch2016-05-221-0/+15
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-204-80/+269
|\|
| * sync around individual calls instead of synchronizing entire objectDaniel Gultsch2016-05-191-49/+79
| * remove unwanted 'use previous encryption' lookupDaniel Gultsch2016-05-191-22/+1
| * also save form elements in disco storageDaniel Gultsch2016-05-191-2/+56
| * don't NPE on rare race condition while fetching MAMDaniel Gultsch2016-05-191-0/+9
| * improved ordering of muc participantsDaniel Gultsch2016-05-171-2/+23
| * refactored muc item parsing to also parse muc status messagesDaniel Gultsch2016-05-171-8/+4
| * offer offline members to be invited againDaniel Gultsch2016-05-171-2/+16
| * change affiliation for in memory users that are currently not joined in a con...Daniel Gultsch2016-05-161-3/+5
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-161-45/+129
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-162-2/+3
|\|
| * use the same typo in both saving disco and reading discoDaniel Gultsch2016-05-151-1/+2
| * escape HTML in OTR messages if other client is PidginDaniel Gultsch2016-05-151-1/+1
| * don't show duplicate status message in contact detailsDaniel Gultsch2016-05-131-3/+3
| * only default to omemo when all our devices support itDaniel Gultsch2016-05-131-0/+1
| * show presence of other resources as templateDaniel Gultsch2016-05-133-0/+35
| * make omemo default when all resources support itDaniel Gultsch2016-05-123-14/+36
| * always show download button when link is encryptedDaniel Gultsch2016-05-101-5/+1
| * report host-account as account state in UIDaniel Gultsch2016-05-101-1/+4
* | don't show duplicate status message in contact detailsDaniel Gultsch2016-05-131-3/+3
* | only default to omemo when all our devices support itDaniel Gultsch2016-05-131-0/+1
* | show presence of other resources as templateDaniel Gultsch2016-05-133-0/+35
* | make omemo default when all resources support itDaniel Gultsch2016-05-133-14/+36
* | always show download button when link is encryptedDaniel Gultsch2016-05-131-5/+1
* | report host-account as account state in UIDaniel Gultsch2016-05-131-1/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-061-1/+4
|\|
| * report bind failure as account stateDaniel Gultsch2016-05-051-1/+4
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-2/+2
|\|
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-2/+2
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into HEADChristian S2016-05-047-56/+150
|\|
| * fixed presence template dedup for 'online' statusDaniel Gultsch2016-05-031-1/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-20 15:01:54 +0000