aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Expand)AuthorAgeFilesLines
* Compilation errors and merge mixups fixedsteckbrief2016-02-112-2/+3
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-119-460/+636
|\
| * refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-011-84/+57
| * try to make in-valid-session detection work for pgpDaniel Gultsch2016-01-291-3/+10
| * added config variable to allow non-tls connectionsDaniel Gultsch2016-01-221-1/+1
| * made constructor private in Account entityDaniel Gultsch2016-01-161-5/+1
| * added Config.java variable to change the default notification behaviour to al...Daniel Gultsch2016-01-081-1/+1
| * 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 4122fiaxh2016-01-051-1/+1
| * | avoid duplicate messages when sending files to mucs. fixes #1635Daniel Gultsch2016-01-061-2/+10
| |/
| * only report error after third unsuccesful attempt to connectDaniel Gultsch2016-01-041-1/+1
| * 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
| * 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
| |\
| | * Unset all PGP signatures oncefiaxh2015-12-021-4/+13
| * | rely on message id if message id is uuid and pgp encryption was used to dedup...Daniel Gultsch2015-12-041-1/+3
| * | 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
| |/
| * introduced build-time paranoia mode that disables unencrypted chats and force...Daniel Gultsch2015-12-011-2/+9
| * 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
| * 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
| * Use OpenPGP-API 9.0fiaxh2015-11-091-2/+36
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-2/+2
| * Merge pull request #1513 from fiaxh/pgp_background_decryptionDaniel Gultsch2015-10-302-0/+8
| |\
| | * Decrypt PGP messages in backgroundfiaxh2015-10-282-0/+8
| * | push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-291-3/+16
| |/
| * Don't synchronize on non-final fieldSam Whited2015-10-261-1/+1
| * fixed read conversations showing up as notifications after a restartDaniel Gultsch2015-10-211-5/+4
| * introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-0/+3
| * make unread status and notifications presistent across restartsDaniel Gultsch2015-10-142-14/+30
| * initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-091-6/+10
| * Show whether MAM is supported in MUCssaqura2015-10-061-0/+5
| * fixed NPE when executing rename callback in mucDaniel Gultsch2015-09-281-1/+3
| * added missing type='submit' to mam queriesDaniel Gultsch2015-09-152-9/+5
| * added possibiltiy to set conferences as moderated (only visible in advanced m...Daniel Gultsch2015-09-131-6/+20
| * added mp4 to well known extensions. fixes #1403Daniel Gultsch2015-09-121-1/+1
| * Issues with URLs with multiple dots in file. fixes #1373Daniel Gultsch2015-09-041-7/+15