[koha-commits] main Koha release repository branch 3.14.x updated. v3.14.08-15-g5a54cd5
Git repo owner
gitmaster at git.koha-community.org
Fri Jul 11 08:46:52 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "main Koha release repository".
The branch, 3.14.x has been updated
via 5a54cd590838d379fcc27b7e446107834be9fd59 (commit)
via d98d2721b371caf431fc9cd429851101c71f5865 (commit)
via 4e57b0fbb5c764694157b7db2cea4bd89e0b6220 (commit)
via eebd413c513b2580d50bf22c70e0a7f74e0e0830 (commit)
via abde76056d9ac6501e61549cdc42d770f05049a1 (commit)
via 52f1c780c726722000bf26cba1898c482a5f9b23 (commit)
via 6cf5de9300a272e16b031f2d6bbf6e68ba15d0e8 (commit)
from 2c50a3c0e01091998dc2e62265a26e2d6ae48029 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5a54cd590838d379fcc27b7e446107834be9fd59
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Apr 19 17:05:12 2014 +0000
Bug 10951: (follow-up) add support for NoLoginInstructions to Bootstrap theme
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 3ba6d35c8999d7133e7f5519ff3128af56a6686c)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit d98d2721b371caf431fc9cd429851101c71f5865
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Apr 19 16:54:43 2014 +0000
Bug 10951: (follow-up) tweak description of the NoLoginInstructions system preferences
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit bebe165266a1babc955cc2f0c3d2defe657ac9db)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Conflicts:
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
commit 4e57b0fbb5c764694157b7db2cea4bd89e0b6220
Author: Galen Charlton <gmc at esilibrary.com>
Date: Sat Apr 19 16:53:26 2014 +0000
Bug 10951: (follow-up) use Koha.Preference() template function
This patch uses the TT helper function Koha.Preference() to
retrieve the value of NoLoginInstructions rather than passing
it to all templates as a template variable.
Signed-off-by: Galen Charlton <gmc at esilibrary.com>
(cherry picked from commit 08fe85950ae38a4faa5f0adce5e7d308a766117a)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit eebd413c513b2580d50bf22c70e0a7f74e0e0830
Author: Fridolin Somers <fridolin.somers at biblibre.com>
Date: Fri Jul 11 09:09:55 2014 +0200
Bug 10951: DBrev 3.14.08.001
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit abde76056d9ac6501e61549cdc42d770f05049a1
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Mon Nov 4 15:19:27 2013 +0100
Bug 10951: The new pref NoLoginInstructions should be empty by default.
We don't want to display an English message by default for everybody.
The default message is in the template, so the pref should be empty.
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
(cherry picked from commit 71f0d1639784aab68013ef3d052852f7c605cc66)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 52f1c780c726722000bf26cba1898c482a5f9b23
Author: blou <philippe.blouin at inlibro.com>
Date: Mon Oct 7 11:01:05 2013 -0400
Bug 10951 - Tweaked opac-auth.tt sentence.
The change was causing issue with the next sentence. Adjusted
the start (uppercase) and ending (dot) on self-registration
invitation.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
(cherry picked from commit ffacd90e0efb334be657e222b1f98fad584d09ff)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
commit 6cf5de9300a272e16b031f2d6bbf6e68ba15d0e8
Author: blou <philippe.blouin at inlibro.com>
Date: Fri Oct 4 13:25:33 2013 -0400
Bug 10951 - Adding NoLoginInstructions to system preferences
On a failed login, the default message is harcorded into opac-auth.tt.
It would be preferable to allow for a preference to override that message (for example: ...Please bring an ID to t
The changes modify
-opac-auth.tt to allow for custom value
-admin/preferences/opac.pref to add it to the preferences with a description
-C4/Auth.pm for the loading of the preference
-sysprefs.sql
-updatedatabase.pl
TESTING
1) in OPAC, logged out, try login in by entering no or wrong credentials. Acknowledge the "Don't have a p
2) Apply the patch
3) Regression Test: Redo step 1. Same (default) message should appear.
4) Log in to intranet,
- select NoLoginInstructions in system preferences.
- Enter new (xml) message. Possible:
<h5>Welcome to Koha, please bring your passport to the front office</h5>
- and save
5) refresh the OPAC, try login again with invalid credentials. The new message should appear.
Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at biblibre.com>
(cherry picked from commit c67b397236d63cc2b94306aa1620023bf7193198)
Signed-off-by: Fridolin Somers <fridolin.somers at biblibre.com>
Conflicts:
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
-----------------------------------------------------------------------
Summary of changes:
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 7 +++++++
.../prog/en/modules/admin/preferences/opac.pref | 5 +++++
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-auth.tt | 9 +++++++--
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt | 11 +++++++++--
kohaversion.pl | 2 +-
6 files changed, 30 insertions(+), 5 deletions(-)
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list