index
:
conversations
BrianBlade-feature/swipe_out_conversation
CryptoNextAlpha
CryptoNextBeta
JingleFixes
MessageParserNext
UnreadCountBadge
cbe
delay_fixes
development
dnsfixes
feature/file_transfer
feature/foreground_service
feature/http_upload
feature/mam
feature/otr_verification
idn_fixes
issue921
lolipop_dns_server_discovery
master
more_logging_for_view_intent
muc_vcard_avatars
nfc
possible_copperhead_fixes
reworked_host_finder_loop
show_members_in_conference
show_send_button_in_softkeyboard
six_love
slack_workaround
tor_support
travis-fixes
travis_fixes
trz/emojicon-merge
trz/emojicon-new
trz/master
trz/merge_1.10.0
trz/merge_1.10.1
trz/merge_1.11.0
trz/merge_1.11.1
trz/merge_1.11.7
trz/merge_1.12.4
trz/merge_1.5.2
trz/merge_1.6.3
trz/merge_1.9.3
trz/merge_1.9.4
trz/rebase
trz/rename
trz/test
verbose_login_log
copy of conversations repo
lookshe
about
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
src
/
main
/
java
/
eu
/
siacs
/
conversations
/
http
/
HttpUploadConnection.java
(
follow
)
Commit message (
Expand
)
Author
Age
Files
Lines
*
Fixed overwriting of changes for fixing FS#70. Unused method removed from gen...
steckbrief
2016-02-13
1
-1
/
+2
*
Imports organized
steckbrief
2016-02-12
1
-5
/
+0
*
Compilation errors and merge mixups fixed
steckbrief
2016-02-11
1
-3
/
+2
*
Merge tag '1.9.3' into trz/merge_1.9.3
lookshe
2016-02-11
1
-24
/
+61
|
\
|
*
initial tor support
Daniel Gultsch
2015-12-01
1
-1
/
+10
|
*
use Conversations 1.x.y as user agent string in http upload and download
Daniel Gultsch
2015-09-23
1
-0
/
+1
|
*
work around a NPE caused by arace condition in the http upload
Daniel Gultsch
2015-09-15
1
-3
/
+6
|
*
do not touch pictures that are already in the right format
Daniel Gultsch
2015-08-11
1
-1
/
+8
|
*
put wake locks on out of band file transfers
Daniel Gultsch
2015-08-10
1
-0
/
+4
|
*
use content-type in http slot request and stick with during upload
Daniel Gultsch
2015-08-01
1
-1
/
+4
|
*
fixed calculated file size in http slot request
Daniel Gultsch
2015-08-01
1
-15
/
+13
|
*
enable axolotl encryption for jingle supported file transfers
Daniel Gultsch
2015-08-01
1
-18
/
+6
|
*
use gcm for file encryption over http
Daniel Gultsch
2015-07-29
1
-6
/
+26
|
*
changed logging. (work around logcat null pointer
Daniel Gultsch
2015-07-28
1
-1
/
+1
|
*
attempt to fix the delay problem
Daniel Gultsch
2015-07-20
1
-3
/
+5
|
*
Optimize imports
Andreas Straub
2015-07-20
1
-1
/
+1
|
*
Encrypt files for HTTP upload in encrypted chats
Andreas Straub
2015-07-19
1
-1
/
+3
|
*
bugfix: accept status code 201 on http upload
Daniel Gultsch
2015-07-19
1
-1
/
+1
|
*
renamed downloadable to transferable
Daniel Gultsch
2015-07-10
1
-5
/
+5
|
*
get file upload ready to work with https
Daniel Gultsch
2015-07-10
1
-0
/
+5
|
*
made httpconnection (download) ready all kind of files
feature/http_upload
Daniel Gultsch
2015-06-30
1
-2
/
+2
|
*
untested pgp support for http upload
Daniel Gultsch
2015-06-29
1
-1
/
+22
|
*
added trigger to Config.java to always enable aes encryption for uploaded files
Daniel Gultsch
2015-06-29
1
-0
/
+13
|
*
show attach button in conferences when http upload is available
Daniel Gultsch
2015-06-29
1
-0
/
+1
|
*
initial http upload support
Daniel Gultsch
2015-06-29
1
-0
/
+164
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-16
1
-1
/
+2
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-10
1
-1
/
+1
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-12-02
1
-4
/
+4
*
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
steckbrief
2015-11-06
1
-4
/
+6
*
Merge tag '1.5.2' into trz/rebase
trz/1.5.2.1
lookshe
2015-08-11
1
-0
/
+204