aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-200-0/+0
|\
| * Merge branch 'trz/rename' into trz/rebaselookshe2016-03-152-4/+4
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-125-97/+16
| |\ \
| * \ \ Merge commit 'remotes/origin/trz/rename~1' into trz/rebasesteckbrief2016-03-120-0/+0
| |\ \ \
* | | | | Fixes FS#167: Resized images are larger than original imagessteckbrief2016-03-181-2/+2
* | | | | Merge branch 'master' of git.fucktheforce.de:conversations-plussteckbrief2016-03-187-39/+96
|\ \ \ \ \
| * | | | | Fixes FS#164lookshe2016-03-181-8/+0
| * | | | | Fixes FS#156 and FS#135 (occured again)lookshe2016-03-171-4/+10
| * | | | | completely implements FS#161lookshe2016-03-173-14/+41
| * | | | | partially implements FS#161lookshe2016-03-162-17/+49
| | |_|_|/ | |/| | |
| * | | | once again: FS#34 - review all calls for String.trim()lookshe2016-03-142-4/+4
| | |_|/ | |/| |
* / | | Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
|/ / /
* | / Fixes FS#155: Check FileHelper vs. FileUtilssteckbrief2016-03-125-97/+16
| |/ |/|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-127-55/+93
|\|
| * fixed possible NPElookshe2016-03-121-0/+6
| * small bugfixeslookshe2016-03-122-1/+4
| * removed duplicated sourcelookshe2016-03-124-36/+41
| * Added method to get body from message if hasMeCommand and harmonized extracti...lookshe2016-03-126-44/+67
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-120-0/+0
|\|
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-1110-140/+14
| |\ | |/ |/|
* | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-1110-139/+13
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-118-149/+28
| |\ | |/ |/|
* | Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-106-49/+52
| |\ | |/ |/|
* | Fixes FS#157: Trigger loading messages from MAM in MUC does not endsteckbrief2016-03-103-37/+45
* | Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-103-12/+6
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
| |\ | |/ |/|
* | Merge remote branch 'master'steckbrief2016-03-084-22/+21
|\ \
| * | incremented version codelookshe2016-03-081-1/+1
* | | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
| | * Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-083-21/+20
| | |\ | | |/ | |/|
| * | reset link and highlight colors to system defaultsteckbrief2016-03-083-21/+20
|/ /
| * Merge branch 'trz/rename' (early part) into trz/rebaselookshe2016-03-080-0/+0
| |\ | |/ |/|
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0872-619/+1207
|\|
| * Fixes FS#153 - Check if url, phone and email are linkified correctlylookshe2016-03-082-6/+41
| * Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaretrz/merge_1.11.0steckbrief2016-03-081-1/+1
| * Fixed merge issue with AxolotlService (differentiation between impl and inter...steckbrief2016-03-083-133/+171
| * Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-0868-484/+993
| |\
| | * version bump to 1.11.01.11.0Daniel Gultsch2016-03-071-2/+2
| | * pulled translations from transifexDaniel Gultsch2016-03-0628-82/+272
| | * don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-063-4/+17
| | * warn in conversations when account is disabledDaniel Gultsch2016-03-062-1/+15
| | * version bump to 1.11.0-beta.3Daniel Gultsch2016-03-051-2/+2
| | * Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun01...Daniel Gultsch2016-03-041-0/+10
| | |\
| | | * Fix Issue #1634 : Shows XMPP URI as links.Tarun2016-02-291-0/+10
| | * | show host in file size checkerDaniel Gultsch2016-03-042-1/+15
| | * | mark oob messages and always display download buttonDaniel Gultsch2016-03-044-6/+30
| | * | don't automatically crop avatarDaniel Gultsch2016-03-048-22/+49
| | * | add a few more know file extensionsDaniel Gultsch2016-03-044-10/+13
| | * | allow to copy original url even while downloading. fixes #1743Daniel Gultsch2016-03-041-6/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 20:33:37 +0000