aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-2518-42/+95
|\
| * version bump to 1.11.2 and changelog1.11.2Daniel Gultsch2016-03-232-2/+7
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-238-31/+46
| * only add image files to media scannerDaniel Gultsch2016-03-236-13/+26
| * update build depsDaniel Gultsch2016-03-231-2/+2
| * Merge pull request #1780 from licaon-kter/patch-1Daniel Gultsch2016-03-221-1/+1
| |\
| | * Typo `attempt`licaon-kter2016-03-221-1/+1
| |/
| * show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
| * be less strict when sharing EXTRA_TEXT intentsDaniel Gultsch2016-03-201-1/+1
| * be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-202-3/+8
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-202-4/+5
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-231-0/+0
|\ \
| * | deleted unused library (FS#51)lookshe2016-03-231-0/+0
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-2332-317/+450
|\| |
| * | pulled from transifexlookshe2016-03-2332-317/+450
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-222-26/+42
|\| |
| * | Correct notifications to user if swiping with disabled or not connected accou...lookshe2016-03-221-25/+37
| * | Fixes FS#87 - Crash on load messages after delete accountlookshe2016-03-221-1/+5
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-211-4/+19
|\| |
| * | One more fix in Message.equals() (FS#104)lookshe2016-03-211-4/+19
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+2
|\| |
| * | changed configuration to conversations+ project (FS#32)lookshe2016-03-201-1/+2
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+1
|\| |
| * | Show file name instead of mime type (FS#102)lookshe2016-03-201-1/+1
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-18/+14
|\| |
| * | FS#104 - Fix Message.equals()lookshe2016-03-201-18/+14
* | | 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
| |\ \ \