aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* even less jumpyDaniel Gultsch2015-07-161-1/+3
* fixed some ux glitches in editaccountDaniel Gultsch2015-07-163-9/+9
* removed empty translation fileDaniel Gultsch2015-07-161-2/+0
* Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-07-161-3/+2
|\
| * Merge pull request #1285 from kriztan/patch-2Daniel Gultsch2015-07-161-1/+0
| |\
| | * fixed another typoChristian S.2015-07-161-1/+0
| |/
| * Merge pull request #1283 from Manouchehri/developmentDaniel Gultsch2015-07-161-1/+1
| |\
| | * Fixed broken URL.David Manouchehri2015-07-151-1/+1
| * | Merge pull request #1284 from kriztan/patch-1Daniel Gultsch2015-07-161-1/+1
| |\ \ | | |/ | |/|
| | * fixed typoChristian S.2015-07-161-1/+1
| |/
* | made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-1628-104/+334
* | fixed some npesDaniel Gultsch2015-07-161-4/+11
|/
* mention http upload component in readmeDaniel Gultsch2015-07-151-1/+5
* fixed crash on invalid muc bookmarksDaniel Gultsch2015-07-151-3/+7
* renamed colorsDaniel Gultsch2015-07-1336-165/+162
* catch exception on broken android phonesDaniel Gultsch2015-07-121-1/+7
* made lock button reflect encryption status of the next messages instead of th...Daniel Gultsch2015-07-121-16/+10
* only try to change affilations for known jidsDaniel Gultsch2015-07-111-1/+1
* try to catch weird npe in android sdkDaniel Gultsch2015-07-111-0/+2
* null check otr fingerprint before displayDaniel Gultsch2015-07-111-1/+3
* spellingDaniel Gultsch2015-07-111-1/+1
* added changelogDaniel Gultsch2015-07-101-0/+3
* version bump to 1.5.0-betaDaniel Gultsch2015-07-101-2/+2
* renamed HttpConnection to HttpDownloadConnectionDaniel Gultsch2015-07-106-19/+19
* renamed downloadable to transferableDaniel Gultsch2015-07-1014-101/+87
* get file upload ready to work with httpsDaniel Gultsch2015-07-103-38/+53
* display toast in ui on failed http downloadDaniel Gultsch2015-07-107-36/+105
* show timestamp on images in mucsDaniel Gultsch2015-07-101-1/+1
* added null check in sasl response verifierDaniel Gultsch2015-07-101-1/+1
* catch number format exception in server ackDaniel Gultsch2015-07-101-10/+14
* print stack trace instead of writing error message to log in case of unknown ...Daniel Gultsch2015-07-091-1/+1
* show contacts name in non anonymous mucs. fixes #1213Daniel Gultsch2015-07-051-2/+6
* refactored sendMessage and merged with resendMessageDaniel Gultsch2015-07-052-148/+117
* version bump to 1.4.7Daniel Gultsch2015-07-041-2/+2
* make sure unread count is initialized as 0. fixes #1270Daniel Gultsch2015-07-031-1/+2
* avoid very rare npeDaniel Gultsch2015-07-032-2/+4
* Merge branch 'master' into developmentDaniel Gultsch2015-07-032-2/+3
|\
| * version bump to 1.4.61.4.6Daniel Gultsch2015-07-031-2/+2
| * added fallback for non-srv dns queriesDaniel Gultsch2015-07-031-0/+1
* | fixed share with activity to account for http file uploadDaniel Gultsch2015-07-022-43/+38
* | also offer http download for some 'well known extensions'Daniel Gultsch2015-07-022-1/+4
* | refactored message context menuDaniel Gultsch2015-07-025-43/+53
* | moved null check for to and from in message parserDaniel Gultsch2015-07-021-5/+6
* | changed mime type handlingDaniel Gultsch2015-07-017-54/+555
* | Merge branch 'feature/http_upload' into developmentDaniel Gultsch2015-06-3022-232/+475
|\ \
| * | disable automatic aes encryption for the time beingDaniel Gultsch2015-06-301-1/+1
| * | changed namespace of the http upload featureDaniel Gultsch2015-06-301-1/+1
| * | made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-309-69/+74
| * | made storage path decision entirely based upon file extensionDaniel Gultsch2015-06-301-2/+4
| * | refactored bodyContainsDownloadable to be more flexibleDaniel Gultsch2015-06-305-37/+39