Fossil SCM
Add timeline-hard-newlines to CONFIGSET_SKIN in an attempt to resolve [forum:23d58b1b67|forum post 23d58b1b67]. Bring /json/config up to date with the central config option list.
Commit
89388d4c60723545a80025e9b80385f0381944062d80911f8812943282a5a4ed
Parent
ac446f27ed1e725…
2 files changed
+1
+24
-1
+1
| --- src/configure.c | ||
| +++ src/configure.c | ||
| @@ -105,10 +105,11 @@ | ||
| 105 | 105 | { "timeline-block-markup", CONFIGSET_SKIN }, |
| 106 | 106 | { "timeline-date-format", CONFIGSET_SKIN }, |
| 107 | 107 | { "timeline-default-style", CONFIGSET_SKIN }, |
| 108 | 108 | { "timeline-dwelltime", CONFIGSET_SKIN }, |
| 109 | 109 | { "timeline-closetime", CONFIGSET_SKIN }, |
| 110 | + { "timeline-hard-newlines", CONFIGSET_SKIN }, | |
| 110 | 111 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 111 | 112 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 112 | 113 | { "timeline-truncate-at-blank", CONFIGSET_SKIN }, |
| 113 | 114 | { "timeline-tslink-info", CONFIGSET_SKIN }, |
| 114 | 115 | { "timeline-utc", CONFIGSET_SKIN }, |
| 115 | 116 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -105,10 +105,11 @@ | |
| 105 | { "timeline-block-markup", CONFIGSET_SKIN }, |
| 106 | { "timeline-date-format", CONFIGSET_SKIN }, |
| 107 | { "timeline-default-style", CONFIGSET_SKIN }, |
| 108 | { "timeline-dwelltime", CONFIGSET_SKIN }, |
| 109 | { "timeline-closetime", CONFIGSET_SKIN }, |
| 110 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 111 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 112 | { "timeline-truncate-at-blank", CONFIGSET_SKIN }, |
| 113 | { "timeline-tslink-info", CONFIGSET_SKIN }, |
| 114 | { "timeline-utc", CONFIGSET_SKIN }, |
| 115 |
| --- src/configure.c | |
| +++ src/configure.c | |
| @@ -105,10 +105,11 @@ | |
| 105 | { "timeline-block-markup", CONFIGSET_SKIN }, |
| 106 | { "timeline-date-format", CONFIGSET_SKIN }, |
| 107 | { "timeline-default-style", CONFIGSET_SKIN }, |
| 108 | { "timeline-dwelltime", CONFIGSET_SKIN }, |
| 109 | { "timeline-closetime", CONFIGSET_SKIN }, |
| 110 | { "timeline-hard-newlines", CONFIGSET_SKIN }, |
| 111 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 112 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 113 | { "timeline-truncate-at-blank", CONFIGSET_SKIN }, |
| 114 | { "timeline-tslink-info", CONFIGSET_SKIN }, |
| 115 | { "timeline-utc", CONFIGSET_SKIN }, |
| 116 |
+24
-1
| --- src/json_config.c | ||
| +++ src/json_config.c | ||
| @@ -73,26 +73,40 @@ | ||
| 73 | 73 | */ |
| 74 | 74 | static const struct JsonConfigProperty { |
| 75 | 75 | char const * name; |
| 76 | 76 | int groupMask; |
| 77 | 77 | } JsonConfigProperties[] = { |
| 78 | -{ "css", CONFIGSET_CSS }, | |
| 78 | +{ "css", CONFIGSET_CSS }, | |
| 79 | 79 | { "header", CONFIGSET_SKIN }, |
| 80 | +{ "mainmenu", CONFIGSET_SKIN }, | |
| 80 | 81 | { "footer", CONFIGSET_SKIN }, |
| 81 | 82 | { "details", CONFIGSET_SKIN }, |
| 83 | +{ "js", CONFIGSET_SKIN }, | |
| 84 | +{ "default-skin", CONFIGSET_SKIN }, | |
| 82 | 85 | { "logo-mimetype", CONFIGSET_SKIN }, |
| 83 | 86 | { "logo-image", CONFIGSET_SKIN }, |
| 84 | 87 | { "background-mimetype", CONFIGSET_SKIN }, |
| 85 | 88 | { "background-image", CONFIGSET_SKIN }, |
| 86 | 89 | { "icon-mimetype", CONFIGSET_SKIN }, |
| 87 | 90 | { "icon-image", CONFIGSET_SKIN }, |
| 88 | 91 | { "timeline-block-markup", CONFIGSET_SKIN }, |
| 92 | +{ "timeline-date-format", CONFIGSET_SKIN }, | |
| 93 | +{ "timeline-default-style", CONFIGSET_SKIN }, | |
| 94 | +{ "timeline-dwelltime", CONFIGSET_SKIN }, | |
| 95 | +{ "timeline-closetime", CONFIGSET_SKIN }, | |
| 96 | +{ "timeline-hard-newlines", CONFIGSET_SKIN }, | |
| 89 | 97 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 90 | 98 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 99 | +{ "timeline-truncate-at-blank", CONFIGSET_SKIN }, | |
| 100 | +{ "timeline-tslink-info", CONFIGSET_SKIN }, | |
| 101 | +{ "timeline-utc", CONFIGSET_SKIN }, | |
| 91 | 102 | { "adunit", CONFIGSET_SKIN }, |
| 92 | 103 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 93 | 104 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 105 | +{ "default-csp", CONFIGSET_SKIN }, | |
| 106 | +{ "sitemap-extra", CONFIGSET_SKIN }, | |
| 107 | +{ "safe-html", CONFIGSET_SKIN }, | |
| 94 | 108 | |
| 95 | 109 | { "project-name", CONFIGSET_PROJ }, |
| 96 | 110 | { "short-project-name", CONFIGSET_PROJ }, |
| 97 | 111 | { "project-description", CONFIGSET_PROJ }, |
| 98 | 112 | { "index-page", CONFIGSET_PROJ }, |
| @@ -104,10 +118,19 @@ | ||
| 104 | 118 | { "crlf-glob", CONFIGSET_PROJ }, |
| 105 | 119 | { "crnl-glob", CONFIGSET_PROJ }, |
| 106 | 120 | { "encoding-glob", CONFIGSET_PROJ }, |
| 107 | 121 | { "empty-dirs", CONFIGSET_PROJ }, |
| 108 | 122 | { "dotfiles", CONFIGSET_PROJ }, |
| 123 | +{ "parent-project-code", CONFIGSET_PROJ }, | |
| 124 | +{ "parent-project-name", CONFIGSET_PROJ }, | |
| 125 | +{ "hash-policy", CONFIGSET_PROJ }, | |
| 126 | +{ "comment-format", CONFIGSET_PROJ }, | |
| 127 | +{ "mimetypes", CONFIGSET_PROJ }, | |
| 128 | +{ "forbid-delta-manifests", CONFIGSET_PROJ }, | |
| 129 | +{ "mv-rm-files", CONFIGSET_PROJ }, | |
| 130 | + | |
| 131 | +{ "user-color-map", CONFIGSET_USER }, | |
| 109 | 132 | |
| 110 | 133 | { "ticket-table", CONFIGSET_TKT }, |
| 111 | 134 | { "ticket-common", CONFIGSET_TKT }, |
| 112 | 135 | { "ticket-change", CONFIGSET_TKT }, |
| 113 | 136 | { "ticket-newpage", CONFIGSET_TKT }, |
| 114 | 137 |
| --- src/json_config.c | |
| +++ src/json_config.c | |
| @@ -73,26 +73,40 @@ | |
| 73 | */ |
| 74 | static const struct JsonConfigProperty { |
| 75 | char const * name; |
| 76 | int groupMask; |
| 77 | } JsonConfigProperties[] = { |
| 78 | { "css", CONFIGSET_CSS }, |
| 79 | { "header", CONFIGSET_SKIN }, |
| 80 | { "footer", CONFIGSET_SKIN }, |
| 81 | { "details", CONFIGSET_SKIN }, |
| 82 | { "logo-mimetype", CONFIGSET_SKIN }, |
| 83 | { "logo-image", CONFIGSET_SKIN }, |
| 84 | { "background-mimetype", CONFIGSET_SKIN }, |
| 85 | { "background-image", CONFIGSET_SKIN }, |
| 86 | { "icon-mimetype", CONFIGSET_SKIN }, |
| 87 | { "icon-image", CONFIGSET_SKIN }, |
| 88 | { "timeline-block-markup", CONFIGSET_SKIN }, |
| 89 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 90 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 91 | { "adunit", CONFIGSET_SKIN }, |
| 92 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 93 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 94 | |
| 95 | { "project-name", CONFIGSET_PROJ }, |
| 96 | { "short-project-name", CONFIGSET_PROJ }, |
| 97 | { "project-description", CONFIGSET_PROJ }, |
| 98 | { "index-page", CONFIGSET_PROJ }, |
| @@ -104,10 +118,19 @@ | |
| 104 | { "crlf-glob", CONFIGSET_PROJ }, |
| 105 | { "crnl-glob", CONFIGSET_PROJ }, |
| 106 | { "encoding-glob", CONFIGSET_PROJ }, |
| 107 | { "empty-dirs", CONFIGSET_PROJ }, |
| 108 | { "dotfiles", CONFIGSET_PROJ }, |
| 109 | |
| 110 | { "ticket-table", CONFIGSET_TKT }, |
| 111 | { "ticket-common", CONFIGSET_TKT }, |
| 112 | { "ticket-change", CONFIGSET_TKT }, |
| 113 | { "ticket-newpage", CONFIGSET_TKT }, |
| 114 |
| --- src/json_config.c | |
| +++ src/json_config.c | |
| @@ -73,26 +73,40 @@ | |
| 73 | */ |
| 74 | static const struct JsonConfigProperty { |
| 75 | char const * name; |
| 76 | int groupMask; |
| 77 | } JsonConfigProperties[] = { |
| 78 | { "css", CONFIGSET_CSS }, |
| 79 | { "header", CONFIGSET_SKIN }, |
| 80 | { "mainmenu", CONFIGSET_SKIN }, |
| 81 | { "footer", CONFIGSET_SKIN }, |
| 82 | { "details", CONFIGSET_SKIN }, |
| 83 | { "js", CONFIGSET_SKIN }, |
| 84 | { "default-skin", CONFIGSET_SKIN }, |
| 85 | { "logo-mimetype", CONFIGSET_SKIN }, |
| 86 | { "logo-image", CONFIGSET_SKIN }, |
| 87 | { "background-mimetype", CONFIGSET_SKIN }, |
| 88 | { "background-image", CONFIGSET_SKIN }, |
| 89 | { "icon-mimetype", CONFIGSET_SKIN }, |
| 90 | { "icon-image", CONFIGSET_SKIN }, |
| 91 | { "timeline-block-markup", CONFIGSET_SKIN }, |
| 92 | { "timeline-date-format", CONFIGSET_SKIN }, |
| 93 | { "timeline-default-style", CONFIGSET_SKIN }, |
| 94 | { "timeline-dwelltime", CONFIGSET_SKIN }, |
| 95 | { "timeline-closetime", CONFIGSET_SKIN }, |
| 96 | { "timeline-hard-newlines", CONFIGSET_SKIN }, |
| 97 | { "timeline-max-comment", CONFIGSET_SKIN }, |
| 98 | { "timeline-plaintext", CONFIGSET_SKIN }, |
| 99 | { "timeline-truncate-at-blank", CONFIGSET_SKIN }, |
| 100 | { "timeline-tslink-info", CONFIGSET_SKIN }, |
| 101 | { "timeline-utc", CONFIGSET_SKIN }, |
| 102 | { "adunit", CONFIGSET_SKIN }, |
| 103 | { "adunit-omit-if-admin", CONFIGSET_SKIN }, |
| 104 | { "adunit-omit-if-user", CONFIGSET_SKIN }, |
| 105 | { "default-csp", CONFIGSET_SKIN }, |
| 106 | { "sitemap-extra", CONFIGSET_SKIN }, |
| 107 | { "safe-html", CONFIGSET_SKIN }, |
| 108 | |
| 109 | { "project-name", CONFIGSET_PROJ }, |
| 110 | { "short-project-name", CONFIGSET_PROJ }, |
| 111 | { "project-description", CONFIGSET_PROJ }, |
| 112 | { "index-page", CONFIGSET_PROJ }, |
| @@ -104,10 +118,19 @@ | |
| 118 | { "crlf-glob", CONFIGSET_PROJ }, |
| 119 | { "crnl-glob", CONFIGSET_PROJ }, |
| 120 | { "encoding-glob", CONFIGSET_PROJ }, |
| 121 | { "empty-dirs", CONFIGSET_PROJ }, |
| 122 | { "dotfiles", CONFIGSET_PROJ }, |
| 123 | { "parent-project-code", CONFIGSET_PROJ }, |
| 124 | { "parent-project-name", CONFIGSET_PROJ }, |
| 125 | { "hash-policy", CONFIGSET_PROJ }, |
| 126 | { "comment-format", CONFIGSET_PROJ }, |
| 127 | { "mimetypes", CONFIGSET_PROJ }, |
| 128 | { "forbid-delta-manifests", CONFIGSET_PROJ }, |
| 129 | { "mv-rm-files", CONFIGSET_PROJ }, |
| 130 | |
| 131 | { "user-color-map", CONFIGSET_USER }, |
| 132 | |
| 133 | { "ticket-table", CONFIGSET_TKT }, |
| 134 | { "ticket-common", CONFIGSET_TKT }, |
| 135 | { "ticket-change", CONFIGSET_TKT }, |
| 136 | { "ticket-newpage", CONFIGSET_TKT }, |
| 137 |