aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/generator (follow)
Commit message (Collapse)AuthorAgeFilesLines
* include pgp and omemo fallback message only when unencrypted is enabledDaniel Gultsch2016-07-171-2/+5
|
* respond to XEP-0202: Entity TimeDaniel Gultsch2016-07-132-0/+20
|
* support jingle ft:4 to be compatible with swiftDaniel Gultsch2016-06-301-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 omemoDaniel Gultsch2016-06-121-1/+1
|
* Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-06-061-2/+3
|\
| * opt-in to send last userinteraction in presenceDaniel Gultsch2016-06-041-4/+3
| |
* | optimize importsChristian Schneppe2016-05-311-2/+0
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-291-1/+3
|\|
| * avoid npe when sending omemo messages to groupDaniel Gultsch2016-05-291-1/+3
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master'Christian Schneppe2016-05-273-3/+28
|\|
| * make newly created conferences private by defaultDaniel Gultsch2016-05-261-0/+10
| |
| * sending warning to receiving client if that client doesn't support omemo.Daniel Gultsch2016-05-251-1/+13
| | | | | | | | fixes #1873
| * only subscribe to omemo pep events if omemo is enabledDaniel Gultsch2016-05-251-2/+5
| |
| * make omemo default when all resources support itDaniel Gultsch2016-05-121-1/+1
| |
| * check if pgpengine is still bound before using itDaniel Gultsch2016-05-121-1/+1
| |
* | make omemo default when all resources support itDaniel Gultsch2016-05-131-1/+1
| |
* | check if pgpengine is still bound before using itDaniel Gultsch2016-05-131-1/+1
| |
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-2/+4
|\|
| * refactor captcha response handling to avoid network on main thread exceptionDaniel Gultsch2016-05-051-2/+4
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-261-1/+0
|\|
| * only add image files to media scannerDaniel Gultsch2016-03-231-1/+0
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-0/+7
|\|
| * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-0/+7
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-02-203-0/+10
|\|
| * added setting to opt-out of message correction. renamed preferences and ↵Daniel Gultsch2016-02-161-1/+6
| | | | | | | | options to settings
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-152-0/+4
| |
| * add missing type='submit' attribute to enable push formDaniel Gultsch2016-02-151-0/+1
| |
* | Merge branch 'siacs/master' into developmentChristian S2016-02-142-1/+30
|\|
| * send push enable to server. simplified loggingDaniel Gultsch2016-02-132-0/+15
| |
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-1/+15
| |
* | Add device name to client infoArtem Shipovskiy2016-02-042-0/+11
| |
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-041-15/+4
|\|
| * Use a Presence class for presence informationStephen Paul Weber2016-01-241-15/+4
| | | | | | | | Only has status for now, but doing it so I can add disco to it
* | copy commitsChristian S2016-01-041-12/+1
|\|
| * add obb url to unencrypted messagesDaniel Gultsch2016-01-031-0/+1
| |
| * removed xhtml body. fixes #1594Daniel Gultsch2016-01-011-12/+0
| |
* | copy commitsChristian S2015-12-181-0/+1
|\|
| * add 'store' message hint to displayed chat markersDaniel Gultsch2015-12-171-0/+1
| |
| * renamed pretty-please-store message hint to storeDaniel Gultsch2015-12-101-1/+1
| |
| * combine multiple message receipts into single messageDaniel Gultsch2015-12-011-6/+8
| |
* | renamed pretty-please-store message hint to storeDaniel Gultsch2015-12-121-1/+1
| |
* | combine multiple message receipts into single messageDaniel Gultsch2015-12-041-6/+8
| |
* | copy commitsChristian S2015-11-291-1/+0
|\|
| * Sign empty statusfiaxh2015-11-091-1/+0
| |
* | change IDENTITY_NAMEChristian S2015-11-171-1/+1
|/
* push CN into nick pep node when uploading certificate. subscribe to nick nodeDaniel Gultsch2015-10-292-0/+7
|
* introduced code to verify omemo device keys with x509 certificates.Daniel Gultsch2015-10-161-3/+7
| | | | cleaned up TrustKeysActivity to automatically close if there is nothing to do
* add menu item in account details to renew certificateDaniel Gultsch2015-10-111-0/+21
|
* Captcha support.Armin Novak2015-10-111-0/+10
|
* removed oob element from file messagesDaniel Gultsch2015-10-081-1/+0
|