[koha-commits] main Koha release repository branch master updated. v19.11.00-1467-g45a127812b
Git repo owner
gitmaster at git.koha-community.org
Wed Mar 25 15:21:37 CET 2020
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 45a127812b77b9ec1ed7d27bac1da3bc9e1f4eed (commit)
via 9222c0b1c4206692274237b53925aa4b2d21f10a (commit)
via 8412c19c50c8d7e051071053459cdc1a5b7b8637 (commit)
via e7c240224f31ab01a28e5596d084a0b47bff7c54 (commit)
via d298ab457e81769693fa06e1a5d3d79b61924e06 (commit)
via bbfadf00d96c732d8134785c2fbcc2d8d0a5b77c (commit)
via e762264835eea364100955443c2fcabbfc997e27 (commit)
via 7a185bc87b5e904128a07ee208ef66b5b12b51e9 (commit)
via ae955d641074ea5ad3e15e94ccfbe26ab2cd3158 (commit)
via a91378ad71071aa83c21fed776afd819be40b79b (commit)
via fe9be399815eaa15675b41f181a54ee4c5d15bf0 (commit)
via b772d1fd3ddd44ac79e44a9fdd39431b45e3b398 (commit)
from 740ef078f40e4d0bd7c452cbe993dfec3bcd2491 (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 45a127812b77b9ec1ed7d27bac1da3bc9e1f4eed
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Wed Mar 25 13:40:04 2020 +0000
Bug 24455: (follow-up) Document function
This patch just adds some minimal documentation to the main exported JS
function.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 9222c0b1c4206692274237b53925aa4b2d21f10a
Author: Kyle M Hall <kyle at bywatersolutions.com>
Date: Wed Mar 4 08:51:42 2020 -0500
Bug 24455: Add Moment.js to About page
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 8412c19c50c8d7e051071053459cdc1a5b7b8637
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri Jan 17 16:19:30 2020 -0300
Bug 24455: Add JS functions to format date and datetime strings
This patch adds the a js-date-format.inc file on each opac and staff interface (date-format.inc whas not available as name)
When you include that file in your TT, you'll get the following functions available:
1. $date(raw_date_string, options)
This function parses a date string, as produced by an api call, and returns the corresponding date formatted according to 'dateformat' and 'TimeFormat' parameters.
For example:
// dateformat: us
// timeformat: 12hr
// Timezone: UTC
$date('2020-03-23T15:00:00+01:00') // You will get '03/23/2020'
$date('2020-03-23T15:00:00+01:00', {withtime: true}) // You will get '03/23/2020 14:00'
$date('2020-03-23T15:00:00+01:00', {withtime: true, tz: 'Europe/Paris'}) // You will get '03/23/2020 15:00+01:00'
Options:
* dateformat: override date format as configured in staff interface (accepts also 'rfc3339')
* timeformat: override time format as configured in staff client (available options are '12hr' and '24hr')
* withtime: also print the time part (default false)
* tz: set the timezone
2. $datetime(raw_date_string, option)
The same as $date but sets withtime to true
3. $time(raw_date_string, option)
The same as $datetime but shows only the time part
To test you must implement and test bug 20936, where it will be used
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e7c240224f31ab01a28e5596d084a0b47bff7c54
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri Jan 17 18:04:55 2020 -0300
Bug 24455: Add moment-timezone library in staff
This patch adds koha-tmpl/intranet-tmpl/lib/moment/moment-timezone-with-data-10-year-range.min.js in order to use the moment library with timezones (https://momentjs.com/timezone/)
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit d298ab457e81769693fa06e1a5d3d79b61924e06
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri Jan 17 16:19:30 2020 -0300
Bug 24455: Add moment-timezone library in opac
This patch adds koha-tmpl/opac-tmpl/bootstrap/lib/moment-timezone-with-data-10-year-range.min.js in order to use the moment library with timezones (https://momentjs.com/timezone/)
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit bbfadf00d96c732d8134785c2fbcc2d8d0a5b77c
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri Jan 17 18:03:48 2020 -0300
Bug 24455: Add moment library in staff
This patch adds koha-tmpl/intranet-tmpl/lib/moment/moment.min.js in order to use the moment library (https://momentjs.com/)
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit e762264835eea364100955443c2fcabbfc997e27
Author: Agustin Moyano <agustinmoyano at theke.io>
Date: Fri Jan 17 16:19:30 2020 -0300
Bug 24455: Add moment library in opac
This patch adds koha-tmpl/opac-tmpl/bootstrap/lib/moment.min.js in order to use the moment library (https://momentjs.com/)
Signed-off-by: Andrew Isherwood <andrew.isherwood at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit 7a185bc87b5e904128a07ee208ef66b5b12b51e9
Author: Owen Leonard <oleonard at myacpl.org>
Date: Mon Mar 23 19:48:25 2020 +0000
Bug 24886: (follow-up) Add markup comments
This patch adds comments to the template to highlight the markup
structure.
This patch should have no effect on the interface or functionality.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit ae955d641074ea5ad3e15e94ccfbe26ab2cd3158
Author: Owen Leonard <oleonard at myacpl.org>
Date: Tue Mar 17 00:55:05 2020 +0000
Bug 24886: Reindent reports template
This patch reindents the template for saved reports, replacing tabs with
spaces and making indentation consistent. Some lines have been split up.
To test, apply the patch and go to Reports -> Use saved.
- Test adding, editing, viewing, and running reports
- Test filtering by group and subgroup
- Test the process of adding a guided report
Everything should work as expected.
Use your preferred method for checking the differences between files
while ignoring whitespace. I use diff with the "-w" flag, but I'm not
your dad. The only changes you see should be split lines.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel at gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit a91378ad71071aa83c21fed776afd819be40b79b
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Mon Mar 23 09:33:27 2020 +0100
Bug 24158: Add missing html filters
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit fe9be399815eaa15675b41f181a54ee4c5d15bf0
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date: Wed Dec 4 17:40:17 2019 +0100
Bug 24158: Convert actual cost in an other currency when receiving
This patch adds a currency dropdown list to the Actual cost field when
receiving items in the acquisition module.
The idea is to let the librarian entered a price in a foreign currency
that will automatically be converted in the local currency ('active').
This converted value will be use as the actual cost once the form is
submitted.
Test plan:
- Create several currencies with different rates
- Create an order, close the basket and receive
- On the receipt page you will notice a new "change currency" checkbox
right close to the 'Actual cost' input.
- Check it
=> The 'Actual cost' input is readonly and a new line appears at the
bottom.
- Enter a number and select a currency
=> The 'Actual cost' input is automatically filled with the converted
value
- Save
=> The converted Actual cost has been inserted in the database.
Sponsored-by: Athlone Institute of Technology
Signed-off-by: Devinim <nazli at devinim.com.tr>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
commit b772d1fd3ddd44ac79e44a9fdd39431b45e3b398
Author: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Date: Mon Mar 9 14:53:05 2020 +0000
Bug 24828: Add ability to specify cash register in SIP config
This patch adds the ablity to specify a cash register id to link to
payments taken via SIP2 clients.
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize at ptfs-europe.com>
-----------------------------------------------------------------------
Summary of changes:
C4/SIP/ILS.pm | 4 +-
C4/SIP/ILS/Transaction/FeePayment.pm | 10 +-
C4/SIP/Sip/MsgType.pm | 3 +-
Koha/Template/Plugin/KohaDates.pm | 5 +
acqui/orderreceive.pl | 7 +-
etc/SIPconfig.xml | 3 +-
.../moment-timezone-with-data-10-year-range.min.js | 1 +
koha-tmpl/intranet-tmpl/lib/moment/moment.min.js | 1 +
.../prog/en/includes/js-date-format.inc | 68 +
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 3 +
.../prog/en/modules/acqui/orderreceive.tt | 37 +-
.../en/modules/reports/guided_reports_start.tt | 2180 +++++++++++---------
.../bootstrap/en/includes/js-date-format.inc | 62 +
.../moment-timezone-with-data-10-year-range.min.js | 1 +
koha-tmpl/opac-tmpl/bootstrap/lib/moment.min.js | 1 +
15 files changed, 1381 insertions(+), 1005 deletions(-)
create mode 100644 koha-tmpl/intranet-tmpl/lib/moment/moment-timezone-with-data-10-year-range.min.js
create mode 100644 koha-tmpl/intranet-tmpl/lib/moment/moment.min.js
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/js-date-format.inc
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/js-date-format.inc
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/moment-timezone-with-data-10-year-range.min.js
create mode 100644 koha-tmpl/opac-tmpl/bootstrap/lib/moment.min.js
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list