Skip to content

Commit

Permalink
Merge branch 'release-10.1' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
demiankatz committed Jan 9, 2025
2 parents 1809b17 + f1b23dc commit 3d937b1
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<property name="bootstrap3_theme" value="bootstrap3" /><!-- base Bootstrap 3 theme (used for theme update tasks) -->
<property name="bootstrap5_theme" value="bootstrap5" /><!-- base Bootstrap 5 theme (used for theme update tasks) -->

<property name="version" value="10.1" />
<property name="version" value="10.1.1" />

<property name="mysqlconnectionargs" value="-h ${mysqlhost} -P ${mysqlport} -u ${mysqlrootuser}" />
<!-- Add password if not empty -->
Expand Down
5 changes: 3 additions & 2 deletions config/vufind/config.ini
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ allowSavedSearches = true
; features (such as display of hierarchies).
nonJavascriptSupportEnabled = false
; Generator value to display in an HTML header <meta> tag:
generator = "VuFind 10.1"
generator = "VuFind 10.1.1"
; The following setting can be set to true in case extended HTML attribute
; escaping is needed. Default is false. Extended escaping is slower and
; results in larger HTML responses than normal escaping, so this setting
Expand Down Expand Up @@ -2502,7 +2502,8 @@ validateHierarchySequences = true
;[Captcha]
; Valid type values:
; - dumb (ask the user to reverse a random string; only recommended for testing)
; - figlet (generate a text-based message for the user to interpret)
; - figlet (generate a text-based message for the user to interpret; DEPRECATED --
; will be removed in release 11.0)
; - image (generate a local image for the user to interpret)
; - interval (allow an action after a specified time has elapsed from session start
; or previous action)
Expand Down
2 changes: 2 additions & 0 deletions module/VuFind/src/VuFind/Captcha/Figlet.php
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
* @author Mario Trojan <[email protected]>
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org/wiki/development Wiki
*
* @deprecated Will not be supported in future Laminas releases
*/
class Figlet extends LaminasBase
{
Expand Down
2 changes: 2 additions & 0 deletions module/VuFind/src/VuFind/Captcha/FigletFactory.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@
* @author Mario Trojan <[email protected]>
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
* @link https://vufind.org/wiki/development Wiki
*
* @deprecated Will not be supported in future Laminas releases
*/
class FigletFactory implements FactoryInterface
{
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vufind",
"version": "10.1.0",
"version": "10.1.1",
"description": "Dev tools to handle css preprocessing, js magic, and compression",
"repository": {
"type": "git",
Expand Down
6 changes: 6 additions & 0 deletions packages/DEBIAN/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
vufind 10.1.1 distribution; urgency=low

* VuFind 10.1.1 release (see http://vufind.org/wiki/changelog for details)

-- maintainer VuFind Project Management Committee <[email protected]> Mo 13 Jan 2025 14:00:00 UTC

vufind 10.1 distribution; urgency=low

* VuFind 10.1 release (see http://vufind.org/wiki/changelog for details)
Expand Down
2 changes: 1 addition & 1 deletion packages/DEBIAN/control
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: vufind
Version: 10.1
Version: 10.1.1
Section: World Wide Web
Priority: Optional
Architecture: all
Expand Down

0 comments on commit 3d937b1

Please sign in to comment.