aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout (follow)
Commit message (Expand)AuthorAgeFilesLines
* Compile Clean after mergetrz/merge_1.5.2steckbrief2015-08-111-22/+16
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-1124-185/+217
|\
| * fixed some ux glitches in editaccountDaniel Gultsch2015-07-162-2/+0
| * renamed colorsDaniel Gultsch2015-07-1323-123/+125
| * rewrote parts of message adapter to avoid using NULL viewsDaniel Gultsch2015-05-111-7/+0
| * replace send button with quick action button as long as no text has been enteredDaniel Gultsch2015-05-021-1/+1
| * increased padding on image buttons on v21 to match material guidelinesDaniel Gultsch2015-04-283-4/+4
| * increased padding around switches in manage accountsDaniel Gultsch2015-04-271-2/+4
| * fixed regression where the selected conversation wasn't highlighted anymore o...iNPUTmice2015-04-131-1/+1
| * Enable end-conversation by swipe gestureBrianBlade2015-04-082-61/+79
| * do not overlap account title and switchiNPUTmice2015-04-011-1/+4
| * Add toggle account-state switchBrianBlade2015-04-011-0/+8
* | Merge branch 'trz/rename' (early part) into trz/masterlookshe2015-06-191-2/+9
|\ \
| * | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-191-2/+9
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-192-3/+3
|/ /
* | moved color picker to libslookshe2015-04-152-145/+0
* | changed last message in overview also to EmojiconTextView for displaying smil...lookshe2015-04-121-3/+6
* | whatsapp-like smiley implementationlookshe2015-04-123-7/+22
* | Color choose dialogsteckbrief2015-04-112-0/+145
* | Merge master-originsteckbrief2015-02-2010-136/+209
|\|
| * Use Material Design Icons on API 21+Sam Whited2015-01-293-4/+4
| * always allow access to contact details. provide add button in contact detailsiNPUTmice2015-01-211-0/+7
| * Fixed action bar search for Android 5.0iNPUTmice2015-01-201-4/+4
| * explain read markeriNPUTmice2015-01-181-0/+13
| * Fix bottom padding on about pageSam Whited2015-01-131-1/+1
| * make use of different dimensions for different screen sizesDaniel Gultsch2015-01-136-15/+39
| * Use margin instead of padding in about screenSam Whited2015-01-121-4/+4
| * shortened some stringDaniel Gultsch2015-01-111-0/+1
| * fixed #860Daniel Gultsch2015-01-101-0/+1
| * allow for very basic muc configurationDaniel Gultsch2015-01-081-115/+142
* | - Avoiding accessing shared preferences to know if emoticons should be parsed...steckbrief2015-01-201-1/+11
|/
* added missing layout fileDaniel Gultsch2015-01-031-0/+105
* migrated change password into separate activityDaniel Gultsch2015-01-031-9/+0
* fixed layout fileDaniel Gultsch2015-01-021-1/+1
* improved OTR verification part oneDaniel Gultsch2015-01-021-188/+146
* code cleanup for change password stuffDaniel Gultsch2014-12-251-1/+1
* Add ability to change password on serverSam Whited2014-12-251-2/+9
* Add more server compatibility info.Sam Whited2014-12-231-4/+102
* Accessibility: Add missing image descriptionsSam Whited2014-11-292-3/+6
* show dynamic tags in contacts activity as welliNPUTmice2014-11-181-12/+7
* happy hanukkahiNPUTmice2014-11-162-1/+20
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-161-5/+5
* added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-111-0/+12
* initial smp supportiNPUTmice2014-11-112-60/+177
* reformated license a bitiNPUTmice2014-11-041-3/+3
* Shorten license text and fix height of scrollviewSam Whited2014-11-041-2/+2
* Use normal text size and colorSam Whited2014-11-041-1/+4
* Make links clickable in about textSam Whited2014-11-041-1/+3
* Convert about dialog to activitySam Whited2014-11-041-0/+16
* show avatar in editaccountiNPUTmice2014-11-041-4/+14