aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-232-0/+23
|\
| * Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1844-117/+170
| |\
| * | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-172-0/+23
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-182-8/+1
|\ \ \ | | |/ | |/|
| * | Related to FS#199: fixed merge hickups (message correction setting removed, k...steckbrief2016-04-182-8/+1
| * | removed unused stringlookshe2016-04-171-1/+0
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-1744-116/+177
| |\ \ | |/ / |/| / | |/
* | Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-1744-145/+178
|\ \
| * | add setting for quick sharingDaniel Gultsch2016-04-142-15/+26
| * | added share uri button to conference detailsDaniel Gultsch2016-04-1214-14/+26
| * | pulled translations from transifexDaniel Gultsch2016-04-1029-86/+27
| * | introduced setting to turn of notification ledDaniel Gultsch2016-04-092-4/+11
| * | pulled translations from transifexDaniel Gultsch2016-04-082-3/+23
| * | check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+1
| * | pulled translations from transifexDaniel Gultsch2016-04-0412-26/+71
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-071-0/+1
|\ \ \ | | |/ | |/|
| * | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+1
| * | conversations->conversations+lookshe2016-04-0329-327/+327
| * | Pulled translations from transifexlookshe2016-04-012-25/+31
* | | update to beta-2 and new logo for betatrz/beta-2lookshe2016-04-0630-0/+0
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-04-012-25/+31
|\ \ \
| * | | Pulled translations from transifexlookshe2016-04-012-25/+31
| |/ /
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-1/+1
|\| |
| * | no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+13
|\| |
| * | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-1/+13
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-0/+4
|\| |
| * | Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-271-0/+4
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-252-1/+5
| |\ \ | |/ / |/| |
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-252-1/+5
|\ \ \ | | |/ | |/|
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-232-1/+5
* | | 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-207-4/+15
|\| |
| * | Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-207-4/+15
| * | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-206-105/+438
| |\ \
* | \ \ Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-201-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+2
| |\| |
| | * | Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
* | | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-176-105/+438
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
| * | pulled translations from transifexDaniel Gultsch2016-03-135-106/+443
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-116-62/+3
|\ \ \ | | |/ | |/|
| * | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-116-61/+3
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-101-8/+0
|\| |
| * | Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-101-8/+0
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
|\| |
| * | Merge remote branch 'master'steckbrief2016-03-082-4/+0
| |\ \
| * | | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
* | | | Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-082-4/+0
|\ \ \ \ | | |/ / | |/| |