aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #551 from emdete/p4Daniel Gultsch2014-10-151-2/+12
|\
| * beautify render script to be easier to diff/patchM. Dietrich2014-10-151-2/+12
* | Merge pull request #547 from emdete/p0Daniel Gultsch2014-10-151-4/+4
|\ \
| * | remove warning about <> castM. Dietrich2014-10-151-4/+4
| |/
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-10-151-2/+2
|\|
| * Merge pull request #506 from SamWhited/string_fixesDaniel Gultsch2014-10-151-2/+2
| |\
| | * Remove full stop in description for consistencySam Whited2014-09-291-1/+1
| | * Fix typos in string resourceSam Whited2014-09-291-2/+2
* | | synchronization for listenersiNPUTmice2014-10-151-43/+60
* | | synchronization for notificationiNPUTmice2014-10-151-11/+17
* | | removed unecessary updateiNPUTmice2014-10-151-1/+0
|/ /
* | changed pgp decoding mechanismiNPUTmice2014-10-153-36/+47
* | don't show invalid file sizeiNPUTmice2014-10-141-1/+4
* | recreate http connection after restart. fixes stale download button. better f...iNPUTmice2014-10-144-26/+95
* | catch can't open database exceptioniNPUTmice2014-10-141-4/+9
* | read image bounds on downloaded imageiNPUTmice2014-10-146-31/+104
* | possible work around for notification bugiNPUTmice2014-10-141-0/+17
* | fixed rare npeiNPUTmice2014-10-141-2/+6
* | renamingiNPUTmice2014-10-1415-43/+39
* | basic image over http downloadingiNPUTmice2014-10-1420-213/+429
* | Merge pull request #543 from emdete/dedepricateDaniel Gultsch2014-10-131-1/+1
|\ \
| * | use setAlpha(float) method, not the depricated oneM. Dietrich2014-10-131-1/+1
* | | changed card boarder a bitiNPUTmice2014-10-131-4/+17
* | | reworked muc details and contact details a bitiNPUTmice2014-10-1314-323/+190
* | | added missing borderiNPUTmice2014-10-131-0/+6
* | | redesigned contact details a bitiNPUTmice2014-10-134-92/+84
|/ /
* | added rendered version of logoiNPUTmice2014-10-121-0/+0
* | updated flattr urliNPUTmice2014-10-121-1/+1
* | updated mtm to latest versioniNPUTmice2014-10-101-0/+0
* | version bump to 0.7.3 and changelog0.7.3iNPUTmice2014-10-092-3/+8
* | fixed npesiNPUTmice2014-10-092-5/+9
* | Merge pull request #528 from kruks23/translation6Daniel Gultsch2014-10-081-0/+4
|\ \
| * | Update Spanish Translationskruks232014-10-081-0/+4
|/ /
* | Merge pull request #527 from emdete/thisthisDaniel Gultsch2014-10-083-18/+13
|\ \
| * | remove this.this memberM. Dietrich2014-10-083-18/+13
|/ /
* | bullet proofing some codeiNPUTmice2014-10-082-8/+23
* | fixed possible logout bugsiNPUTmice2014-10-082-2/+5
* | refactored read markeriNPUTmice2014-10-074-28/+24
* | made disabled notifications permanent across restartsiNPUTmice2014-10-075-17/+34
* | refactored grace periodiNPUTmice2014-10-075-17/+32
* | fixed regression of not showing status messageiNPUTmice2014-10-071-1/+4
* | cleanung up the scroll fix a littleiNPUTmice2014-10-064-5/+10
* | work around for message scroll bugiNPUTmice2014-10-061-1/+2
* | fixed npeiNPUTmice2014-10-061-2/+5
* | muc options clean upiNPUTmice2014-10-063-30/+31
* | refactored muc bookmark to extend element. keep all elements the server or ot...iNPUTmice2014-10-069-93/+78
* | only delivery get and set iq packets to unhandled iq listener. only create ji...iNPUTmice2014-10-051-10/+18
* | made conversations overview list always 1/3 on tablet devicesiNPUTmice2014-10-051-3/+6
* | fixed rare npeiNPUTmice2014-10-051-0/+4
* | Merge pull request #524 from betheg/muc_errors_conditionsDaniel Gultsch2014-10-054-1/+42
|\ \