diff options
author | ArthurHoaro <arthur@hoa.ro> | 2017-10-08 15:05:50 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2017-10-08 15:05:50 +0200 |
commit | b14dfc23dd8c4ab1c2cf5788c205a19bff0c1f84 (patch) | |
tree | b6bd2d066410bc8e6a09bbd057df728b5de1493e /doc/md/Shaarli-configuration.md | |
parent | 2c049b673acdd10125db9c3c271eef5bd3f5fc17 (diff) | |
parent | ecccb14e2ab4e5f372ea9946b29995c3c7122a5c (diff) | |
download | Shaarli-b14dfc23dd8c4ab1c2cf5788c205a19bff0c1f84.tar.gz Shaarli-b14dfc23dd8c4ab1c2cf5788c205a19bff0c1f84.tar.zst Shaarli-b14dfc23dd8c4ab1c2cf5788c205a19bff0c1f84.zip |
Merge tag 'v0.9.2' into latest
Release v0.9.2
Diffstat (limited to 'doc/md/Shaarli-configuration.md')
-rw-r--r-- | doc/md/Shaarli-configuration.md | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/md/Shaarli-configuration.md b/doc/md/Shaarli-configuration.md index 188a3c09..99b25ba7 100644 --- a/doc/md/Shaarli-configuration.md +++ b/doc/md/Shaarli-configuration.md | |||
@@ -55,6 +55,7 @@ _These settings should not be edited_ | |||
55 | - **links_per_page**: Number of shaares displayed per page. | 55 | - **links_per_page**: Number of shaares displayed per page. |
56 | - **timezone**: See [the list of supported timezones](http://php.net/manual/en/timezones.php). | 56 | - **timezone**: See [the list of supported timezones](http://php.net/manual/en/timezones.php). |
57 | - **enabled_plugins**: List of enabled plugins. | 57 | - **enabled_plugins**: List of enabled plugins. |
58 | - **default_note_title**: Default title of a new note. | ||
58 | 59 | ||
59 | ### Security | 60 | ### Security |
60 | 61 | ||
@@ -90,7 +91,10 @@ _These settings should not be edited_ | |||
90 | 91 | ||
91 | - **default_private_links**: Check the private checkbox by default for every new link. | 92 | - **default_private_links**: Check the private checkbox by default for every new link. |
92 | - **hide_public_links**: All links are hidden while logged out. | 93 | - **hide_public_links**: All links are hidden while logged out. |
94 | - **force_login**: if **hide_public_links** and this are set to `true`, all anonymous users are redirected to the login page. | ||
93 | - **hide_timestamps**: Timestamps are hidden. | 95 | - **hide_timestamps**: Timestamps are hidden. |
96 | - **remember_user_default**: Default state of the login page's *remember me* checkbox | ||
97 | - `true`: checked by default, `false`: unchecked by default | ||
94 | 98 | ||
95 | ### Feed | 99 | ### Feed |
96 | 100 | ||
@@ -192,7 +196,9 @@ _These settings should not be edited_ | |||
192 | "privacy": { | 196 | "privacy": { |
193 | "default_private_links": true, | 197 | "default_private_links": true, |
194 | "hide_public_links": false, | 198 | "hide_public_links": false, |
195 | "hide_timestamps": false | 199 | "force_login": false, |
200 | "hide_timestamps": false, | ||
201 | "remember_user_default": true | ||
196 | }, | 202 | }, |
197 | "thumbnail": { | 203 | "thumbnail": { |
198 | "enable_thumbnails": true, | 204 | "enable_thumbnails": true, |