aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Compile Clean after mergetrz/merge_1.5.2steckbrief2015-08-117-150/+158
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-1160-2110/+3755
|\
| * fixed npe in error message handlingDaniel Gultsch2015-07-211-1/+1
| * and now do that properlyDaniel Gultsch2015-07-211-1/+1
| * end otr session when receiving failed otr message warningsDaniel Gultsch2015-07-211-1/+7
| * bugfix: also add no-permanent-storage to message hintsDaniel Gultsch2015-07-212-1/+2
| * bugfix: changed condition of onOtrSessionEstablished being calledDaniel Gultsch2015-07-211-6/+6
| * bugfix: don't crash if aes key could not be set before jingle transferDaniel Gultsch2015-07-211-1/+4
| * bugfix: use sendIqPacket method in service instead of invoking XmppConnection...Daniel Gultsch2015-07-211-3/+2
| * bugfix: accept status code 201 on http uploadDaniel Gultsch2015-07-211-1/+1
| * account for downloaded http files in dup checkerDaniel Gultsch2015-07-181-8/+18
| * code cleanupDaniel Gultsch2015-07-171-1/+1
| * fixed inactive http downloadDaniel Gultsch2015-07-171-1/+1
| * show error message in account details when info has not been editedDaniel Gultsch2015-07-171-1/+1
| * increased ibb block sizeDaniel Gultsch2015-07-172-4/+2
| * even less jumpyDaniel Gultsch2015-07-161-1/+3
| * fixed some ux glitches in editaccountDaniel Gultsch2015-07-161-7/+9
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-1/+2
| * fixed some npesDaniel Gultsch2015-07-161-4/+11
| * fixed crash on invalid muc bookmarksDaniel Gultsch2015-07-151-3/+7
| * renamed colorsDaniel Gultsch2015-07-132-13/+9
| * 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
| * 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-106-36/+104
| * 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
| * 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-031-0/+1
| |\
| | * 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-023-33/+38
| * | moved null check for to and from in message parserDaniel Gultsch2015-07-021-5/+6
| * | changed mime type handlingDaniel Gultsch2015-07-017-54/+555
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-27 04:38:07 +0000