aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout (follow)
Commit message (Expand)AuthorAgeFilesLines
* Custom toast view addedsteckbrief2017-01-111-0/+22
* Merge branch 'trz/rebase' into trz/renamesteckbrief2017-01-051-0/+22
|\
| * 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 ivsteckbrief2017-01-041-0/+22
| * Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-10-201-0/+12
| |\
| * \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+22
| |\ \
| * \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-301-1/+1
| |\ \ \
| * \ \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-204-4/+5
| |\ \ \ \
| * \ \ \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-112-6/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-101-8/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-082-4/+0
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | 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-291-0/+12
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-171-0/+22
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-204-4/+5
| |_|_|_|_|/ |/| | | | |
* | | | | | Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
| |_|_|_|/ |/| | | |
* | | | | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-112-5/+3
| |_|_|/ |/| | |
* | | | Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-101-8/+0
| |_|/ |/| |
* | | Merge remote branch 'master'steckbrief2016-03-082-4/+0
|\ \ \ | | |/ | |/|
| * | reset link and highlight colors to system defaultsteckbrief2016-03-082-4/+0
* | | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
|/ /
* | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-082-26/+42
|\|
| * Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-082-26/+42
| |\
| | * let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-011-26/+34
| | * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-292-26/+34
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0619-298/+945
|\| |
| * | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-1/+2
| * | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-1/+1
| * | Removed stupid message correctionsteckbrief2016-02-232-20/+0
| * | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-231-9/+0
| * | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-223-2/+42
| |\|
| | * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-152-2/+22
| | * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-2/+21
| * | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-161-0/+9
| |\|
| | * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-041-0/+9
| * | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-4/+4
| * | Fixed layout issue with emojicon tastatur buttonsteckbrief2016-02-121-1/+0
| * | Fixed XML errors after mergesteckbrief2016-02-113-8/+9
| * | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-1119-297/+923
| |\|
| | * introduced boolean form field wrapperDaniel Gultsch2016-01-232-1/+14
| | * added UI wrapper for (some) form fieldsDaniel Gultsch2016-01-221-0/+21
| | * changed spacing in create dialogs and notify user when no accounts are activatedDaniel Gultsch2016-01-222-6/+10
| | * increased padding in create contact/conference dialogDaniel Gultsch2016-01-212-15/+21
| | * use match_parent as height in conversations overviewDaniel Gultsch2016-01-121-2/+2
| | * ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-169/+212
| | * show per conference notification settings in details activityDaniel Gultsch2016-01-081-0/+27