diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-09-18 01:17:05 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2024-09-18 01:17:05 +0000 |
| commit | 537145e93467dbc318995d8f709bd6d2eb8c5985 (patch) | |
| tree | cbbc8346241a60307707344b56a3fdf29ea13606 /src/modules | |
| parent | 8ee51229090ba323ceacf2cb8c6b50f2b1309560 (diff) | |
| parent | b14ba1725612ee5ddaa40626c4fcd32212f0cc7f (diff) | |
Merge branch 'tusooa/date-absolute' into 'develop'
Support displaying time in absolute format
See merge request pleroma/pleroma-fe!1938
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/config.js | 4 | ||||
| -rw-r--r-- | src/modules/instance.js | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index cf84234a..835dcce4 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -180,7 +180,9 @@ export const defaultState = { autocompleteSelect: undefined, // instance default closingDrawerMarksAsSeen: undefined, // instance default unseenAtTop: undefined, // instance default - ignoreInactionableSeen: undefined // instance default + ignoreInactionableSeen: undefined, // instance default + useAbsoluteTimeFormat: undefined, // instance defualt + absoluteTimeFormatMinAge: undefined // instance default } // caching the instance default properties diff --git a/src/modules/instance.js b/src/modules/instance.js index 99b8b5d5..994f60a5 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -119,6 +119,8 @@ const defaultState = { closingDrawerMarksAsSeen: true, unseenAtTop: false, ignoreInactionableSeen: false, + useAbsoluteTimeFormat: false, + absoluteTimeFormatMinAge: '0d', // Nasty stuff customEmoji: [], |