Fossil SCM
Merge-in changes from trunk (~ version 2.15)
Commit
290671078c3270c70c55fe9a5bd3bd2b0e59c59adca036918b7cdb9133b27c8a
Parent
d075801aa8629e2…
6 files changed
+1
-2
+1
-2
+3
-3
+1
-1
+1
-1
+4
-4
+1
-2
| --- src/report.c | ||
| +++ src/report.c | ||
| @@ -971,12 +971,11 @@ | ||
| 971 | 971 | ** WEBPAGE: rptview |
| 972 | 972 | ** |
| 973 | 973 | ** Generate a report. The "rn" query parameter is the report number |
| 974 | 974 | ** corresponding to REPORTFMT.RN. If the "tablist" query parameter exists, |
| 975 | 975 | ** then the output consists of lines of tab-separated fields instead of |
| 976 | -** an HTML table. If the "rvsmpl" query parameter is set to an ordinary | |
| 977 | -** unfuncy ASCII string (alphanumerics, '_' and '-') then report's | |
| 976 | +** an HTML table. If the "rvsmpl" query parameter is set then report's | |
| 978 | 977 | ** submenu will contain an extra hyperlink that have a value-driven |
| 979 | 978 | ** label and target. |
| 980 | 979 | ** |
| 981 | 980 | ** "rvsmpl" stands for Report View SubMenu's Parametric Link. |
| 982 | 981 | */ |
| 983 | 982 |
| --- src/report.c | |
| +++ src/report.c | |
| @@ -971,12 +971,11 @@ | |
| 971 | ** WEBPAGE: rptview |
| 972 | ** |
| 973 | ** Generate a report. The "rn" query parameter is the report number |
| 974 | ** corresponding to REPORTFMT.RN. If the "tablist" query parameter exists, |
| 975 | ** then the output consists of lines of tab-separated fields instead of |
| 976 | ** an HTML table. If the "rvsmpl" query parameter is set to an ordinary |
| 977 | ** unfuncy ASCII string (alphanumerics, '_' and '-') then report's |
| 978 | ** submenu will contain an extra hyperlink that have a value-driven |
| 979 | ** label and target. |
| 980 | ** |
| 981 | ** "rvsmpl" stands for Report View SubMenu's Parametric Link. |
| 982 | */ |
| 983 |
| --- src/report.c | |
| +++ src/report.c | |
| @@ -971,12 +971,11 @@ | |
| 971 | ** WEBPAGE: rptview |
| 972 | ** |
| 973 | ** Generate a report. The "rn" query parameter is the report number |
| 974 | ** corresponding to REPORTFMT.RN. If the "tablist" query parameter exists, |
| 975 | ** then the output consists of lines of tab-separated fields instead of |
| 976 | ** an HTML table. If the "rvsmpl" query parameter is set then report's |
| 977 | ** submenu will contain an extra hyperlink that have a value-driven |
| 978 | ** label and target. |
| 979 | ** |
| 980 | ** "rvsmpl" stands for Report View SubMenu's Parametric Link. |
| 981 | */ |
| 982 |
+1
-2
| --- src/report.c | ||
| +++ src/report.c | ||
| @@ -971,12 +971,11 @@ | ||
| 971 | 971 | ** WEBPAGE: rptview |
| 972 | 972 | ** |
| 973 | 973 | ** Generate a report. The "rn" query parameter is the report number |
| 974 | 974 | ** corresponding to REPORTFMT.RN. If the "tablist" query parameter exists, |
| 975 | 975 | ** then the output consists of lines of tab-separated fields instead of |
| 976 | -** an HTML table. If the "rvsmpl" query parameter is set to an ordinary | |
| 977 | -** unfuncy ASCII string (alphanumerics, '_' and '-') then report's | |
| 976 | +** an HTML table. If the "rvsmpl" query parameter is set then report's | |
| 978 | 977 | ** submenu will contain an extra hyperlink that have a value-driven |
| 979 | 978 | ** label and target. |
| 980 | 979 | ** |
| 981 | 980 | ** "rvsmpl" stands for Report View SubMenu's Parametric Link. |
| 982 | 981 | */ |
| 983 | 982 |
| --- src/report.c | |
| +++ src/report.c | |
| @@ -971,12 +971,11 @@ | |
| 971 | ** WEBPAGE: rptview |
| 972 | ** |
| 973 | ** Generate a report. The "rn" query parameter is the report number |
| 974 | ** corresponding to REPORTFMT.RN. If the "tablist" query parameter exists, |
| 975 | ** then the output consists of lines of tab-separated fields instead of |
| 976 | ** an HTML table. If the "rvsmpl" query parameter is set to an ordinary |
| 977 | ** unfuncy ASCII string (alphanumerics, '_' and '-') then report's |
| 978 | ** submenu will contain an extra hyperlink that have a value-driven |
| 979 | ** label and target. |
| 980 | ** |
| 981 | ** "rvsmpl" stands for Report View SubMenu's Parametric Link. |
| 982 | */ |
| 983 |
| --- src/report.c | |
| +++ src/report.c | |
| @@ -971,12 +971,11 @@ | |
| 971 | ** WEBPAGE: rptview |
| 972 | ** |
| 973 | ** Generate a report. The "rn" query parameter is the report number |
| 974 | ** corresponding to REPORTFMT.RN. If the "tablist" query parameter exists, |
| 975 | ** then the output consists of lines of tab-separated fields instead of |
| 976 | ** an HTML table. If the "rvsmpl" query parameter is set then report's |
| 977 | ** submenu will contain an extra hyperlink that have a value-driven |
| 978 | ** label and target. |
| 979 | ** |
| 980 | ** "rvsmpl" stands for Report View SubMenu's Parametric Link. |
| 981 | */ |
| 982 |
+3
-3
| --- src/sqlite3.c | ||
| +++ src/sqlite3.c | ||
| @@ -1186,11 +1186,11 @@ | ||
| 1186 | 1186 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 1187 | 1187 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 1188 | 1188 | */ |
| 1189 | 1189 | #define SQLITE_VERSION "3.35.3" |
| 1190 | 1190 | #define SQLITE_VERSION_NUMBER 3035003 |
| 1191 | -#define SQLITE_SOURCE_ID "2021-03-21 18:23:48 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4f64c" | |
| 1191 | +#define SQLITE_SOURCE_ID "2021-03-26 12:12:52 4c5e6c200adc8afe0814936c67a971efc516d1bd739cb620235592f18f40be2a" | |
| 1192 | 1192 | |
| 1193 | 1193 | /* |
| 1194 | 1194 | ** CAPI3REF: Run-Time Library Version Numbers |
| 1195 | 1195 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 1196 | 1196 | ** |
| @@ -229251,11 +229251,11 @@ | ||
| 229251 | 229251 | int nArg, /* Number of args */ |
| 229252 | 229252 | sqlite3_value **apUnused /* Function arguments */ |
| 229253 | 229253 | ){ |
| 229254 | 229254 | assert( nArg==0 ); |
| 229255 | 229255 | UNUSED_PARAM2(nArg, apUnused); |
| 229256 | - sqlite3_result_text(pCtx, "fts5: 2021-03-21 18:23:48 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4f64c", -1, SQLITE_TRANSIENT); | |
| 229256 | + sqlite3_result_text(pCtx, "fts5: 2021-03-26 12:12:52 4c5e6c200adc8afe0814936c67a971efc516d1bd739cb620235592f18f40be2a", -1, SQLITE_TRANSIENT); | |
| 229257 | 229257 | } |
| 229258 | 229258 | |
| 229259 | 229259 | /* |
| 229260 | 229260 | ** Return true if zName is the extension on one of the shadow tables used |
| 229261 | 229261 | ** by this module. |
| @@ -234179,10 +234179,10 @@ | ||
| 234179 | 234179 | #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ |
| 234180 | 234180 | |
| 234181 | 234181 | /************** End of stmt.c ************************************************/ |
| 234182 | 234182 | #if __LINE__!=234182 |
| 234183 | 234183 | #undef SQLITE_SOURCE_ID |
| 234184 | -#define SQLITE_SOURCE_ID "2021-03-21 18:23:48 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4alt2" | |
| 234184 | +#define SQLITE_SOURCE_ID "2021-03-26 12:12:52 4c5e6c200adc8afe0814936c67a971efc516d1bd739cb620235592f18f40alt2" | |
| 234185 | 234185 | #endif |
| 234186 | 234186 | /* Return the source-id for this library */ |
| 234187 | 234187 | SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; } |
| 234188 | 234188 | /************************** End of sqlite3.c ******************************/ |
| 234189 | 234189 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -1186,11 +1186,11 @@ | |
| 1186 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 1187 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 1188 | */ |
| 1189 | #define SQLITE_VERSION "3.35.3" |
| 1190 | #define SQLITE_VERSION_NUMBER 3035003 |
| 1191 | #define SQLITE_SOURCE_ID "2021-03-21 18:23:48 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4f64c" |
| 1192 | |
| 1193 | /* |
| 1194 | ** CAPI3REF: Run-Time Library Version Numbers |
| 1195 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 1196 | ** |
| @@ -229251,11 +229251,11 @@ | |
| 229251 | int nArg, /* Number of args */ |
| 229252 | sqlite3_value **apUnused /* Function arguments */ |
| 229253 | ){ |
| 229254 | assert( nArg==0 ); |
| 229255 | UNUSED_PARAM2(nArg, apUnused); |
| 229256 | sqlite3_result_text(pCtx, "fts5: 2021-03-21 18:23:48 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4f64c", -1, SQLITE_TRANSIENT); |
| 229257 | } |
| 229258 | |
| 229259 | /* |
| 229260 | ** Return true if zName is the extension on one of the shadow tables used |
| 229261 | ** by this module. |
| @@ -234179,10 +234179,10 @@ | |
| 234179 | #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ |
| 234180 | |
| 234181 | /************** End of stmt.c ************************************************/ |
| 234182 | #if __LINE__!=234182 |
| 234183 | #undef SQLITE_SOURCE_ID |
| 234184 | #define SQLITE_SOURCE_ID "2021-03-21 18:23:48 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4alt2" |
| 234185 | #endif |
| 234186 | /* Return the source-id for this library */ |
| 234187 | SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; } |
| 234188 | /************************** End of sqlite3.c ******************************/ |
| 234189 |
| --- src/sqlite3.c | |
| +++ src/sqlite3.c | |
| @@ -1186,11 +1186,11 @@ | |
| 1186 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 1187 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 1188 | */ |
| 1189 | #define SQLITE_VERSION "3.35.3" |
| 1190 | #define SQLITE_VERSION_NUMBER 3035003 |
| 1191 | #define SQLITE_SOURCE_ID "2021-03-26 12:12:52 4c5e6c200adc8afe0814936c67a971efc516d1bd739cb620235592f18f40be2a" |
| 1192 | |
| 1193 | /* |
| 1194 | ** CAPI3REF: Run-Time Library Version Numbers |
| 1195 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 1196 | ** |
| @@ -229251,11 +229251,11 @@ | |
| 229251 | int nArg, /* Number of args */ |
| 229252 | sqlite3_value **apUnused /* Function arguments */ |
| 229253 | ){ |
| 229254 | assert( nArg==0 ); |
| 229255 | UNUSED_PARAM2(nArg, apUnused); |
| 229256 | sqlite3_result_text(pCtx, "fts5: 2021-03-26 12:12:52 4c5e6c200adc8afe0814936c67a971efc516d1bd739cb620235592f18f40be2a", -1, SQLITE_TRANSIENT); |
| 229257 | } |
| 229258 | |
| 229259 | /* |
| 229260 | ** Return true if zName is the extension on one of the shadow tables used |
| 229261 | ** by this module. |
| @@ -234179,10 +234179,10 @@ | |
| 234179 | #endif /* !defined(SQLITE_CORE) || defined(SQLITE_ENABLE_STMTVTAB) */ |
| 234180 | |
| 234181 | /************** End of stmt.c ************************************************/ |
| 234182 | #if __LINE__!=234182 |
| 234183 | #undef SQLITE_SOURCE_ID |
| 234184 | #define SQLITE_SOURCE_ID "2021-03-26 12:12:52 4c5e6c200adc8afe0814936c67a971efc516d1bd739cb620235592f18f40alt2" |
| 234185 | #endif |
| 234186 | /* Return the source-id for this library */ |
| 234187 | SQLITE_API const char *sqlite3_sourceid(void){ return SQLITE_SOURCE_ID; } |
| 234188 | /************************** End of sqlite3.c ******************************/ |
| 234189 |
+1
-1
| --- src/sqlite3.h | ||
| +++ src/sqlite3.h | ||
| @@ -123,11 +123,11 @@ | ||
| 123 | 123 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 124 | 124 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 125 | 125 | */ |
| 126 | 126 | #define SQLITE_VERSION "3.35.3" |
| 127 | 127 | #define SQLITE_VERSION_NUMBER 3035003 |
| 128 | -#define SQLITE_SOURCE_ID "2021-03-21 18:23:48 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4f64c" | |
| 128 | +#define SQLITE_SOURCE_ID "2021-03-26 12:12:52 4c5e6c200adc8afe0814936c67a971efc516d1bd739cb620235592f18f40be2a" | |
| 129 | 129 | |
| 130 | 130 | /* |
| 131 | 131 | ** CAPI3REF: Run-Time Library Version Numbers |
| 132 | 132 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 133 | 133 | ** |
| 134 | 134 |
| --- src/sqlite3.h | |
| +++ src/sqlite3.h | |
| @@ -123,11 +123,11 @@ | |
| 123 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 124 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 125 | */ |
| 126 | #define SQLITE_VERSION "3.35.3" |
| 127 | #define SQLITE_VERSION_NUMBER 3035003 |
| 128 | #define SQLITE_SOURCE_ID "2021-03-21 18:23:48 6bb2134027a12801de8e0c73482d94682f902024800a7e426614f65a2fe4f64c" |
| 129 | |
| 130 | /* |
| 131 | ** CAPI3REF: Run-Time Library Version Numbers |
| 132 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 133 | ** |
| 134 |
| --- src/sqlite3.h | |
| +++ src/sqlite3.h | |
| @@ -123,11 +123,11 @@ | |
| 123 | ** [sqlite3_libversion_number()], [sqlite3_sourceid()], |
| 124 | ** [sqlite_version()] and [sqlite_source_id()]. |
| 125 | */ |
| 126 | #define SQLITE_VERSION "3.35.3" |
| 127 | #define SQLITE_VERSION_NUMBER 3035003 |
| 128 | #define SQLITE_SOURCE_ID "2021-03-26 12:12:52 4c5e6c200adc8afe0814936c67a971efc516d1bd739cb620235592f18f40be2a" |
| 129 | |
| 130 | /* |
| 131 | ** CAPI3REF: Run-Time Library Version Numbers |
| 132 | ** KEYWORDS: sqlite3_version sqlite3_sourceid |
| 133 | ** |
| 134 |
+1
-1
| --- www/changes.wiki | ||
| +++ www/changes.wiki | ||
| @@ -1,9 +1,9 @@ | ||
| 1 | 1 | <title>Change Log</title> |
| 2 | 2 | |
| 3 | 3 | <a name='v2_15'></a> |
| 4 | -<h2>Changes for Version 2.15 (pending)</h2> | |
| 4 | +<h2>Changes for Version 2.15 (2021-03-26)</h2> | |
| 5 | 5 | * The [./defcsp.md|default CSP] has been relaxed slightly to allow |
| 6 | 6 | images to be loaded from any URL. All other resources are still |
| 7 | 7 | locked down by default. |
| 8 | 8 | * The built-in skins all use the "[/help?cmd=mainmenu|mainmenu]" |
| 9 | 9 | setting to determine the content of the main menu. |
| 10 | 10 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,9 +1,9 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <a name='v2_15'></a> |
| 4 | <h2>Changes for Version 2.15 (pending)</h2> |
| 5 | * The [./defcsp.md|default CSP] has been relaxed slightly to allow |
| 6 | images to be loaded from any URL. All other resources are still |
| 7 | locked down by default. |
| 8 | * The built-in skins all use the "[/help?cmd=mainmenu|mainmenu]" |
| 9 | setting to determine the content of the main menu. |
| 10 |
| --- www/changes.wiki | |
| +++ www/changes.wiki | |
| @@ -1,9 +1,9 @@ | |
| 1 | <title>Change Log</title> |
| 2 | |
| 3 | <a name='v2_15'></a> |
| 4 | <h2>Changes for Version 2.15 (2021-03-26)</h2> |
| 5 | * The [./defcsp.md|default CSP] has been relaxed slightly to allow |
| 6 | images to be loaded from any URL. All other resources are still |
| 7 | locked down by default. |
| 8 | * The built-in skins all use the "[/help?cmd=mainmenu|mainmenu]" |
| 9 | setting to determine the content of the main menu. |
| 10 |
+4
-4
| --- www/index.wiki | ||
| +++ www/index.wiki | ||
| @@ -82,16 +82,16 @@ | ||
| 82 | 82 | the repository are consistent prior to each commit. |
| 83 | 83 | |
| 84 | 84 | 8. <b>Free and Open-Source</b> - [../COPYRIGHT-BSD2.txt|2-clause BSD license]. |
| 85 | 85 | |
| 86 | 86 | <hr> |
| 87 | -<h3>Latest Release: 2.14 ([/timeline?c=version-2.14|2021-01-20])</h3> | |
| 87 | +<h3>Latest Release: 2.15 ([/timeline?c=version-2.15|2021-03-26])</h3> | |
| 88 | 88 | |
| 89 | 89 | * [/uv/download.html|Download] |
| 90 | - * [./changes.wiki#v2_14|Change Summary] | |
| 91 | - * [/timeline?p=version-2.14&bt=version-2.13&y=ci|Check-ins in version 2.14] | |
| 92 | - * [/timeline?df=version-2.14&y=ci|Check-ins derived from the 2.14 release] | |
| 90 | + * [./changes.wiki#v2_15|Change Summary] | |
| 91 | + * [/timeline?p=version-2.15&bt=version-2.14&y=ci|Check-ins in version 2.15] | |
| 92 | + * [/timeline?df=version-2.15&y=ci|Check-ins derived from the 2.15 release] | |
| 93 | 93 | * [/timeline?t=release|Timeline of all past releases] |
| 94 | 94 | |
| 95 | 95 | <hr> |
| 96 | 96 | <h3>Quick Start</h3> |
| 97 | 97 | |
| 98 | 98 |
| --- www/index.wiki | |
| +++ www/index.wiki | |
| @@ -82,16 +82,16 @@ | |
| 82 | the repository are consistent prior to each commit. |
| 83 | |
| 84 | 8. <b>Free and Open-Source</b> - [../COPYRIGHT-BSD2.txt|2-clause BSD license]. |
| 85 | |
| 86 | <hr> |
| 87 | <h3>Latest Release: 2.14 ([/timeline?c=version-2.14|2021-01-20])</h3> |
| 88 | |
| 89 | * [/uv/download.html|Download] |
| 90 | * [./changes.wiki#v2_14|Change Summary] |
| 91 | * [/timeline?p=version-2.14&bt=version-2.13&y=ci|Check-ins in version 2.14] |
| 92 | * [/timeline?df=version-2.14&y=ci|Check-ins derived from the 2.14 release] |
| 93 | * [/timeline?t=release|Timeline of all past releases] |
| 94 | |
| 95 | <hr> |
| 96 | <h3>Quick Start</h3> |
| 97 | |
| 98 |
| --- www/index.wiki | |
| +++ www/index.wiki | |
| @@ -82,16 +82,16 @@ | |
| 82 | the repository are consistent prior to each commit. |
| 83 | |
| 84 | 8. <b>Free and Open-Source</b> - [../COPYRIGHT-BSD2.txt|2-clause BSD license]. |
| 85 | |
| 86 | <hr> |
| 87 | <h3>Latest Release: 2.15 ([/timeline?c=version-2.15|2021-03-26])</h3> |
| 88 | |
| 89 | * [/uv/download.html|Download] |
| 90 | * [./changes.wiki#v2_15|Change Summary] |
| 91 | * [/timeline?p=version-2.15&bt=version-2.14&y=ci|Check-ins in version 2.15] |
| 92 | * [/timeline?df=version-2.15&y=ci|Check-ins derived from the 2.15 release] |
| 93 | * [/timeline?t=release|Timeline of all past releases] |
| 94 | |
| 95 | <hr> |
| 96 | <h3>Quick Start</h3> |
| 97 | |
| 98 |