diff options
| author | Henry Jameson <me@hjkos.com> | 2024-09-26 01:10:57 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2024-09-26 01:10:57 +0300 |
| commit | 6fc929a0a040bfdf3b403c5f2b708ab4a51fe2e8 (patch) | |
| tree | c85c68d9e09826a9d81b4ef21706f782c5a9a5d6 /src/modules | |
| parent | 22cc96705ab3af42a6373ccab6df473ba1243fed (diff) | |
| parent | 05c0b16a935c2799ece31845897d3a29d39e3eee (diff) | |
Merge remote-tracking branch 'origin/develop' into shadow-control-2.0
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: [], |