Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | include pgp and omemo fallback message only when unencrypted is enabled | Daniel Gultsch | 2016-07-17 | 1 | -2/+5 |
| | |||||
* | respond to XEP-0202: Entity Time | Daniel Gultsch | 2016-07-13 | 2 | -0/+20 |
| | |||||
* | support jingle ft:4 to be compatible with swift | Daniel Gultsch | 2016-06-30 | 1 | -1/+3 |
| | | | | Conversations and Gajim both have an implementation bug that sends the jingle session id instead of the transport id (compare XEP-260 2.2). This commit has a work around for this that remains buggy when using ft:3. If gajim is ever to fix this we will be incompatbile. gajim should implement ft:4 instead. (gajim to gajim is broken as well) | ||||
* | actually do add fall back message for omemo | Daniel Gultsch | 2016-06-12 | 1 | -1/+1 |
| | |||||
* | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-06-06 | 1 | -2/+3 |
|\ | |||||
| * | opt-in to send last userinteraction in presence | Daniel Gultsch | 2016-06-04 | 1 | -4/+3 |
| | | |||||
* | | optimize imports | Christian Schneppe | 2016-05-31 | 1 | -2/+0 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-29 | 1 | -1/+3 |
|\| | |||||
| * | avoid npe when sending omemo messages to group | Daniel Gultsch | 2016-05-29 | 1 | -1/+3 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-27 | 3 | -3/+28 |
|\| | |||||
| * | make newly created conferences private by default | Daniel Gultsch | 2016-05-26 | 1 | -0/+10 |
| | | |||||
| * | sending warning to receiving client if that client doesn't support omemo. | Daniel Gultsch | 2016-05-25 | 1 | -1/+13 |
| | | | | | | | | fixes #1873 | ||||
| * | only subscribe to omemo pep events if omemo is enabled | Daniel Gultsch | 2016-05-25 | 1 | -2/+5 |
| | | |||||
| * | make omemo default when all resources support it | Daniel Gultsch | 2016-05-12 | 1 | -1/+1 |
| | | |||||
| * | check if pgpengine is still bound before using it | Daniel Gultsch | 2016-05-12 | 1 | -1/+1 |
| | | |||||
* | | make omemo default when all resources support it | Daniel Gultsch | 2016-05-13 | 1 | -1/+1 |
| | | |||||
* | | check if pgpengine is still bound before using it | Daniel Gultsch | 2016-05-13 | 1 | -1/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-05-05 | 1 | -2/+4 |
|\| | |||||
| * | refactor captcha response handling to avoid network on main thread exception | Daniel Gultsch | 2016-05-05 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-26 | 1 | -1/+0 |
|\| | |||||
| * | only add image files to media scanner | Daniel Gultsch | 2016-03-23 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 1 | -0/+7 |
|\| | |||||
| * | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 1 | -0/+7 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-20 | 3 | -0/+10 |
|\| | |||||
| * | added setting to opt-out of message correction. renamed preferences and ↵ | Daniel Gultsch | 2016-02-16 | 1 | -1/+6 |
| | | | | | | | | options to settings | ||||
| * | basic support for XEP-0308: Last Message Correction. fixes #864 | Daniel Gultsch | 2016-02-15 | 2 | -0/+4 |
| | | |||||
| * | add missing type='submit' attribute to enable push form | Daniel Gultsch | 2016-02-15 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-14 | 2 | -1/+30 |
|\| | |||||
| * | send push enable to server. simplified logging | Daniel Gultsch | 2016-02-13 | 2 | -0/+15 |
| | | |||||
| * | client side support for XEP-0357: Push Notifications | Daniel Gultsch | 2016-02-12 | 1 | -1/+15 |
| | | |||||
* | | Add device name to client info | Artem Shipovskiy | 2016-02-04 | 2 | -0/+11 |
| | | |||||
* | | Merge remote-tracking branch 'siacs/master' into development | Christian S | 2016-02-04 | 1 | -15/+4 |
|\| | |||||
| * | Use a Presence class for presence information | Stephen Paul Weber | 2016-01-24 | 1 | -15/+4 |
| | | | | | | | | Only has status for now, but doing it so I can add disco to it | ||||
* | | copy commits | Christian S | 2016-01-04 | 1 | -12/+1 |
|\| | |||||
| * | add obb url to unencrypted messages | Daniel Gultsch | 2016-01-03 | 1 | -0/+1 |
| | | |||||
| * | removed xhtml body. fixes #1594 | Daniel Gultsch | 2016-01-01 | 1 | -12/+0 |
| | | |||||
* | | copy commits | Christian S | 2015-12-18 | 1 | -0/+1 |
|\| | |||||
| * | add 'store' message hint to displayed chat markers | Daniel Gultsch | 2015-12-17 | 1 | -0/+1 |
| | | |||||
| * | renamed pretty-please-store message hint to store | Daniel Gultsch | 2015-12-10 | 1 | -1/+1 |
| | | |||||
| * | combine multiple message receipts into single message | Daniel Gultsch | 2015-12-01 | 1 | -6/+8 |
| | | |||||
* | | renamed pretty-please-store message hint to store | Daniel Gultsch | 2015-12-12 | 1 | -1/+1 |
| | | |||||
* | | combine multiple message receipts into single message | Daniel Gultsch | 2015-12-04 | 1 | -6/+8 |
| | | |||||
* | | copy commits | Christian S | 2015-11-29 | 1 | -1/+0 |
|\| | |||||
| * | Sign empty status | fiaxh | 2015-11-09 | 1 | -1/+0 |
| | | |||||
* | | change IDENTITY_NAME | Christian S | 2015-11-17 | 1 | -1/+1 |
|/ | |||||
* | push CN into nick pep node when uploading certificate. subscribe to nick node | Daniel Gultsch | 2015-10-29 | 2 | -0/+7 |
| | |||||
* | introduced code to verify omemo device keys with x509 certificates. | Daniel Gultsch | 2015-10-16 | 1 | -3/+7 |
| | | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do | ||||
* | add menu item in account details to renew certificate | Daniel Gultsch | 2015-10-11 | 1 | -0/+21 |
| | |||||
* | Captcha support. | Armin Novak | 2015-10-11 | 1 | -0/+10 |
| | |||||
* | removed oob element from file messages | Daniel Gultsch | 2015-10-08 | 1 | -1/+0 |
| |