aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | 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
* | | | | fixed merge errorslookshe2016-03-205-21/+29
| |_|/ / |/| | |
* | | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-178-74/+115
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| * | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-162-30/+66
| * | Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| * | simplified getUsers(max) codeDaniel Gultsch2016-03-131-11/+2
| * | added logging in case fragment wasn't attachedDaniel Gultsch2016-03-131-0/+5
| * | fixed recursive call instead of call to super in PublishProfileActivityDaniel Gultsch2016-03-131-5/+1
| * | log reason for bind failureDaniel Gultsch2016-03-111-2/+2
| * | close cursor in caps db queryDaniel Gultsch2016-03-111-1/+3
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-152-4/+4
|\ \ \ | | |/ | |/|
| * | once again: FS#34 - review all calls for String.trim()lookshe2016-03-142-4/+4
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-125-97/+16
|\| |
| * | 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 remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-113-77/+11
|\| |
| * | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-113-77/+10
* | | 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-105-41/+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-102-4/+6
* | | Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-081-17/+20
|\| |
| * | reset link and highlight colors to system defaultsteckbrief2016-03-081-17/+20
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0831-477/+874
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+2
| |\ \
| * \ \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-077-13/+49
| |\ \ \
| * \ \ \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06134-3510/+13072
| |\ \ \ \
* | | | | | Fixes FS#153 - Check if url, phone and email are linkified correctlylookshe2016-03-081-6/+31
* | | | | | 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-0828-340/+668
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | |
| * | | | 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-061-1/+14
| * | | | 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-041-1/+14
| * | | | | mark oob messages and always display download buttonDaniel Gultsch2016-03-044-6/+30
| * | | | | don't automatically crop avatarDaniel Gultsch2016-03-041-22/+40
| * | | | | 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
| * | | | | moved avatarfetcher reset code to bindDaniel Gultsch2016-03-031-8/+8
| * | | | | avoid unnecessary disconnect. prevent NetworkOnMainThreadExceptionDaniel Gultsch2016-03-031-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 20:47:48 +0000