aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/generator (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Fetch bundles on-demand, encrypt in backgroundAndreas Straub2015-07-191-4/+6
| * Migrate to new PEP layoutAndreas Straub2015-07-191-20/+9
| * Reformat code to use tabsAndreas Straub2015-07-192-29/+29
| * Added PEP and message protocol layersAndreas Straub2015-07-193-1/+94
| * made httpconnection (download) ready all kind of filesDaniel Gultsch2015-06-301-2/+2
| * initial http upload supportDaniel Gultsch2015-06-292-8/+26
| * r/o support for vcard avatars. pep avatars will be preferedDaniel Gultsch2015-05-051-1/+8
| * Fix typos in URL to the projectAlexander Groshev2015-05-031-2/+2
| * OTR: Fix onContactStatusChanged & dont archive OTRBrianBlade2015-04-211-0/+1
| * don't resume old session when changing resourceiNPUTmice2015-04-091-0/+7
| * Fix OTR-Error messagesBrianBlade2015-04-011-2/+2
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-151-60/+0
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-151-3/+3
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-4/+4
|\| |
* | | Merge trz/rename into trz/rebasesteckbrief2015-10-224-23/+6
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-052-19/+6
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-051-1/+2
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-194-525/+0