aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-1/+1
|\|
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+1
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-171-5/+1
|\|
| * made constructor private in Account entityDaniel Gultsch2016-01-161-5/+1
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-01-102-4/+26
|\|
| * added Config.java variable to change the default notification behaviour to ↵Daniel Gultsch2016-01-081-1/+1
| | | | | | | | always
| * show per conference notification settings in details activityDaniel Gultsch2016-01-081-1/+15
| |
| * Merge pull request #1641 from fiaxh/uuid-fixDaniel Gultsch2016-01-081-1/+1
| |\ | | | | | | Correct uuid check according to RFC 4122
| | * Correct uuid check according to RFC 4122fiaxh2016-01-051-1/+1
| | |
| * | avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
| |/
* | copy commitsChristian S2016-01-041-1/+1
|\|
| * only report error after third unsuccesful attempt to connectDaniel Gultsch2016-01-041-1/+1
| |
* | copy commitsChristian S2015-12-282-2/+14
|\|
| * fixed stuck at omemo encryption when x509 verification is being usedDaniel Gultsch2015-12-271-7/+7
| |
| * use presence name not server name when verification is being usedDaniel Gultsch2015-12-191-3/+3
| |
| * only offer plain and omemo encryption when x509 verification is enabledDaniel Gultsch2015-12-191-1/+10
| |
| * prefer server name over address book name when x509 verification is being usedDaniel Gultsch2015-12-191-1/+4
| |
* | copy commitsChristian S2015-12-161-1/+1
|\|
| * splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+1
| |
| * set bookmark name to room subject if no subject has been set beforeDaniel Gultsch2015-12-111-0/+10
| |
| * get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-111-24/+6
| |
| * when no avatar found show avatar of contact and not the muc user in conferencesDaniel Gultsch2015-12-091-3/+3
| |
| * properly clear muc user avatar cachesDaniel Gultsch2015-12-041-2/+7
| |
| * Merge pull request #1595 from fiaxh/pgp_database_signatureDaniel Gultsch2015-12-041-4/+13
| |\ | | | | | | Regenerate PGP signatures once
| | * Unset all PGP signatures oncefiaxh2015-12-021-4/+13
| | | | | | | | | | | | ... so they will be redone to match the changed status.
| * | rely on message id if message id is uuid and pgp encryption was used to ↵Daniel Gultsch2015-12-041-1/+3
| | | | | | | | | | | | deduplicate messages. fixes #1357
| * | use proposed nick as default nick in mucoptionsDaniel Gultsch2015-12-041-1/+1
| | |
| * | parse vcard avatars from muc presencesDaniel Gultsch2015-12-031-155/+122
| | |
| * | Show status message when contact requests presenceSam Whited2015-12-021-1/+1
| |/ | | | | | | Remove presence when conversation closed
| * introduced build-time paranoia mode that disables unencrypted chats and ↵Daniel Gultsch2015-12-011-2/+9
| | | | | | | | forces TOR
| * add error state for unavailable tor networkDaniel Gultsch2015-12-011-3/+3
| |
| * do socks5 connect manuallyDaniel Gultsch2015-12-011-16/+4
| |
| * initial tor supportDaniel Gultsch2015-12-011-4/+46
| |
* | set bookmark name to room subject if no subject has been set beforeDaniel Gultsch2015-12-121-0/+10
| |
* | get rid of lastMessageTransmitted in favor of db queryDaniel Gultsch2015-12-121-24/+6
| |
* | when no avatar found show avatar of contact and not the muc user in conferencesDaniel Gultsch2015-12-121-3/+3
| |
* | properly clear muc user avatar cachesDaniel Gultsch2015-12-061-2/+7
| |
* | rely on message id if message id is uuid and pgp encryption was used to ↵Daniel Gultsch2015-12-041-1/+3
| | | | | | | | deduplicate messages. fixes #1357
* | use proposed nick as default nick in mucoptionsDaniel Gultsch2015-12-041-1/+1
| |
* | Unset all PGP signatures oncefiaxh2015-12-041-4/+13
| | | | | | | | ... so they will be redone to match the changed status.
* | introduced build-time paranoia mode that disables unencrypted chats a…Daniel Gultsch2015-12-041-2/+9
| | | | | | | | …nd forces TOR
* | add error state for unavailable tor networkDaniel Gultsch2015-12-041-3/+3
| |
* | do socks5 connect manuallyDaniel Gultsch2015-12-041-16/+4
| |
* | initial tor supportDaniel Gultsch2015-12-041-4/+46
| |
* | parse vcard avatars from muc presencesDaniel Gultsch2015-12-041-155/+122
| |
* | Show status message when contact requests presenceSam Whited2015-12-041-1/+1
| | | | | | | | Remove presence when conversation closed
* | copy commitsChristian S2015-11-293-30/+67
|\|
| * hide subject edit button if not editable by userDaniel Gultsch2015-11-261-4/+18
| |
| * detect server identity and added muc-workaround for slackDaniel Gultsch2015-11-261-0/+8
| |
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-252-24/+5
| |