aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-207-4/+15
* Fixes FS#168 - Not possible to share more than one picture at oncelookshe2016-03-201-59/+83
* fixed merge errorlookshe2016-03-201-1/+1
* Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-203-19/+27
|\
| * fixed merge errorslookshe2016-03-205-21/+29
* | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-2014-179/+553
|\|
| * Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-1714-179/+553
| |\
| | * 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
| | * Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| | * 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
| * | 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
| |\ \ \
* | | | | 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 remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-119-139/+14
| |\ \ | |/ / |/| |
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-118-149/+28
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-106-49/+52
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-083-21/+20
| |\ \ \ \ \
* | | | | | | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-119-138/+13
| |_|_|_|/ / |/| | | | |
* | | | | | Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
| |_|_|/ / |/| | | |
* | | | | 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 branch 'master'steckbrief2016-03-083-21/+20
|\ \ \ \ | | |/ / | |/| |
| * | | reset link and highlight colors to system defaultsteckbrief2016-03-083-21/+20
* | | | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
|/ / /
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0869-608/+1193
|\| |
| * | 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 cropCenterSquaresteckbrief2016-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-0866-471/+987
| |\|
| | * pulled translations from transifexDaniel Gultsch2016-03-0628-82/+272
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 08:23:44 +0000