aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-250-0/+0
|\
| * 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
| | | |\
| | | | * 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
| | |\ \ | | |/ / | |/| |