[koha-commits] main Koha release repository branch new/bug_6458 updated. v3.04.00-494-g282a2d6
Git repo owner
gitmaster at git.koha-community.org
Mon Sep 12 23:35:57 CEST 2011
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, new/bug_6458 has been updated
via 282a2d60b830b22661cc0324a84b7c17b7b905d1 (commit)
via 06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24 (commit)
via 4530159ce13eb6ff823d6ef49ad847d92556f356 (commit)
via 8f8fc1088a2c5b43ed03fb06c9c842b7c721a838 (commit)
via 22804d6ff6fdc2105644f03d0edca1e4e17d4b72 (commit)
via 6d6c9626274268e82d6fa433894f188b995c913b (commit)
via 27c87aea11243e63c2600d71a154d425b3269c13 (commit)
via d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8 (commit)
via 637953df93f7090de846e1f274a1e721687a9277 (commit)
via fb7b258ec2220fcf6a86d49132b0224175f0a344 (commit)
via 1866c4939df4298d561bc9f5fe617644a9955371 (commit)
via 1859858af62c6f9923d56b70b29c4c0a3a24f9e4 (commit)
via 18844d6bf1f1c6cf93cbe833067fe747753856b9 (commit)
via 75bfa2a56a857417cf99d605f0f903e14ec0f204 (commit)
via 507c7f422485aaf7ae601b0a84bacdbaedac061c (commit)
via 755390b5f51c83874736ac44d864855168031c94 (commit)
via d6417257fde4e22252c78f2def21091016db17f3 (commit)
via b3b6278e206be11ce3b5a8e271f7bccb70539ac5 (commit)
via 073f4fa7c36e1031ad0c7c9333ab051d8d9b0873 (commit)
via a9eb0c658a426a602afc3168e515412cfc7390f2 (commit)
via 4c1d203980af0e1d5495e68df11de9d89018c06d (commit)
via c183981770dbc38c262f2768bbd2683c1c4cb859 (commit)
via bf2ba7a764e294b1c33a32ed763d4a72394d4ed4 (commit)
via b49534ebdc11c36844c87d9588fc4e420509b77e (commit)
via 156a849aa3759f377af07d4cdc7a6f58e58c18f4 (commit)
via 13db3b62a01312890ae19b27cde26a4165b21388 (commit)
via ba2c61b1b6bed78958e96e2488c689421f60bd29 (commit)
via 99056625b635f6f9557f9b53797bdc31cca226d8 (commit)
via 073083ea5f76591e2ced0755b1631e8b6ddd9a35 (commit)
via fb781f2dcd12fe2cb7562f24ea287e5111493480 (commit)
via f64aaf063ea39b70c6f128d74d296566a021d217 (commit)
via 5d8b1713da45ca82d67668a00bd345d9fcead717 (commit)
via aa239bc430d04583f3197513e89c4a40886d0049 (commit)
via 6bd38d3eabc79c68cb90193378c69825ddac2a43 (commit)
via 34b553d03b96cb3c84ec978f6eea542f38f60de3 (commit)
via 4363ff6669c92d0fbbd891fa870bd2cb5e021e9e (commit)
via e23608a1f90b7d25068870e82a19721fd70e60a5 (commit)
via 6c0962f06b35d897fc0e1f2276182feeb3124c6f (commit)
via e71b4faf789ab872d94c8f20c0c252b5550da2d0 (commit)
via f09e8403119c08861ef1cec466447012b1b2775b (commit)
via f824121bb136b08ae3308168a0deeb524518fdde (commit)
via 9e9326671426dbd41384a70d7e59c27632c890a3 (commit)
via 6534b5cf29ea044f405af976447fe67262780a0d (commit)
via 1c6cdaf162591892cc8a4318044482563fe47bdc (commit)
via 8d8d2e6b441415724e667af95fefd9b0ea9c1bbc (commit)
via a57b692a60947569e57b26862c17d517bf461128 (commit)
via f6d3cb05dde6f7e8e9f25a1c4c547e414bbf2d76 (commit)
via b2138a7ec64dead316286df4a822bf89d051f4cb (commit)
via ca16532ea8270b14178ab47cb26f48c53f64a20a (commit)
via 7146449ace983a92221601057e04825b6403d698 (commit)
via ca1906f9c6d584434825cc9891e816da014a8c4e (commit)
via bb958cc6135a3ab8e83068b67ac0da345d20a0a0 (commit)
via 955450dd1b64f37df01a6ef3bcdfaa1063b52ae8 (commit)
via 6ba4419be0826f9535e92d1bbf3612f7bf0695b7 (commit)
via ba78d6a8503d9340797eeabf2f9655efaee6f993 (commit)
via 1ce78a0c225224a41638da15bbc9de31e08d2e85 (commit)
via 0dbad3efce01a4bf04e9a0e01fc04330c9d9aba1 (commit)
via afa94246d3d13993b7add9b34b40be977945f8fd (commit)
via acc684bc01fca37615009a778ba5927e40f52d29 (commit)
via f9413ca2d20199a366928926ad8321dde50d12c1 (commit)
via e8f654fcd206a98ad1a9222e17bffe2bdb32747d (commit)
via a2a9bc522035c17a24aa48badc5184b015197826 (commit)
via 6be9d2b27dd47c859eb6ab0cfd873b2059206986 (commit)
via cb6c40faf78fa25b752c3c51abc98435e9afe4cb (commit)
via 720e3012a87ca437c17e864f159138304ed0c006 (commit)
via 5a2fc683d842ca964b42c8ae68b15aba2526ef30 (commit)
via 6756581cf88bcbe40203722bb29aef6abe9283f6 (commit)
via e39de040206eae26e22d6375479b548017cb7217 (commit)
via ff4b179e14ab15bf5d20852a37e2b0a2dca45800 (commit)
via 390d1d5be6e59990bee85ed6e44f117a8cd19c54 (commit)
via 61758c8bcbd6d8c2a03e39ca196e944470520c97 (commit)
via 55326fc407ff041ae8abfa54683efd08f8e16f3e (commit)
via 383d0d3a2108a0ebb784937addc85e7a854ea247 (commit)
via bd744e6f2af85110cefa8d9e613393a0a517185b (commit)
via a94a9f745556d42e5018695dbaa70a72129cc993 (commit)
via 3731ec80fc407ba4668450b48c9c81b8c0a98460 (commit)
via e73965c62f3895d5bdf5ad0a52c89e54e248f8f1 (commit)
via 99b51e03183ec79f6ce46834207511702c2599d6 (commit)
via 8a7c9167660493bc1a01a93dddba37a1a3683bc0 (commit)
via eb7456c685db962f0c1c3d1d88421711a7ec4a7d (commit)
via a7a4d39697bf52ad805fadd53d388b4530568774 (commit)
via 57a0fcb475ff7e353329ba9a7e5963a22351b4c9 (commit)
via 223156ea74233122c35d16100724eddbcd69d66a (commit)
via 71925724963482c196608c016894300cdd7e0d6d (commit)
via f320582b2f0a13a1a604d353300cea3238ef72cd (commit)
via 0cf959123edb87db184f6779766230f784dc52bd (commit)
via eac3046dd9ff107812a4b59ec8c98bede50a0132 (commit)
via 63d300191efb3207b7ebb95b98db0d86ca371f16 (commit)
via 589403d2e8e48d3a64352bc527fda742a8edbba2 (commit)
via 1e395ff152f1c8801500e719e19b4761781e653f (commit)
via 666a2316d8adbd8fadba263c42dba71fe992532c (commit)
via 9c346e25269ada0b3fa5f5a6934986970c6b9a9f (commit)
via b6293a8e9a75135dc81f087660cf58675d61455a (commit)
via 07838bfcb16bf329bbc4953dff5b624005a8a734 (commit)
via 54d38461f043770e3a980b7ab40ce1d5705cfd38 (commit)
via bb251a484fb9acbce9b162213278d7f5a49fa269 (commit)
via 13fd914b086d32c69c190a6fa0279fc2b2054780 (commit)
via 54e0667b23466043de2ddd73b0b0e37f9632ea06 (commit)
via 7b2cd8e636a5b2eda0c405c2198eb09c2c35e22c (commit)
via 4e44667cd6737299a0fa524b4d84258dacd2c1c4 (commit)
via 6b69260fbd75f80b1831341b9bb5b18b54fef56b (commit)
via 97005758bb647c49462c9f203f48e94fab0bb308 (commit)
via 7f884128f67125c542daae77b32108e6cf14a5a5 (commit)
via df2a3a9a3cf138bc11e2a39b4aad591d17359830 (commit)
via 73081505f59f2d6ba256fcab1226e43c93d7ae92 (commit)
via 75a4efa7042a8d15ba7832d67b8670282da3abbc (commit)
via 31bb901e2b31748dd86e7da45672c42a5359c5a4 (commit)
via 3270d384c53c04eee44fa54ed065eebb0741df22 (commit)
via cbdb5a823aa6387e77adb63e3ff389103ce8f603 (commit)
via b78004c8e1e4c01ec44feede84bca58a9921664c (commit)
via dff9277d3dcc68d8cbea74ede5b8c7e5c0b339b0 (commit)
via 14a0c39e8439eeaa32d24deaa3d7b6601eff5570 (commit)
via 142e75c94ade26000671d19bd7d729cec681ff8e (commit)
via 77e1a62efa6814b1beaefd5f8dd99b31643182bc (commit)
via 02f1058a80c4bd4f28331ce389c71a32b3fe1294 (commit)
via 73992e2ff435e068f8766a3d06dc510ba66af4cc (commit)
via 7cf4553db1a1150b9ea6a730945a0fe9c99f1127 (commit)
via f80185efc46b34952656e00e9c2a1054bd888f52 (commit)
via 85e37cb4b5879b174759e955d37e1bfe832bc646 (commit)
via 14102a66326d733967ad78251bcc27eabda94a58 (commit)
via 80deb4081f30ceeee07bca8a586c92b918f04f55 (commit)
from a41100a44519373efafb5c9f3cdc5607657d651e (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 282a2d60b830b22661cc0324a84b7c17b7b905d1
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Aug 25 00:40:56 2011 +0200
Bug 6458: Incorrect translation processing / results
Removed template toolkit directives from within HTML tags.
Advanced Search > Scan Index > Search results
Additional changes:
- removes entry 'Series Title' from the index pull down as it was the same
index as 'Series'
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 06d6cb0ce471f312ffb1ddd92f0ce0bc3ab76a24
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Aug 25 00:09:11 2011 +0200
Bug 6458: Incorrect translation processing / suggestion
Removes template toolkit directives from within HTML tags.
Acquisitions > Suggestions
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 4530159ce13eb6ff823d6ef49ad847d92556f356
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Aug 20 19:02:01 2011 +0200
Bug 6458: Incorrect translation processing / sco-main.tt
Patch removes templates directives from HTML tags in sco-main.tt
Problems were related to buttons for renewing items.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Before
opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222
After, no errors
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 8f8fc1088a2c5b43ed03fb06c9c842b7c721a838
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Aug 24 20:49:23 2011 +0200
Bug 6458: Incorrect translation processing / serials/...
Fixes problems with template toolkit directives within HTML tags
for the serials module.
Serials > add/modify subsciption
serial-issues-full.tt seems to be unused?
I couldn't find the page in the serials module.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 22804d6ff6fdc2105644f03d0edca1e4e17d4b72
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Wed Aug 24 19:43:58 2011 +0200
Bug 6458: Incorrect translation processing - rotating_collections/...
Patch removes templates directives from HTML tags in the
rotating collections module.
The module is currently not interated into Koha's staff interface.
Fixing templats to make Jenkins happy.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 6d6c9626274268e82d6fa433894f188b995c913b
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Thu Aug 25 12:48:55 2011 -0400
Bug 6458: Incorrect translation processing / opac-detail.tt
Patch removes template directives from within HTML tags from OPAC detail view.
Problems were related to the items tabs for holdings, subscriptions, and serial collection.
Fixed the problem spotted by Frère Sébastien Marie - thx!
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 27c87aea11243e63c2600d71a154d425b3269c13
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Tue Aug 23 00:06:00 2011 +0200
Bug 6458: Incorrect translation processing / cataloguing/...
Patch removes template directives from within HTML tags from
- cataloging > new record
- cataloging
- UNIMARC plugin for 4XX
There is one problem remaining in addbiblio:
<option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
[% frameworkcodeloo.frameworktext %]
</option>
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit d5a9eea5194c97e3874ee830fccf2cdeb1ddf3f8
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 23:47:02 2011 +0200
Bug 6458: Incorrect translation processing / acqui/...
Patch removes template directives from within HTML tags from
- acquisitions > new vendor / modify vendor / vendor details
- acquisitions > late orders
- acquisitons > vendor x > basket groups
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 637953df93f7090de846e1f274a1e721687a9277
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sat Aug 20 19:38:30 2011 +0200
Bug 6458: Incorrect translation processing - masthead.inc
Patch removes templates directives from HTML tags in masthead.inc
Problem was related to library pull down shown when
OpacAddMastheadLibraryPulldown is activated.
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
Before
opac-tmpl/prog/en/includes/masthead.inc: 83
After no errors
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit fb7b258ec2220fcf6a86d49132b0224175f0a344
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 23:25:37 2011 +0200
Bug 6458: Incorrect translation processing / 3x reports/...
Patch removes template directives from within HTML tags from
- Reports > Guided Reports
- Reports > Items with no checkouts
- Reports > Patron statistics
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 1866c4939df4298d561bc9f5fe617644a9955371
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 23:16:12 2011 +0200
Bug 6458: Incorrect translation processing / authorities.tt
Patch removes template directives from within HTML tags from
authorities > modify authority.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 1859858af62c6f9923d56b70b29c4c0a3a24f9e4
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 23:00:18 2011 +0200
Bug 6458: Incorrect translation processing / review.tt
Patch removes template directives from within HTML tags from
Tools > Tags.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 18844d6bf1f1c6cf93cbe833067fe747753856b9
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Mon Aug 22 22:46:28 2011 +0200
Bug 6458: Incorrect translation processing / overdue.tt
Patch removes template directives from within HTML tags from
circulation > overdues.
Problems were related to patron flags pull down and sort by loop for patron attributes.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
commit 75bfa2a56a857417cf99d605f0f903e14ec0f204
Author: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Sun Aug 21 19:58:48 2011 +0200
Bug 6458: Incorrect translation processing - doc-head-close/open.inc
Patch removes templates directives from HTML tags in masthead.inc
Fixes all 3 problems now.
Signed-off-by: Owen Leonard <oleonard at myacpl.org>
Signed-off-by: Chris Cormack <chrisc at catalyst.net.nz>
-----------------------------------------------------------------------
Summary of changes:
C4/Accounts.pm | 113 ++-
C4/Acquisition.pm | 186 ++-
C4/Auth.pm | 127 +-
C4/Auth_cas_servers.yaml.orig | 12 -
C4/Auth_with_cas.pm | 181 +--
C4/Circulation.pm | 2 +-
C4/ImportExportFramework.pm | 17 +-
C4/Installer.pm | 3 +
C4/Members.pm | 6 +-
C4/SIP/ILS.pm | 14 +-
C4/SIP/ILS/Transaction/FeePayment.pm | 52 +-
C4/SIP/Sip/Checksum.pm | 4 +-
C4/SIP/Sip/MsgType.pm | 8 +-
C4/VirtualShelves.pm | 10 +-
C4/VirtualShelves/Page.pm | 18 +-
about.pl | 5 +
acqui/acqui-home.pl | 2 +-
acqui/basket.pl | 2 +-
acqui/histsearch.pl | 44 +-
admin/aqbudgets.pl | 4 +-
admin/aqplan.pl | 6 +-
catalogue/search.pl | 2 +-
cataloguing/addbiblio.pl | 51 +-
cataloguing/additem.pl | 34 +-
circ/reserveratios.pl | 11 +-
circ/waitingreserves.pl | 6 +-
debian/build-git-snapshot | 9 +-
debian/koha-common.install | 1 +
debian/scripts/koha-create | 50 +-
debian/scripts/koha-create.8 | 127 ++-
debian/scripts/koha-mysql | 40 +
docs/CAS/CAS/README | 8 -
docs/CAS/CASProxy/README | 9 -
docs/CAS/CASProxy/examples/casSession.tmp | Bin 134 -> 0 bytes
docs/CAS/CASProxy/examples/koha_webservice.pl | 58 -
docs/CAS/CASProxy/examples/proxy_cas.pl | 91 -
docs/CAS/CASProxy/examples/proxy_cas_callback.pl | 62 -
docs/CAS/CASProxy/examples/proxy_cas_data.pl | 80 -
docs/history.txt | 9 +-
etc/zebradb/biblios/etc/bib1.att | 98 +-
.../data/mysql/de-DE/mandatory/sample_notices.sql | 10 +-
installer/data/mysql/de-DE/mandatory/sysprefs.sql | 320 ----
.../mysql/de-DE/mandatory/system_preferences.sql | 20 +
.../{sysprefs.txt => system_preferences.txt} | 0
installer/data/mysql/en/mandatory/sysprefs.sql | 319 ----
installer/data/mysql/es-ES/mandatory/sysprefs.sql | 319 ----
installer/data/mysql/es-ES/mandatory/sysprefs.txt | 1 -
.../mysql/es-ES/mandatory/system_preferences.sql | 20 +
.../mandatory/system_preferences.txt} | 0
.../unimarc_standard_system_preferences.sql | 26 +
...txt => unimarc_standard_system_preferences.txt} | 0
.../1-Obligatoire/unimarc_standard_systemprefs.sql | 321 ----
installer/data/mysql/it-IT/necessari/sysprefs.sql | 307 ---
.../mysql/it-IT/necessari/system_preferences.sql | 70 +
installer/data/mysql/kohastructure.sql | 3 +
.../data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql | 326 ----
.../nb-NO/1-Obligatorisk/system_preferences.sql | 29 +
.../{sysprefs.txt => system_preferences.txt} | 0
.../marcflavour/normarc/Obligatorisk/normarc.sql | 1986 ++++++++++----------
installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 318 ----
.../mysql/pl-PL/mandatory/system_preferences.sql | 20 +
.../{sysprefs.txt => system_preferences.txt} | 0
...m_preferences_full_optimal_for_install_only.sql | 407 +----
...ystem_preferences_only_translation_updating.sql | 667 -------
...ystem_preferences_only_translation_updating.txt | 1 -
installer/data/mysql/sysprefs.sql | 320 ++++
...m_preferences_full_optimal_for_install_only.sql | 410 +----
...ystem_preferences_only_translation_updating.sql | 667 -------
...ystem_preferences_only_translation_updating.txt | 1 -
...stem_preferences_optimal_values_insert_only.sql | 2 -
installer/data/mysql/updatedatabase.pl | 15 +
.../intranet-tmpl/prog/en/css/staff-global.css | 75 +-
.../en/includes/acquisitions-history-search.inc | 24 -
.../prog/en/includes/acquisitions-search.inc | 8 +-
.../intranet-tmpl/prog/en/includes/circ-menu.tt | 73 +
.../prog/en/includes/error-bottom.inc | 16 -
.../intranet-tmpl/prog/en/includes/error-top.inc | 65 -
.../prog/en/includes/messaging-preference-form.inc | 6 +-
.../intranet-tmpl/prog/en/includes/resort_form.inc | 8 +-
.../intranet-tmpl/prog/en/js/xmlControlfield.js | 6 +-
.../prog/en/lib/yui/imageloader/imageloader.js | 199 ++
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 10 +
.../prog/en/modules/acqui/basketgroup.tt | 12 +-
.../prog/en/modules/acqui/histsearch.tt | 4 +-
.../prog/en/modules/acqui/lateorders.tt | 6 +-
.../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 21 +-
.../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +-
.../prog/en/modules/acqui/supplier.tt | 10 +-
.../prog/en/modules/admin/branches.tt | 10 +-
.../prog/en/modules/admin/categorie.tt | 34 +-
.../prog/en/modules/admin/preferences/opac.pref | 5 +
.../prog/en/modules/admin/smart-rules.tt | 4 +-
.../prog/en/modules/authorities/authorities.tt | 4 +-
.../prog/en/modules/catalogue/detail.tt | 3 -
.../prog/en/modules/catalogue/results.tt | 34 +-
.../prog/en/modules/cataloguing/addbiblio.tt | 26 +-
.../prog/en/modules/cataloguing/addbooks.tt | 7 +-
.../prog/en/modules/cataloguing/additem.tt | 6 +
.../prog/en/modules/cataloguing/merge.tt | 10 +-
.../cataloguing/value_builder/marc21_field_006.tt | 2 +-
.../cataloguing/value_builder/marc21_field_008.tt | 2 +-
.../cataloguing/value_builder/unimarc_field_4XX.tt | 9 +-
.../prog/en/modules/circ/circulation.tt | 6 +-
.../intranet-tmpl/prog/en/modules/circ/overdue.tt | 12 +-
.../prog/en/modules/circ/waitingreserves.tt | 4 +-
.../prog/en/modules/help/members/pay.tt | 51 +-
.../prog/en/modules/help/tools/letter.tt | 131 +-
.../intranet-tmpl/prog/en/modules/intranet-main.tt | 10 +-
.../prog/en/modules/labels/label-print.tt | 162 +--
.../prog/en/modules/maint/catmaintain.tt | 122 --
.../prog/en/modules/members/boraccount.tt | 2 +-
.../prog/en/modules/members/guarantor_search.tt | 38 +-
.../prog/en/modules/members/member-flags.tt | 10 +-
.../prog/en/modules/members/memberentrygen.tt | 20 -
.../intranet-tmpl/prog/en/modules/members/pay.tt | 102 +-
.../prog/en/modules/members/paycollect.tt | 227 +++
.../prog/en/modules/patroncards/members-search.tt | 2 +-
.../prog/en/modules/patroncards/print.tt | 144 +-
.../prog/en/modules/reports/borrowers_stats.tt | 6 +-
.../prog/en/modules/reports/catalogue_out.tt | 3 +-
.../en/modules/reports/guided_reports_start.tt | 5 +-
.../en/modules/rotating_collections/addItems.tt | 3 +-
.../rotating_collections/editCollections.tt | 6 +-
.../prog/en/modules/serials/routing-preview.tt | 4 +-
.../prog/en/modules/serials/serial-issues-full.tt | 3 +-
.../prog/en/modules/serials/serials-edit.tt | 9 +-
.../prog/en/modules/serials/subscription-add.tt | 3 +-
.../prog/en/modules/suggestion/suggestion.tt | 41 +-
.../intranet-tmpl/prog/en/modules/tags/review.tt | 18 +-
.../intranet-tmpl/prog/en/modules/tools/letter.tt | 1 +
.../prog/en/modules/virtualshelves/shelves.tt | 15 +-
koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif | Bin 1315 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/delete-tag.png | Bin 0 -> 244 bytes
koha-tmpl/intranet-tmpl/prog/img/edit-tag.png | Bin 0 -> 264 bytes
.../img}/famfamfam/silk/page_white_acrobat.png | Bin 591 -> 591 bytes
.../prog/img}/famfamfam/silk/page_white_code.png | Bin 603 -> 603 bytes
.../prog/img}/famfamfam/silk/page_white_excel.png | Bin 663 -> 663 bytes
koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif | Bin 1239 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif | Bin 434 -> 0 bytes
koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png | Bin 0 -> 244 bytes
.../opac-tmpl/prog/en/includes/doc-head-close.inc | 12 +-
.../opac-tmpl/prog/en/includes/doc-head-open.inc | 2 +-
koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 3 +-
.../opac-tmpl/prog/en/includes/opac-facets.inc | 5 +
.../opac-tmpl/prog/en/includes/resort_form.inc | 8 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt | 14 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt | 41 +-
.../opac-tmpl/prog/en/modules/opac-messaging.tt | 6 +-
.../opac-tmpl/prog/en/modules/opac-opensearch.tt | 4 +-
.../prog/en/modules/opac-readingrecord.tt | 4 +-
.../opac-tmpl/prog/en/modules/opac-reserve.tt | 5 +
.../opac-tmpl/prog/en/modules/opac-results.tt | 4 +-
.../opac-tmpl/prog/en/modules/opac-shelves.tt | 6 +-
.../prog/en/modules/opac-showreviews-rss.tt | 4 +-
.../opac-tmpl/prog/en/modules/opac-showreviews.tt | 4 +-
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 8 +-
.../opac-tmpl/prog/en/modules/sco/sco-main.tt | 6 +-
kohaversion.pl | 2 +-
labels/label-edit-template.pl | 43 +-
mainpage.pl | 3 +
members/boraccount.pl | 3 -
members/pay.pl | 361 ++--
members/paycollect.pl | 171 ++
misc/spellcheck_suggest/make_spellcheck_suggest.pl | 240 ---
opac/opac-export.pl | 105 +-
opac/opac-reserve.pl | 4 +
opac/opac-search.pl | 4 +-
reports/dictionary.pl | 2 +-
reserve/request.pl | 118 +-
serials/serials-edit.pl | 5 +
t/db_dependent/lib/KohaTest.pm | 6 +-
t/db_dependent/lib/KohaTest/Acquisition.pm | 38 +-
.../lib/KohaTest/Acquisition/GetHistory.pm | 50 +-
tools/letter.pl | 18 +-
virtualshelves/addbybiblionumber.pl | 4 +-
xt/check_sysprefs.t | 131 --
xt/syspref.t | 138 --
177 files changed, 4208 insertions(+), 7702 deletions(-)
delete mode 100644 C4/Auth_cas_servers.yaml.orig
create mode 100755 debian/scripts/koha-mysql
delete mode 100644 docs/CAS/CAS/README
delete mode 100644 docs/CAS/CASProxy/README
delete mode 100644 docs/CAS/CASProxy/examples/casSession.tmp
delete mode 100755 docs/CAS/CASProxy/examples/koha_webservice.pl
delete mode 100755 docs/CAS/CASProxy/examples/proxy_cas.pl
delete mode 100755 docs/CAS/CASProxy/examples/proxy_cas_callback.pl
delete mode 100755 docs/CAS/CASProxy/examples/proxy_cas_data.pl
mode change 100755 => 100644 etc/koha-httpd.conf
delete mode 100755 installer/data/mysql/de-DE/mandatory/sysprefs.sql
create mode 100644 installer/data/mysql/de-DE/mandatory/system_preferences.sql
rename installer/data/mysql/de-DE/mandatory/{sysprefs.txt => system_preferences.txt} (100%)
delete mode 100755 installer/data/mysql/en/mandatory/sysprefs.sql
delete mode 100755 installer/data/mysql/es-ES/mandatory/sysprefs.sql
delete mode 100644 installer/data/mysql/es-ES/mandatory/sysprefs.txt
create mode 100644 installer/data/mysql/es-ES/mandatory/system_preferences.sql
rename installer/data/mysql/{en/mandatory/sysprefs.txt => es-ES/mandatory/system_preferences.txt} (100%)
create mode 100644 installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_system_preferences.sql
rename installer/data/mysql/fr-FR/1-Obligatoire/{unimarc_standard_systemprefs.txt => unimarc_standard_system_preferences.txt} (100%)
delete mode 100755 installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
delete mode 100755 installer/data/mysql/it-IT/necessari/sysprefs.sql
create mode 100644 installer/data/mysql/it-IT/necessari/system_preferences.sql
delete mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/sysprefs.sql
create mode 100644 installer/data/mysql/nb-NO/1-Obligatorisk/system_preferences.sql
rename installer/data/mysql/nb-NO/1-Obligatorisk/{sysprefs.txt => system_preferences.txt} (100%)
delete mode 100755 installer/data/mysql/pl-PL/mandatory/sysprefs.sql
create mode 100644 installer/data/mysql/pl-PL/mandatory/system_preferences.sql
rename installer/data/mysql/pl-PL/mandatory/{sysprefs.txt => system_preferences.txt} (100%)
delete mode 100644 installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.sql
delete mode 100644 installer/data/mysql/ru-RU/mandatory/system_preferences_only_translation_updating.txt
create mode 100755 installer/data/mysql/sysprefs.sql
delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.sql
delete mode 100644 installer/data/mysql/uk-UA/mandatory/system_preferences_only_translation_updating.txt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-history-search.inc
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-bottom.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/error-top.inc
delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tt
create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/csv_icon.gif
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/delete-tag.png
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/edit-tag.png
copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_acrobat.png (100%)
copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_code.png (100%)
copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/silk/page_white_excel.png (100%)
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/icon_xml.gif
delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/pdficon_large.gif
create mode 100644 koha-tmpl/intranet-tmpl/prog/img/repeat-tag.png
create mode 100755 members/paycollect.pl
delete mode 100755 misc/spellcheck_suggest/make_spellcheck_suggest.pl
delete mode 100755 xt/check_sysprefs.t
delete mode 100755 xt/syspref.t
hooks/post-receive
--
main Koha release repository
More information about the koha-commits
mailing list