Skip to content
Snippets Groups Projects
Commit c2340ac4 authored by André Lahmann's avatar André Lahmann
Browse files

Merge branch 'master' into instance/fid_mewi

parents e27bd8ae 1cb03d76
No related merge requests found
language: php
php:
- 5.4
env:
- VUFIND_HOME=$PWD VUFIND_LOCAL_DIR=$PWD/local
before_script:
- pear install pear/PHP_CodeSniffer
- phpenv rehash
script:
- phpcs --standard=PEAR --ignore=*/config/*,*/tests/* --extensions=php $PWD/module
......@@ -22,7 +22,7 @@
<property name="php-cs-fixers" value="no_blank_lines_before_namespaces,function_call_space,trailing_spaces,unused_use,lowercase_keywords,encoding,parenthesis,php_closing_tag,visibility,duplicate_semicolon,extra_empty_lines,no_blank_lines_after_class_opening,no_empty_lines_after_phpdocs,operators_spaces,spaces_before_semicolon,ternary_spaces,concat_with_spaces,short_array_syntax" />
<property name="version" value="2.4" />
<property name="version" value="2.4.1" />
<!-- We only need the -p switch if the password is non-blank -->
<if><not><equals arg1="${mysqlrootpass}" arg2="" /></not><then>
......
......@@ -89,7 +89,7 @@ bookBagMaxSize = 100
; Display bulk items (export, save, etc.) and checkboxes on search result screens?
showBulkOptions = false
; Generator value to display in an HTML header <meta> tag:
generator = "VuFind 2.4"
generator = "VuFind 2.4.1"
; This section allows you to configure the mechanism used for storing user
; sessions. Available types: File, Memcache, Database.
......
......@@ -52,7 +52,7 @@ language = de ; default -- more options available in [Languages] below
locale = de_DE
; Set this to specify a default ISO 4217 currency code (used on the fines screen).
; If omitted, the default currency for the locale above will be used.
;defaultCurrency = USD
defaultCurrency = EUR
; Find valid timezone values here:
; http://www.php.net/manual/en/timezones.php
timezone = "Europe/Berlin"
......
vufind 2.4.1 distribution; urgency=low
* VuFind 2.4.1 release (see http://vufind.org/wiki/changelog for details)
-- maintainer VuFind Project Administration Team <vufind-admins@lists.sourceforge.net> Mo 25 May 2015 08:41:27 UTC
vufind 2.4 distribution; urgency=low
* VuFind 2.4 release (see http://vufind.org/wiki/changelog for details)
......
Package: vufind2
Version: 2.4
Version: 2.4.1
Section: World Wide Web
Priority: Optional
Architecture: all
......
......@@ -54,5 +54,6 @@
<? endif; ?>
</li>
<? endforeach; ?>
</div>
</ul>
<?endif;?>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment