aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rename' into trz/rebaselookshe2016-03-204-4/+5
|\
| * Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-204-4/+5
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+2
|\|
| * Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-112-6/+3
|\|
| * Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-112-5/+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/rebaselookshe2016-03-082-4/+0
|\ \ \ | | |/ | |/|
| * | reset link and highlight colors to system defaultsteckbrief2016-03-082-4/+0
| |/
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-082-26/+42
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0619-298/+945
| |\
* | \ 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
* | | 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
| * | show icon in conversations overview when notifications are disabledDaniel Gultsch2016-01-081-76/+97
| * | Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-0/+0
| * | properly rotate avatarsDaniel Gultsch2016-01-041-2/+2
| * | show certificate informationDaniel Gultsch2015-12-231-0/+88
| * | initial tor supportDaniel Gultsch2015-12-011-1/+53
| * | load avatars in message adapter in background taskDaniel Gultsch2015-10-292-4/+4
| * | show encryption type in warned/red messagesDaniel Gultsch2015-10-281-0/+11
| * | Reset the margins manually after rotatingsaqura2015-10-263-0/+3
| * | Show whether MAM is supported in MUCssaqura2015-10-061-1/+30
| * | use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-261-1/+1
| * | Display error message if all contact keys purgedAndreas Straub2015-08-151-0/+32
| * | show HTTP upload availability on Edit account screenhlad2015-08-141-0/+20