aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/layout/activity_muc_details.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-01-101-0/+28
|\
| * show per conference notification settings in details activityDaniel Gultsch2016-01-081-0/+27
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-0/+1
|\|
| * Reset the margins manually after rotatingsaqura2015-10-261-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2015-10-071-0/+28
|\|
| * Show whether MAM is supported in MUCssaqura2015-10-061-1/+30
* | copy commitsChristian S2015-07-231-153/+154
|\|
| * very subtleDaniel Gultsch2015-07-211-6/+7
* | Merge branch 'development' of https://github.com/siacs/Conversations into sia...Christian S2015-07-141-6/+6
|\|
| * renamed colorsDaniel Gultsch2015-07-131-6/+6
* | resize avatar viewsChristian S2015-07-081-3/+6
|/
* increased padding on image buttons on v21 to match material guidelinesDaniel Gultsch2015-04-281-2/+2
* Use Material Design Icons on API 21+Sam Whited2015-01-291-2/+2
* make use of different dimensions for different screen sizesDaniel Gultsch2015-01-131-4/+10
* 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
* Make conversations the root projectSam Whited2014-10-221-0/+119