diff options
| author |  kytwb <412895+kytwb@users.noreply.github.com> | 2021-07-23 10:04:43 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-07-23 11:04:43 +0200 |
| commit | 012e55ebf87559f2d782e5400fb885df8b80a445 (patch) | |
| tree | 1966e58defe2bcd9541ca9a3f4db67a95a6b4249 /src/environment.js | |
| parent | Removed references to 'premium' i18n keys that are no longer used. (diff) | |
| download | ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.gz ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.tar.zst ferdium-app-012e55ebf87559f2d782e5400fb885df8b80a445.zip | |
Fix hibernation mode (#1486)
* Use hibernation strategy from settings instead of hardcoded 5 minutes
* Fix conditions with isHibernationEnabled, previously disableHibernation
* Make service hibernation obey global setting
Also refactors hibernation to move some hibernation enablement logic
into the Service model
* Remove global hibernation enable switch
Implements option 4 from
https://github.com/getferdi/ferdi/pull/1486#issuecomment-860290992
according to
https://github.com/getferdi/ferdi/pull/1486#issuecomment-876558694
* Implements #865 : Add 'hibernate service' and 'wake up service' in the sidebar context menu.
* Removed 'hibernationEnabled' check on main settings screen
Since this is an (imo) incongruous behavior for the first time user.
They will see a message, but with no ability to choose the hibernation strategy.
* Autogenerated files from conflict fixes
Co-authored-by: Kristóf Marussy <kristof@marussy.com>
Co-authored-by: Vijay A <avijayr@protonmail.com>
Diffstat (limited to 'src/environment.js')
| -rw-r--r-- | src/environment.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/environment.js b/src/environment.js index e13e5f676..6a126e0c6 100644 --- a/src/environment.js +++ b/src/environment.js | |||
| @@ -132,7 +132,6 @@ export const DEFAULT_APP_SETTINGS = { | |||
| 132 | scheduledDNDEnabled: false, | 132 | scheduledDNDEnabled: false, |
| 133 | scheduledDNDStart: '17:00', | 133 | scheduledDNDStart: '17:00', |
| 134 | scheduledDNDEnd: '09:00', | 134 | scheduledDNDEnd: '09:00', |
| 135 | hibernate: false, | ||
| 136 | hibernateOnStartup: true, | 135 | hibernateOnStartup: true, |
| 137 | hibernationStrategy: 300, | 136 | hibernationStrategy: 300, |
| 138 | inactivityLock: 0, | 137 | inactivityLock: 0, |