aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-14/+10
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+5
|\|
* | Fixes FS#148: Remove 'store' hint from chat-markerssteckbrief2016-03-021-2/+1
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-0/+3
|\ \
| * | basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-151-0/+3
* | | Fixes FS#105: XHTML par for images addedtrz/merge_1.9.3steckbrief2016-02-131-0/+12
* | | Fixed overwriting of changes for fixing FS#70. Unused method removed from gen...steckbrief2016-02-131-4/+0
* | | Imports organizedsteckbrief2016-02-121-4/+0
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-35/+49
|\| |
| * | 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
| * | removed oob element from file messagesDaniel Gultsch2015-10-081-1/+0
| * | add xhtml image tag to unencrypted image urls. add oob tag to all files that ...Daniel Gultsch2015-10-071-2/+18
| * | 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
| * | 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-201-4/+3
| * | Clean up loggingAndreas Straub2015-07-191-1/+1
| * | Fetch bundles on-demand, encrypt in backgroundAndreas Straub2015-07-191-4/+6
| * | Reformat code to use tabsAndreas Straub2015-07-191-11/+11
| * | Added PEP and message protocol layersAndreas Straub2015-07-191-0/+21
| * | made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-301-2/+2
| * | initial http upload supportDaniel Gultsch2015-06-291-7/+15
| * | OTR: Fix onContactStatusChanged & dont archive OTRBrianBlade2015-04-211-0/+1
| * | Fix OTR-Error messagesBrianBlade2015-04-011-2/+2
* | | Merge trz/rename into trz/rebasesteckbrief2015-10-221-6/+5
|\ \ \ | | |/ | |/|
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-187/+0
| |/
* / Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-9/+19
|/
* respond to unreadable OTR messages with error message. fixed #1021iNPUTmice2015-03-211-0/+13
* # add delivery receipts for private muc msgsBrianBlade2015-03-181-0/+3
* added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-14/+6
* otr4j: update to 0.22Michael2015-01-201-1/+1
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-221-5/+5
* brought ad hoc conferences back. fixed #688 fixed #367iNPUTmice2014-11-201-2/+2
* Rework `Account.getJid()' to return full JIDsSam Whited2014-11-091-6/+6
* Update another chunk of stuff to use JID objectsSam Whited2014-11-091-2/+2
* Move a chunk of classes over to using JID objectsSam Whited2014-11-091-8/+9
* Make conversations the root projectSam Whited2014-10-221-0/+178