aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lacti...iNPUTmice2014-10-191-4/+17
|\
| * try all srv responses if necessaryFrank Zschockelt2014-10-161-4/+17
* | fixed typo in french translationiNPUTmice2014-10-191-1/+1
* | Merge pull request #555 from SamWhited/build-fixesDaniel Gultsch2014-10-191-0/+2
|\ \
| * | Fix problem when merging manifestsSam Whited2014-10-161-0/+2
* | | Merge pull request #566 from BenoitBouvarel/patch-1Daniel Gultsch2014-10-191-2/+63
|\ \ \
| * | | Update strings.xmlBenoit Bouvarel2014-10-181-2/+63
* | | | Merge pull request #565 from the-solipsist/patch-2Daniel Gultsch2014-10-191-7/+7
|\ \ \ \ | |/ / / |/| | |
| * | | Update README.mdthe-solipsist2014-10-181-5/+5
| * | | Update README.mdthe-solipsist2014-10-171-2/+2
|/ / /
* | | do not attempt to download images when not connectediNPUTmice2014-10-178-45/+60
* | | made grace period on a per account basisiNPUTmice2014-10-176-37/+30
| |/ |/|
* | additonal safty net for disabling notificationsiNPUTmice2014-10-161-0/+1
* | simplified determination whether otr needs starting in a sessioniNPUTmice2014-10-161-7/+2
* | log ending otr sessions on disconnectiNPUTmice2014-10-162-3/+10
* | forground/background logging without csiiNPUTmice2014-10-161-4/+2
* | make image download message to type=image only after completioniNPUTmice2014-10-161-3/+2
|/
* added file observer to get notified when files are deleted: fixes #396iNPUTmice2014-10-162-3/+32
* detect deleted files on start up. got rid of lagecy image provider for perfor...iNPUTmice2014-10-1512-197/+67
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-10-151-2/+12
|\
| * 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
* | | refactored file download status. make image http download available for carbo...iNPUTmice2014-10-1524-210/+273
|/ /
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 02:43:44 +0000