aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-4/+15
|\
| * Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-207-4/+15
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-59/+83
|\|
| * Fixes FS#168 - Not possible to share more than one picture at oncelookshe2016-03-201-59/+83
* | Merge branch 'trz/rename' (early part) into trz/rebaselookshe2016-03-200-0/+0
|\|
| * fixed merge errorlookshe2016-03-201-1/+1
| * Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-203-19/+27
| |\
| * \ Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-2016-181/+558
| |\ \
| * \ \ Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-200-0/+0
| |\ \ \
* | \ \ \ Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-207-38/+96
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-38/+96
| |\| | | | | |/ / | |/| |
| | * | 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
| | * | | Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
* | | | | fixed merge errorslookshe2016-03-205-21/+29
| |_|_|/ |/| | |
* | | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-1716-181/+558
|\ \ \ \ | |/ / / |/| | |
| * | | version bump to 1.11.1 and changelog1.11.1Daniel Gultsch2016-03-162-2/+5
| * | | made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| * | | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-163-30/+69
| * | | Merge pull request #1767 from fiaxh/path_file_accessibleDaniel Gultsch2016-03-161-1/+10
| |\ \ \
| | * | | Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| |/ / /
| * | | removed requirement of external component for http uploadDaniel Gultsch2016-03-141-3/+2
| * | | pulled translations from transifexDaniel Gultsch2016-03-135-106/+443
| * | | 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
| * | | mention mod_smacks_offline and ejabberds settings in readmeDaniel Gultsch2016-03-101-0/+6
* | | | 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 commit 'remotes/origin/trz/rename~1' into trz/rebasesteckbrief2016-03-120-0/+0
|\| |
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:20:42 +0000