aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * MUC: differentiated a few more errors.Michael2014-10-054-1/+42
* | Merge pull request #523 from betheg/leaked_windowDaniel Gultsch2014-10-051-1/+3
|\ \
| * | fixed an 'activity has leaked window'Michael2014-10-041-1/+3
| |/
* | fixed #510iNPUTmice2014-10-051-2/+48
* | end otr session instead of only resettingiNPUTmice2014-10-051-1/+1
* | sending initial ping before going online after login/resume to ensure that al...iNPUTmice2014-10-051-2/+18
|/
* no dns retry after nosrv erroriNPUTmice2014-10-042-6/+7
* added missing status messages after message scrolliNPUTmice2014-10-041-0/+1
* reset pending subscription requestiNPUTmice2014-10-041-0/+1
* minor ui tweakiNPUTmice2014-10-041-3/+4
* implemented ping (xep-0199) fixed #517iNPUTmice2014-10-031-0/+3
* minor graphic tweaks in copy otr fingerprint to clipboardiNPUTmice2014-10-031-1/+3
* let's own otr-fingerprint copy to clipboard.Michael2014-10-0310-10/+175
* fixed chinese translationsiNPUTmice2014-10-035-265/+263
* bug fixesiNPUTmice2014-10-032-3/+2
* revised tablet ui. fixed #423iNPUTmice2014-10-039-117/+175
* Merge pull request #518 from isaackwan/translation_zhrCN-TW2Daniel Gultsch2014-10-034-0/+343
|\
| * 1) Renamed values-zh values-zh_rCN in accordance with #329 and Android conven...Isaac Kwan2014-10-034-0/+343
* | fixed possible npeiNPUTmice2014-10-031-1/+5
* | check if display is off for notificationsiNPUTmice2014-10-021-2/+8
* | mark conversation as read when displayed marker from another client is receivediNPUTmice2014-10-024-7/+27
* | avoided unecessary message searchsiNPUTmice2014-10-021-12/+20
* | show displayed by contact on all devicesiNPUTmice2014-10-022-11/+9
* | properly dismiss notificationsiNPUTmice2014-10-022-10/+25
|/
* calculate sample size for thumbnails as welliNPUTmice2014-09-301-2/+15
* Merge pull request #505 from betheg/fix_inviteDaniel Gultsch2014-09-301-1/+3
|\
| * fixed muc invite with <body/>.Michael2014-09-291-1/+3
* | notifiy only when necessaryDaniel Gultsch2014-09-297-44/+68
* | more improvments for new notification serviceDaniel Gultsch2014-09-288-211/+53
* | new notification service. first draftDaniel Gultsch2014-09-2822-84/+264
|/
* made muc passwords and prefereced encryption method persistant across restartsiNPUTmice2014-09-278-12/+75
* Merge pull request #504 from betheg/inflateDaniel Gultsch2014-09-271-2/+2
|\
| * add false argument to inflate.Michael2014-09-271-2/+2
* | fixed linkiNPUTmice2014-09-271-1/+1
* | added flattr buttoniNPUTmice2014-09-271-1/+4
|/
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-276-1/+17
|\
| * Merge pull request #485 from kruks23/translation5Daniel Gultsch2014-09-271-0/+7
| |\
| | * Update Spanish Translationskruks232014-09-241-0/+7
| * | Merge pull request #487 from weiss/add-german-translationsDaniel Gultsch2014-09-272-0/+9
| |\ \
| | * | Add missing German translationsHolger Weiß2014-09-242-0/+9