[koha-commits] main Koha release repository branch master updated. v3.18.00-822-g150d51f
Git repo owner
gitmaster at git.koha-community.org
Wed Apr 29 17:09:57 CEST 2015
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, master has been updated
via 150d51fee1f005944ad8f2bff8f62324c9689b22 (commit)
via ca55cfba88d7fe539b4a7eac2c386d4b0e94217b (commit)
via 503b8ffd681b52b808c631cf929b5ba6bc446447 (commit)
via d90b6d2ba26b3917aadfb286883de2095e68f812 (commit)
via e82017d44f7573304553bbdd87cacd4c0ef43d18 (commit)
via 29bad9a5446b652c8be85e2ad03c66ef71f1806a (commit)
via 8e4c7a3f3b0aab1ad2fd4c75008ceab23dcbc639 (commit)
via ba2889b029a16e029e7d247ffaf2bd25167fa8d7 (commit)
via 8e4735013bcfc69ca9652aa395cdcf9432c9e836 (commit)
via 462d4c0b9a54385cdb4be96c7ab70bf494ec3c7c (commit)
via 117ee49514c369c089f1940e1f7ca47bd8208e97 (commit)
via 8ba164b3bbcffe80c726b4e38c3bab80d2d3b42a (commit)
from 381959a935b39b08fc53e81b0fb4f9b383c11adb (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 150d51fee1f005944ad8f2bff8f62324c9689b22
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Apr 22 07:36:51 2015 -0400
Bug 1917 [QA Followup] - Don't limit the list results for RSS feeds
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ca55cfba88d7fe539b4a7eac2c386d4b0e94217b
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Tue Apr 21 09:52:49 2015 -0400
Bug 1917 [QA Followup] - Remove unnecessary use of html filter
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 503b8ffd681b52b808c631cf929b5ba6bc446447
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Mon Apr 20 12:09:27 2015 -0400
Bug 1917 [QA Followup] - Use html filter, only show 'by' if author exists, change link title
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit d90b6d2ba26b3917aadfb286883de2095e68f812
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 17 14:02:15 2015 -0400
Bug 1917 - Add RSS Feeds for Lists
Test Plan:
1) Apply this patch
2) Create one or more public lists
3) View the list in the opac
4) Note the new RSS icon next to the list name
5) Open the link in FireFox or an RSS reader
6) You should see an RSS feed of your list with the title
and author of each item as a hyperlink to the record details
Signed-off-by: Nicole Engard <nengard at bywatersolutions.com>
Followed test plan. Works as expected.
Signed-off-by: Marc Véron <veron at veron.ch>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit e82017d44f7573304553bbdd87cacd4c0ef43d18
Author: Jonathan Druart <jonathan.druart at biblibre.com>
Date: Wed Apr 29 09:33:41 2015 +0200
Revert "Bug 8992: Use the existing greybox plugin in interface/theme"
This reverts commit 986b03e1c602b057275e343e3251a5cfbcc7cca6.
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 29bad9a5446b652c8be85e2ad03c66ef71f1806a
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Apr 29 12:04:07 2015 -0300
Bug 4041: (QA followup) fix issues raised by koha-qa.pl
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8e4c7a3f3b0aab1ad2fd4c75008ceab23dcbc639
Author: Tomas Cohen Arazi <tomascohen at gmail.com>
Date: Wed Apr 29 11:30:34 2015 -0300
Bug 4041: DBRev 3.19.00.032
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit ba2889b029a16e029e7d247ffaf2bd25167fa8d7
Author: Marc Véron <veron at veron.ch>
Date: Wed Apr 29 06:20:47 2015 +0200
Bug 4041: Explain address format style in system preferences
See comment #30 by Tomás Cohen Arazi
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8e4735013bcfc69ca9652aa395cdcf9432c9e836
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Fri Apr 10 13:24:40 2015 -0400
Bug 4041: (QA followup) Change addressformat to AddressFormat
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
----
Amended to resolve conflict in sysprefs.sql / mveron
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 462d4c0b9a54385cdb4be96c7ab70bf494ec3c7c
Author: Marc Véron <veron at veron.ch>
Date: Wed Feb 18 17:23:57 2015 +0100
Bug 4041: Second Step: Add system preference and "German style" address formats for staff
To test:
Apply patch
Do a database update (e.g. by changing version number in kohaversion.pl)
Find new system preference 'addressformat' in I18N/L10N
Choose 'German style'
Go to Patrons and edit a patron / create new patron
Verify that Zip code appears above City
Change system preference to 'US style'
Verify that Zip code appears between State and Country.
BTW: New formats can be added by editing i18n_l10n.pref (add a new code, e.g. fr for "French style") and copy / modify the includes using the same code as postfix.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Patch amended to move street number after address. /Marc
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Amended do resolve conflict with updatedatabase.pl /Marc
Rebased for current master /Marc
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 117ee49514c369c089f1940e1f7ca47bd8208e97
Author: Marc Véron <veron at veron.ch>
Date: Mon Mar 2 21:33:20 2015 +0100
Bug 4041: Third step - Display address on patron's pages using the system preference
This patch displays the address information in the left column of the patron's pages using the new system preference.
The address is formatted in member-display-address-style-us.inc and member-display-address-style-de.inc
To test:
- Apply patch on top of 1st and 2nd patch
- Select 'German style' in system preference 'addressformat' in I18N/L10N
- Verify that the address information displays properly in the left column of all patron's pages.
- Verify that the address displays properly in the main area of moremember.pl as well (Note: In right column, Alternate address /contact are not yet touched))
- Switch system preference to US style, repeat checks
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
AMending without changes to put this patch at the end of the patch list / Marc
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
commit 8ba164b3bbcffe80c726b4e38c3bab80d2d3b42a
Author: Marc Véron <veron at veron.ch>
Date: Tue Feb 17 22:36:45 2015 +0100
Bug 4041: First step (staff interface): Extract address blocks to include files
This patch extracts the address blocks in memberentrygen.tt to include files.
To test: The overall functionality should remain the same with this patch.
In further steps, more country- or region-dependent includes could be added, along with functionality to select them using a system preference.
Signed-off-by: Mirko Tietgen <mirko at abunchofthings.net>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen at gmail.com>
-----------------------------------------------------------------------
Summary of changes:
C4/VirtualShelves/Page.pm | 16 +-
circ/circulation.pl | 31 +-
installer/data/mysql/sysprefs.sql | 1 +
installer/data/mysql/updatedatabase.pl | 10 +
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 54 +--
.../intranet-tmpl/prog/en/includes/circ-menu.tt | 76 +++--
.../intranet-tmpl/prog/en/includes/greybox.inc | 10 +-
.../en/includes/member-alt-address-style-de.inc | 111 ++++++
.../en/includes/member-alt-address-style-us.inc | 111 ++++++
.../en/includes/member-alt-contact-style-de.inc | 112 ++++++
.../en/includes/member-alt-contact-style-us.inc | 112 ++++++
.../includes/member-display-address-style-de.inc | 12 +
.../includes/member-display-address-style-us.inc | 12 +
.../en/includes/member-main-address-style-de.inc | 124 +++++++
.../en/includes/member-main-address-style-us.inc | 124 +++++++
.../en/modules/admin/preferences/i18n_l10n.pref | 7 +
.../prog/en/modules/members/boraccount.tt | 1 +
.../prog/en/modules/members/mancredit.tt | 1 +
.../prog/en/modules/members/maninvoice.tt | 1 +
.../prog/en/modules/members/memberentrygen.tt | 356 +-------------------
.../prog/en/modules/members/moremember.tt | 14 +-
.../prog/en/modules/members/notices.tt | 1 +
.../intranet-tmpl/prog/en/modules/members/pay.tt | 4 +-
.../prog/en/modules/members/paycollect.tt | 3 +-
.../en/modules/members/purchase-suggestions.tt | 1 +
.../prog/en/modules/members/routing-lists.tt | 1 +
.../prog/en/modules/members/statistics.tt | 1 +
.../intranet-tmpl/prog/en/modules/tools/viewlog.tt | 1 +
.../bootstrap/en/modules/opac-shelves-rss.tt | 23 ++
.../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 8 +-
kohaversion.pl | 2 +-
members/boraccount.pl | 29 +-
members/mancredit.pl | 50 +--
members/maninvoice.pl | 53 +--
members/moremember.pl | 8 +-
members/notices.pl | 20 +-
members/pay.pl | 8 +-
members/paycollect.pl | 7 +-
members/purchase-suggestions.pl | 3 +-
members/readingrec.pl | 24 +-
members/routing-lists.pl | 26 +-
members/statistics.pl | 11 +-
opac/opac-shelves.pl | 4 +-
tools/viewlog.pl | 24 +-
44 files changed, 960 insertions(+), 648 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-de.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-de.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-de.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-us.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-de.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-us.inc
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves-rss.tt
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list