| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge tag '1.9.4' into trz/merge_1.9.4trz/merge_1.9.4 | lookshe | 2016-02-16 | 1 | -1/+2 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values/arrays.xml | ||||
| | * | use TLSv1.2 as SSL context on supported plattforms | Daniel Gultsch | 2016-02-03 | 1 | -1/+2 |
| | | | |||||
| * | | Imports organized | steckbrief | 2016-02-12 | 1 | -2/+0 |
| |/ | |||||
| * | always use http proxy for http requests. (socks is leaking dns) | Daniel Gultsch | 2015-12-01 | 1 | -5/+1 |
| | | |||||
| * | initial tor support | Daniel Gultsch | 2015-12-01 | 1 | -0/+14 |
| | | |||||
| * | attempt to fix the delay problem | Daniel Gultsch | 2015-07-20 | 1 | -2/+2 |
| | | |||||
| * | renamed HttpConnection to HttpDownloadConnection | Daniel Gultsch | 2015-07-10 | 1 | -8/+8 |
| | | |||||
| * | get file upload ready to work with https | Daniel Gultsch | 2015-07-10 | 1 | -0/+46 |
| | | |||||
| * | display toast in ui on failed http download | Daniel Gultsch | 2015-07-10 | 1 | -1/+5 |
| | | | | | fixes #954 | ||||
| * | initial http upload support | Daniel Gultsch | 2015-06-29 | 1 | -1/+13 |
| | | | | | be careful: little error handling and no encryption | ||||
| * | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+28 |
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |