Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | removed empty translation file | Daniel Gultsch | 2015-07-16 | 1 | -2/+0 | |
| | ||||||
* | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2015-07-16 | 1 | -3/+2 | |
|\ | ||||||
| * | Merge pull request #1285 from kriztan/patch-2 | Daniel Gultsch | 2015-07-16 | 1 | -1/+0 | |
| |\ | | | | | | | fixed another typo | |||||
| | * | fixed another typo | Christian S. | 2015-07-16 | 1 | -1/+0 | |
| |/ | ||||||
| * | Merge pull request #1283 from Manouchehri/development | Daniel Gultsch | 2015-07-16 | 1 | -1/+1 | |
| |\ | | | | | | | Fixed broken URL. | |||||
| | * | Fixed broken URL. | David Manouchehri | 2015-07-15 | 1 | -1/+1 | |
| | | | | | | | | | The HTTPS server is throwing GitHub's certificate instead of a proper one, so I'm going to stick with HTTP for now. | |||||
| * | | Merge pull request #1284 from kriztan/patch-1 | Daniel Gultsch | 2015-07-16 | 1 | -1/+1 | |
| |\ \ | | |/ | |/| | fixed typo | |||||
| | * | fixed typo | Christian S. | 2015-07-16 | 1 | -1/+1 | |
| |/ | ||||||
* | | made 'check image on http host' message more generic. fixed #1281 | Daniel Gultsch | 2015-07-16 | 28 | -104/+334 | |
| | | ||||||
* | | fixed some npes | Daniel Gultsch | 2015-07-16 | 1 | -4/+11 | |
|/ | ||||||
* | mention http upload component in readme | Daniel Gultsch | 2015-07-15 | 1 | -1/+5 | |
| | ||||||
* | fixed crash on invalid muc bookmarks | Daniel Gultsch | 2015-07-15 | 1 | -3/+7 | |
| | ||||||
* | renamed colors | Daniel Gultsch | 2015-07-13 | 36 | -165/+162 | |
| | ||||||
* | catch exception on broken android phones | Daniel Gultsch | 2015-07-12 | 1 | -1/+7 | |
| | ||||||
* | made lock button reflect encryption status of the next messages instead of ↵ | Daniel Gultsch | 2015-07-12 | 1 | -16/+10 | |
| | | | | the last | |||||
* | only try to change affilations for known jids | Daniel Gultsch | 2015-07-11 | 1 | -1/+1 | |
| | ||||||
* | try to catch weird npe in android sdk | Daniel Gultsch | 2015-07-11 | 1 | -0/+2 | |
| | ||||||
* | null check otr fingerprint before display | Daniel Gultsch | 2015-07-11 | 1 | -1/+3 | |
| | ||||||
* | spelling | Daniel Gultsch | 2015-07-11 | 1 | -1/+1 | |
| | ||||||
* | added changelog | Daniel Gultsch | 2015-07-10 | 1 | -0/+3 | |
| | ||||||
* | version bump to 1.5.0-beta | Daniel Gultsch | 2015-07-10 | 1 | -2/+2 | |
| | ||||||
* | renamed HttpConnection to HttpDownloadConnection | Daniel Gultsch | 2015-07-10 | 6 | -19/+19 | |
| | ||||||
* | renamed downloadable to transferable | Daniel Gultsch | 2015-07-10 | 14 | -101/+87 | |
| | ||||||
* | get file upload ready to work with https | Daniel Gultsch | 2015-07-10 | 3 | -38/+53 | |
| | ||||||
* | display toast in ui on failed http download | Daniel Gultsch | 2015-07-10 | 7 | -36/+105 | |
| | | | | fixes #954 | |||||
* | show timestamp on images in mucs | Daniel Gultsch | 2015-07-10 | 1 | -1/+1 | |
| | | | | fixes #1178 | |||||
* | added null check in sasl response verifier | Daniel Gultsch | 2015-07-10 | 1 | -1/+1 | |
| | ||||||
* | catch number format exception in server ack | Daniel Gultsch | 2015-07-10 | 1 | -10/+14 | |
| | ||||||
* | print stack trace instead of writing error message to log in case of unknown ↵ | Daniel Gultsch | 2015-07-09 | 1 | -1/+1 | |
| | | | | exception in dnsutil | |||||
* | show contacts name in non anonymous mucs. fixes #1213 | Daniel Gultsch | 2015-07-05 | 1 | -2/+6 | |
| | ||||||
* | refactored sendMessage and merged with resendMessage | Daniel Gultsch | 2015-07-05 | 2 | -148/+117 | |
| | ||||||
* | version bump to 1.4.7 | Daniel Gultsch | 2015-07-04 | 1 | -2/+2 | |
| | ||||||
* | make sure unread count is initialized as 0. fixes #1270 | Daniel Gultsch | 2015-07-03 | 1 | -1/+2 | |
| | ||||||
* | avoid very rare npe | Daniel Gultsch | 2015-07-03 | 2 | -2/+4 | |
| | ||||||
* | Merge branch 'master' into development | Daniel Gultsch | 2015-07-03 | 2 | -2/+3 | |
|\ | ||||||
| * | version bump to 1.4.6 | Daniel Gultsch | 2015-07-03 | 1 | -2/+2 | |
| | | ||||||
| * | added fallback for non-srv dns queries | Daniel Gultsch | 2015-07-03 | 1 | -0/+1 | |
| | | ||||||
* | | fixed share with activity to account for http file upload | Daniel Gultsch | 2015-07-02 | 2 | -43/+38 | |
| | | ||||||
* | | also offer http download for some 'well known extensions' | Daniel Gultsch | 2015-07-02 | 2 | -1/+4 | |
| | | ||||||
* | | refactored message context menu | Daniel Gultsch | 2015-07-02 | 5 | -43/+53 | |
| | | ||||||
* | | moved null check for to and from in message parser | Daniel Gultsch | 2015-07-02 | 1 | -5/+6 | |
| | | ||||||
* | | changed mime type handling | Daniel Gultsch | 2015-07-01 | 7 | -54/+555 | |
| | | ||||||
* | | Merge branch 'feature/http_upload' into development | Daniel Gultsch | 2015-06-30 | 22 | -232/+475 | |
|\ \ | ||||||
| * | | disable automatic aes encryption for the time being | Daniel Gultsch | 2015-06-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | changed namespace of the http upload feature | Daniel Gultsch | 2015-06-30 | 1 | -1/+1 | |
| | | | ||||||
| * | | made httpconnection (download) ready all kind of files | Daniel Gultsch | 2015-06-30 | 9 | -69/+74 | |
| | | | ||||||
| * | | made storage path decision entirely based upon file extension | Daniel Gultsch | 2015-06-30 | 1 | -2/+4 | |
| | | | ||||||
| * | | refactored bodyContainsDownloadable to be more flexible | Daniel Gultsch | 2015-06-30 | 5 | -37/+39 | |
| | | | ||||||
| * | | always show copy original url in context menu when url is available | Daniel Gultsch | 2015-06-30 | 1 | -2/+1 | |
| | | | ||||||
| * | | untested pgp support for http upload | Daniel Gultsch | 2015-06-29 | 2 | -6/+31 | |
| | | |