aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* Custom toast view addedsteckbrief2017-01-113-0/+22
* Merge branch 'trz/rebase' into trz/renamesteckbrief2017-01-053-0/+26
|\
| * Merge remote-tracking branch 'origin/trz/rename' into trz/rebasesteckbrief2017-01-053-31/+49
| |\ | |/ |/|
| * Added columns to fileparams table: url, original file name, key and ivtrz/beta-5steckbrief2017-01-043-0/+26
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-204-0/+22
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-232-0/+23
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-182-8/+1
| |\ \ \
* | | | | Implement FS#239: Show number of unread messages in conversations overviewsteckbrief2016-12-281-30/+42
* | | | | Fixes FS#237: Enable long click in layout instead of programmaticallysteckbrief2016-10-232-1/+7
| |_|_|/ |/| | |
* | | | Implements FS#235: Deletion of remote files uploaded via httpuploadsteckbrief2016-09-292-0/+15
* | | | Fixes FS#229: prompt for confirmation before deleting a filesteckbrief2016-08-232-0/+2
* | | | Basic filetransfer http delete implementation; Exceptions for IqPacketError a...steckbrief2016-08-222-0/+5
| |_|/ |/| |
* | | Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-1844-117/+170
|\ \ \ | | |/ | |/|
| * | 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
| | |\ \ | | |/ / | |/| |
| | * | 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
| | |\| |
| | * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-1/+13
| | |\ \ \
| | * \ \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-271-0/+4
| | |\ \ \ \
* | | | | | | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-172-0/+23
|/ / / / / /
* | | | | | 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
| |_|_|/ / |/| | | |
* | | | | no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
| |_|/ / |/| | |
* | | | Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-1/+13
| |/ / |/| |
* | | 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
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-4/+15
| |\ \
| * \ \ 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
| | |\ \ \
* | | | | | pulled from transifexlookshe2016-03-2332-317/+450
| |_|_|/ / |/| | | |
* | | | | 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 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