Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-23 | 1 | -1/+1 | |
|\| | ||||||
| * | added config variable to allow non-tls connections | Daniel Gultsch | 2016-01-22 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-17 | 1 | -5/+1 | |
|\| | ||||||
| * | made constructor private in Account entity | Daniel Gultsch | 2016-01-16 | 1 | -5/+1 | |
| | | ||||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-01-10 | 2 | -4/+26 | |
|\| | ||||||
| * | added Config.java variable to change the default notification behaviour to ↵ | Daniel Gultsch | 2016-01-08 | 1 | -1/+1 | |
| | | | | | | | | always | |||||
| * | show per conference notification settings in details activity | Daniel Gultsch | 2016-01-08 | 1 | -1/+15 | |
| | | ||||||
| * | Merge pull request #1641 from fiaxh/uuid-fix | Daniel Gultsch | 2016-01-08 | 1 | -1/+1 | |
| |\ | | | | | | | Correct uuid check according to RFC 4122 | |||||
| | * | Correct uuid check according to RFC 4122 | fiaxh | 2016-01-05 | 1 | -1/+1 | |
| | | | ||||||
| * | | avoid duplicate messages when sending files to mucs. fixes #1635 | Daniel Gultsch | 2016-01-06 | 1 | -2/+10 | |
| |/ | ||||||
* | | copy commits | Christian S | 2016-01-04 | 1 | -1/+1 | |
|\| | ||||||
| * | only report error after third unsuccesful attempt to connect | Daniel Gultsch | 2016-01-04 | 1 | -1/+1 | |
| | | ||||||
* | | copy commits | Christian S | 2015-12-28 | 2 | -2/+14 | |
|\| | ||||||
| * | fixed stuck at omemo encryption when x509 verification is being used | Daniel Gultsch | 2015-12-27 | 1 | -7/+7 | |
| | | ||||||
| * | use presence name not server name when verification is being used | Daniel Gultsch | 2015-12-19 | 1 | -3/+3 | |
| | | ||||||
| * | only offer plain and omemo encryption when x509 verification is enabled | Daniel Gultsch | 2015-12-19 | 1 | -1/+10 | |
| | | ||||||
| * | prefer server name over address book name when x509 verification is being used | Daniel Gultsch | 2015-12-19 | 1 | -1/+4 | |
| | | ||||||
* | | copy commits | Christian S | 2015-12-16 | 1 | -1/+1 | |
|\| | ||||||
| * | splite PARANOIA_MODE into three different options | Daniel Gultsch | 2015-12-14 | 1 | -1/+1 | |
| | | ||||||
| * | set bookmark name to room subject if no subject has been set before | Daniel Gultsch | 2015-12-11 | 1 | -0/+10 | |
| | | ||||||
| * | get rid of lastMessageTransmitted in favor of db query | Daniel Gultsch | 2015-12-11 | 1 | -24/+6 | |
| | | ||||||
| * | when no avatar found show avatar of contact and not the muc user in conferences | Daniel Gultsch | 2015-12-09 | 1 | -3/+3 | |
| | | ||||||
| * | properly clear muc user avatar caches | Daniel Gultsch | 2015-12-04 | 1 | -2/+7 | |
| | | ||||||
| * | Merge pull request #1595 from fiaxh/pgp_database_signature | Daniel Gultsch | 2015-12-04 | 1 | -4/+13 | |
| |\ | | | | | | | Regenerate PGP signatures once | |||||
| | * | Unset all PGP signatures once | fiaxh | 2015-12-02 | 1 | -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 Gultsch | 2015-12-04 | 1 | -1/+3 | |
| | | | | | | | | | | | | deduplicate messages. fixes #1357 | |||||
| * | | use proposed nick as default nick in mucoptions | Daniel Gultsch | 2015-12-04 | 1 | -1/+1 | |
| | | | ||||||
| * | | parse vcard avatars from muc presences | Daniel Gultsch | 2015-12-03 | 1 | -155/+122 | |
| | | | ||||||
| * | | Show status message when contact requests presence | Sam Whited | 2015-12-02 | 1 | -1/+1 | |
| |/ | | | | | | | Remove presence when conversation closed | |||||
| * | introduced build-time paranoia mode that disables unencrypted chats and ↵ | Daniel Gultsch | 2015-12-01 | 1 | -2/+9 | |
| | | | | | | | | forces TOR | |||||
| * | add error state for unavailable tor network | Daniel Gultsch | 2015-12-01 | 1 | -3/+3 | |
| | | ||||||
| * | do socks5 connect manually | Daniel Gultsch | 2015-12-01 | 1 | -16/+4 | |
| | | ||||||
| * | initial tor support | Daniel Gultsch | 2015-12-01 | 1 | -4/+46 | |
| | | ||||||
* | | set bookmark name to room subject if no subject has been set before | Daniel Gultsch | 2015-12-12 | 1 | -0/+10 | |
| | | ||||||
* | | get rid of lastMessageTransmitted in favor of db query | Daniel Gultsch | 2015-12-12 | 1 | -24/+6 | |
| | | ||||||
* | | when no avatar found show avatar of contact and not the muc user in conferences | Daniel Gultsch | 2015-12-12 | 1 | -3/+3 | |
| | | ||||||
* | | properly clear muc user avatar caches | Daniel Gultsch | 2015-12-06 | 1 | -2/+7 | |
| | | ||||||
* | | rely on message id if message id is uuid and pgp encryption was used to ↵ | Daniel Gultsch | 2015-12-04 | 1 | -1/+3 | |
| | | | | | | | | deduplicate messages. fixes #1357 | |||||
* | | use proposed nick as default nick in mucoptions | Daniel Gultsch | 2015-12-04 | 1 | -1/+1 | |
| | | ||||||
* | | Unset all PGP signatures once | fiaxh | 2015-12-04 | 1 | -4/+13 | |
| | | | | | | | | ... so they will be redone to match the changed status. | |||||
* | | introduced build-time paranoia mode that disables unencrypted chats a… | Daniel Gultsch | 2015-12-04 | 1 | -2/+9 | |
| | | | | | | | | …nd forces TOR | |||||
* | | add error state for unavailable tor network | Daniel Gultsch | 2015-12-04 | 1 | -3/+3 | |
| | | ||||||
* | | do socks5 connect manually | Daniel Gultsch | 2015-12-04 | 1 | -16/+4 | |
| | | ||||||
* | | initial tor support | Daniel Gultsch | 2015-12-04 | 1 | -4/+46 | |
| | | ||||||
* | | parse vcard avatars from muc presences | Daniel Gultsch | 2015-12-04 | 1 | -155/+122 | |
| | | ||||||
* | | Show status message when contact requests presence | Sam Whited | 2015-12-04 | 1 | -1/+1 | |
| | | | | | | | | Remove presence when conversation closed | |||||
* | | copy commits | Christian S | 2015-11-29 | 3 | -30/+67 | |
|\| | ||||||
| * | hide subject edit button if not editable by user | Daniel Gultsch | 2015-11-26 | 1 | -4/+18 | |
| | | ||||||
| * | detect server identity and added muc-workaround for slack | Daniel Gultsch | 2015-11-26 | 1 | -0/+8 | |
| | | ||||||
| * | pgp fixes and revert configuration changes | Daniel Gultsch | 2015-11-25 | 2 | -24/+5 | |
| | |