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.2.x has been updated via db1f4f23b5135bf91a5c33c99e4f23dbc457c20a (commit) via 16039eae5a00dfe8fcd51b97ba7fba9e2c0d9ec3 (commit) via 060f96dc051a1764b9201a894098bcff03362c00 (commit) via 27830d9bb123df0547cc1032f7415076837addba (commit) from d6edcfa85e22485ea4b02d77ead1389231625e19 (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 db1f4f23b5135bf91a5c33c99e4f23dbc457c20a Author: Galen Charlton <gmcha...@gmail.com> Date: Sat Oct 30 00:40:15 2010 -0400 bug 4991: follow-up tweaks * make some strings translatable * display library name instead of code in add/edit holiday panel * minor textual fixes to hints Signed-off-by: Galen Charlton <gmcha...@gmail.com> Signed-off-by: Chris Nighswonger <chris.nighswon...@gmail.com> commit 16039eae5a00dfe8fcd51b97ba7fba9e2c0d9ec3 Author: Owen Leonard <oleon...@myacpl.org> Date: Mon Jul 12 16:41:28 2010 -0400 Fix for Bug 4991, Overhaul of Calendar interface - Put hints, key, and existing holidays into right column - Style entry form for added clarity and consistency with other forms in Koha - Change the way dynamically displayed hints are shown to better match existing static hints in Koha's interface - Add branch name (instead of branch code) for clarity - Add the ability to add and edit holiday titles (previously only description could be edited). - Add links to the list of existing single-day holidays and exceptions which opens the calendar to that month/year Signed-off-by: Galen Charlton <gmcha...@gmail.com> Signed-off-by: Chris Nighswonger <chris.nighswon...@gmail.com> commit 060f96dc051a1764b9201a894098bcff03362c00 Author: Galen Charlton <gmcha...@gmail.com> Date: Sat Oct 30 01:13:23 2010 -0400 tweak wording of merge target Since the merge functionality is for merging biblio records, not items, made the language more precise. Signed-off-by: Galen Charlton <gmcha...@gmail.com> Signed-off-by: Chris Cormack <chr...@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswon...@gmail.com> commit 27830d9bb123df0547cc1032f7415076837addba Author: Nicole Engard <neng...@bywatersolutions.com> Date: Sat Oct 30 01:13:22 2010 -0400 add missing help file for merging records Signed-off-by: Galen Charlton <gmcha...@gmail.com> Signed-off-by: Chris Cormack <chr...@catalyst.net.nz> Signed-off-by: Chris Nighswonger <chris.nighswon...@gmail.com> ----------------------------------------------------------------------- Summary of changes: C4/Calendar.pm | 2 +- .../intranet-tmpl/prog/en/css/staff-global.css | 6 +- .../prog/en/modules/help/cataloguing/merge.tmpl | 23 ++ .../prog/en/modules/tools/holidays.tmpl | 329 ++++++++++---------- .../prog/en/modules/virtualshelves/shelves.tmpl | 4 +- tools/holidays.pl | 20 +- 6 files changed, 198 insertions(+), 186 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/help/cataloguing/merge.tmpl hooks/post-receive -- main Koha release repository _______________________________________________ koha-commits mailing list koha-commits@lists.koha-community.org http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-commits