aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Compile Clean after mergetrz/merge_1.5.2steckbrief2015-08-119-190/+174
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-11445-2629/+8423
|\
| * bump to version 1.5.21.5.2Daniel Gultsch2015-07-211-2/+2
| * fixed npe in error message handlingDaniel Gultsch2015-07-211-1/+1
| * version bump to 1.5.1 and changelog1.5.1Daniel Gultsch2015-07-212-2/+6
| * 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
| * pulled new translations from transifexDaniel Gultsch2015-07-212-1/+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
| * Merge branch 'development'Daniel Gultsch2015-07-1877-326/+593
| |\
| | * bump version to 1.5.01.5.0Daniel Gultsch2015-07-181-2/+2
| | * pulled translationsDaniel Gultsch2015-07-187-1/+15
| | * 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
| | * version bump to 1.5.0-beta.2Daniel Gultsch2015-07-162-3/+3
| | * 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
| * | Merge branch 'development'Daniel Gultsch2015-07-101-0/+3
| |\|
| | * added changelogDaniel Gultsch2015-07-101-0/+3
| * | Merge branch 'development'Daniel Gultsch2015-07-1035-660/+1466
| |\|
| | * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 18:46:13 +0000