aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/generator (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-202-27/+11
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+5
|\|
* | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-0/+7
|\ \
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-291-0/+7
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-022-6/+0
* | | Fixes FS#148: Remove 'store' hint from chat-markerssteckbrief2016-03-021-2/+1
* | | Removed stupid message correctionsteckbrief2016-02-231-6/+0
* | | Removed unnecessary dependencies to XmppConnectionService and added allowMess...steckbrief2016-02-232-26/+2
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-223-1/+61
|\| |
| * | added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-161-1/+6
| * | 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
| * | 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
* | | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-14/+9
|\| |
| * | Use a Presence class for presence informationStephen Paul Weber2016-01-241-15/+4
* | | Fixes FS#105: XHTML par for images addedsteckbrief2016-02-131-0/+12
* | | Fixed overwriting of changes for fixing FS#70. Unused method removed from gen...steckbrief2016-02-134-73/+0
* | | Imports organizedsteckbrief2016-02-123-7/+2
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-1/+1
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-114-44/+269
|\| |
| * | add obb url to unencrypted messagesDaniel Gultsch2016-01-031-0/+1
| * | removed xhtml body. fixes #1594Daniel Gultsch2016-01-011-12/+0
| * | 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
| * | Sign empty statusfiaxh2015-11-091-1/+0
| * | 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
| * | 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
| * | introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-081-1/+16
| * | add xhtml image tag to unencrypted image urls. add oob tag to all files that ...Daniel Gultsch2015-10-071-2/+18
| * | use Conversations 1.x.y as user agent string in http upload and downloadDaniel Gultsch2015-09-231-3/+3
| * | fixed content-type indication in http uploadDaniel Gultsch2015-09-191-1/+1
| * | added missing type='submit' to mam queriesDaniel Gultsch2015-09-151-3/+4
| * | use same method to add message hints to otr message everywhere it is neededDaniel Gultsch2015-09-011-5/+9
| * | tag axolotl messages with pretty-please-storeDaniel Gultsch2015-09-011-0/+1
| * | use content-type in http slot request and stick with during uploadDaniel Gultsch2015-08-011-1/+4
| * | Refactor axolotl message processing workflowAndreas Straub2015-07-311-1/+1
| * | add no-store to chat statesDaniel Gultsch2015-07-221-0/+2
| * | use type=chat more often to go along with new, simple carbon and mam rulesDaniel Gultsch2015-07-221-6/+5
| * | made image file format configurable by Config.javaDaniel Gultsch2015-07-211-4/+0
| * | bugfix: also add no-permanent-storage to message hintsDaniel Gultsch2015-07-211-0/+1
| * | Refactor axolotl send processing/caching flowAndreas Straub2015-07-201-4/+1
| * | attempt to fix the delay problemDaniel Gultsch2015-07-201-27/+7
| * | Optimize importsAndreas Straub2015-07-202-5/+3
| * | Clean up loggingAndreas Straub2015-07-191-1/+1
| * | Rework PEP content verificationAndreas Straub2015-07-191-1/+1