imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #903 from Kieran-Gould/kierangould/12hourtimestamp

Browse source 
Kierangould/12hourtimestamp
This commit is contained in:
Matthew Hodgson 2017-05-26 16:52:09 +01:00 • committed by GitHub
commit fde553a809
5 changed files with 46 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/structures/UserSettings.js
View file

@ -66,7 +66,6 @@ const SETTINGS_LABELS = [
id: 'dontSendTypingNotifications',
label: "Don't send typing notifications",
},
/*
{
id: 'alwaysShowTimestamps',
label: 'Always show message timestamps',
@ -75,6 +74,7 @@ const SETTINGS_LABELS = [
id: 'showTwelveHourTimestamps',
label: 'Show timestamps in 12 hour format (e.g. 2:30pm)',
},
/*
{
id: 'useCompactLayout',
label: 'Use compact timeline layout',