aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-2610-10/+373
|\
| * show password dialog when account was magic createdDaniel Gultsch2016-05-191-0/+19
| * cap messages after 256 lines in UIDaniel Gultsch2016-05-162-0/+2
| * improve keyboard handling. fixes #1387Daniel Gultsch2016-05-121-0/+1
| * do not show last-seen metric in UIDaniel Gultsch2016-05-101-8/+1
| * cleaned up captcha dialogDaniel Gultsch2016-04-281-0/+27
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-261-10/+12
| * show status messages in contact detailsDaniel Gultsch2016-04-231-16/+19
| * expert setting to manually change presenceDaniel Gultsch2016-04-223-0/+147
| * put welcome screen in scrollviewDaniel Gultsch2016-04-221-62/+67
| * added magic create welcome screenDaniel Gultsch2016-04-192-0/+152
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+22
|\ \
| * | DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-171-0/+22
* | | 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 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/rebasetrz/1.11.0.1lookshe2016-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.4trz/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