aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/http (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * | untested pgp support for http uploadDaniel Gultsch2015-06-291-1/+22
| * | added trigger to Config.java to always enable aes encryption for uploaded filesDaniel Gultsch2015-06-291-0/+13
| * | show attach button in conferences when http upload is availableDaniel Gultsch2015-06-291-0/+1
| * | initial http upload supportDaniel Gultsch2015-06-293-6/+177
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-162-2/+4
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-102-2/+2
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-022-7/+7
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-062-6/+10
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-231-1/+2
|\| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-192-338/+0
| |/
* | fixes FS#44 - IOException if content-length is not presentlookshe2015-08-211-3/+3
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-113-94/+319
|/
* Use platform ciphers as well, just prefer oursSam Whited2015-02-021-1/+1
* Harden the TLS connection cipher suitesSam Whited2015-01-141-37/+44
* keep proper image file extensionDaniel Gultsch2015-01-111-4/+13
* made checks for valid image extensions case insensitiveDaniel Gultsch2015-01-041-1/+1
* remove unused imports.Michael2014-11-211-1/+0
* progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-151-2/+13
* bug fixes and various improvements for file transferiNPUTmice2014-11-151-7/+1
* basic arbitrary file transferiNPUTmice2014-11-151-0/+15
* create file explicitly before downloading imageiNPUTmice2014-11-031-0/+2
* more error handling for http connectioniNPUTmice2014-11-031-9/+12
* Merge branch 'gradle' into developmentSam Whited2014-10-301-4/+19
* Make conversations the root projectSam Whited2014-10-222-0/+283