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/memcached has been updated via 5f3bb57e47baaf40a8b789830506b969435054ce (commit) via efc9e3a331d3bf8dec536694cfca8c1dd58313f1 (commit) via de4eeac2af2a65f0013850e6051830a739d45783 (commit) via 2e6f91dc71f249bbb4f703d424e0c0a20f711adb (commit) via d4f69745814a70ae80e3c117a0e9f1bc0e18ec3d (commit) via 64afbf1416b63728435244185402892a0d36bdd1 (commit) via d3ece118f130847eb9715dd1fb8edf3f1725c8f7 (commit) via 0d7a33f671e719015c34d10c5573ed652d1e925c (commit) via 50391764431c95ffcbb735dd23d344265328c488 (commit) via 72d7840f52ef11b60b0cd6254e0739d0dd198869 (commit) via ade32378208e7eb3445d89d17a25cfaf236f9298 (commit) via 8ef86f187580cf325d993956add496585c2ffab8 (commit) via c9b59307b2afab2762a2fd866a168c00e8e6d4e6 (commit) via 95b4f31fb2478435d7095c2bb8c754342325e3b3 (commit) via a4e4065da785dc840f1c4d8390df39569932faa5 (commit) via d3993f44eeaa9c50a1598d385eb2dc055bc19b99 (commit) via 5e397af14f171d790f73dcf210f555ffbbd67464 (commit) via 573ac9488f0ef086939a9909e523dfc6d5559814 (commit) via 6676dc2df04f5b361ed616c17a8f0d741a2dee59 (commit) via 1457256b98afd94dc3e3166200120bfb29b562dc (commit) via b1c1f6f434276811ba231b29db4e3efbe006b0bd (commit) via 0eea24a8a19b0be56b77d983c4265c98620393fa (commit) via 5d2a1c7916e49fb39f6986afeb2b30f34c361660 (commit) via 25c895db0144b43bd7b12bc7403fefaac7647cc9 (commit) via 4adbb89c4cd0bcfe60b067b2e0e3ba2db4c98dd0 (commit) via 00ecd9fcbe79180ecf671186e7ea725126a96a0c (commit) via 28a4d55f703b74e44d563eeace11ddc9f280f75c (commit) via 764c105494fae8785f0bea63825c23660d339584 (commit) via 31d9011ebb05b942143e03d94ec283acc8ef4fa9 (commit) via 4b00bddbfa991394da48de83a3d752fe82a045a5 (commit) via 6fa2b030975632b379c5a70cc4c0b9add2bf1ea7 (commit) via 4d32d848e04ebdae1717beb94ec07486d1b9b98c (commit) via 2685c698264a8cb998f64d50ee2421d4ca454a85 (commit) via 858ca174afe74a0fb84bb4d5e4f0d66e9f5088c4 (commit) via ff62346583d395c83ec05eb183ab55e27786504e (commit) via b592c3a0f51625da35a37b8334a04eaad6f25549 (commit) via 70607332a195459415b10ee78ac274d8e2eb5049 (commit) via 7c0e441d50d8587ba496d3031d79bde3b0ec6a57 (commit) via b1317464eccc01edc7eaa055e2246b07d2b33d6d (commit) via d4aace67fdc758cb62e5cb20970576941135dd3e (commit) via cfb61c76b82c4a98b9b245d8865f5b1e9abe747e (commit) via 47f49d2e7fb9963e6beb562ccb353a4cc5589ac6 (commit) via 7e8f7eb2589bc6d7a1c2867bf10a0a57d1a4fe0e (commit) via a28677b38910ee3ab4c1bd6d600b7c1608089941 (commit) via 657ce474c6f32519388e174df02bddba80e142ab (commit) via be8c7f9dd1bc8424232f25bfebd7afab3750d2ca (commit) via 9efbc2d935f590fc5d158fa49d3925df975dded5 (commit) via f0233c4f336ee96bba03f43d520a0326bb608504 (commit) via e44fc909ef930cf72b2cc93b1e557af238f29a52 (commit) via 1e8c06c522c4d26273b90b95adf642eece05dc9e (commit) via 7233544f8b5cc8b9e17bdda12cd30306fd744542 (commit) via 6a1191bb3f7b715006aa289d85692e569359fd74 (commit) via 360f985307b5c7acca76cf7dd073503d49e2315b (commit) via 39c177e3f2d261d559e9fb595ee5fce101178f4d (commit) via fcb21ec94c8dd9cf7cbc8314427d94de0fb1831c (commit) via a9c90b6dfb4e5648d9155294e0c911b2de9ecf43 (commit) via 20140de43e4d2402281fe3f621976959cc2edd44 (commit) via 884d7099e94ed0e7b95da2e13a60340fd3899196 (commit) via d3b07c1889ed30693d321394562db627a4c135dd (commit) via 8a9b4f0695aa96158c460f72e4ec54a0e4a944a3 (commit) via 4d8863bbdb91dd58f0598bd21cea4afa17615526 (commit) via 3bae1c1dcabfce4e8f0f6acc5aafdfb02c7597a2 (commit) via f24750f5ba1a2b6535c76755c5daf27ca260fa0f (commit) via 6f14921479e2863d801ab3689c9301d8a88fbc65 (commit) via 5944bd56fa33fa000572067ea3deae8f0e874721 (commit) via 880fd86057fb288e1afb8b18b54ff16e85042c21 (commit) via a4dab23a41fe63855806a5c95d6bf08d23556aa0 (commit) via 1ea703d869cfa19baff5fa29e6bba3f26c46926b (commit) via 2859e19155f0c7d7907323a5fc2596ddfdf67ce6 (commit) via 10f362fbf57151a938de56a3373a6a5da492416d (commit) via 89a39cdc21369c8ffc235738ad02f64f25105735 (commit) via d40488fe658a5edfee83d9d39a6047a6a9bfd8c0 (commit) via aebaf6bc08003f962023c1b35302520e6c741020 (commit) via 05ca02905589092888e2da08283ce76e62b37e27 (commit) via 3dfecafc56ebee11e576aadac3cc73678c72bcb5 (commit) via 0abb62be46a802b19a2c46688c42268b50fe25d8 (commit) via c7e421d9959cbe6c733acae89586a99da7e60e3c (commit) via 4e6a664fb00198aaf8cde76ba4b24bc6eb4c881a (commit) via 2fe930dae2511fb7ab5875e6ec99b0b08447a949 (commit) via 6ba2b9c87c9e4c74afe7a21e511893610455a861 (commit) via a18bdb0bfe4ebd63c2d35000f2a1626df82a16b8 (commit) via 252d59519446cf1a06237cdab7f533924e5e57cb (commit) via 3a63dda868b96c00ae36ddfd78c29e04d4e4d05d (commit) via b4b92c3d980c9e40601bcb201e5de8fac44fa762 (commit) via b717110c142aa389521ad7676b01d832fbc3d35f (commit) via 8876393d160e26b87d235aa2dccafe3e1cbadd28 (commit) via 1e9c425950857325812cb211e65d06b6c6ec4897 (commit) via 0700a8b732ad3cda3ead9bc099ee5113cd84565d (commit) via ac5047b8872768168db3182eca2a1a4fb7de2d5e (commit) via b3feb54ee073b99565a4e25fd397ff6ed5a0dc78 (commit) via 9f806f2611f7f91021e776d246da960b5c2450e5 (commit) via 36e68effaec6ff98ce30118c2e5c8c1696fb0bbc (commit) via aa3ac3e319f6adb91037dbedd63c842b55f6b438 (commit) via 24b8e9c384125a8cc88e257bf414053b94774eaf (commit) via e0c72d37fa711bf6208aa2ded518a8a366eabb50 (commit) via b453f7ed5c4cca8472b19bd629a0157dc985c644 (commit) via d7a6f17f11f625b268ba0327a7f28ec5123e8183 (commit) via 77f04bd426abe824fab66a3f5a4ec90cda734110 (commit) via 5f0f4885965995bbecef5acc3c2f4c0c7f52a78b (commit) via 34936223f385713bb87f12432e4adf2fe430264c (commit) from 57e4a6116fd252c01d8f3e372904f5c7479e48d5 (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 5f3bb57e47baaf40a8b789830506b969435054ce Merge: 57e4a6116fd252c01d8f3e372904f5c7479e48d5 efc9e3a331d3bf8dec536694cfca8c1dd58313f1 Author: Chris Cormack <chr...@catalyst.net.nz> Date: Wed Jul 7 21:44:17 2010 +1200 Merge commit 'kc/master' into new/memcached ----------------------------------------------------------------------- Summary of changes: C4/Acquisition.pm | 5 +- C4/Auth.pm | 55 ++--- C4/AuthoritiesMarc.pm | 2 +- C4/AuthoritiesMarc/MARC21.pm | 2 +- C4/AuthoritiesMarc/UNIMARC.pm | 2 +- C4/BackgroundJob.pm | 2 +- C4/Biblio.pm | 15 ++- C4/Bookseller.pm | 2 +- C4/Boolean.pm | 2 +- C4/Branch.pm | 2 +- C4/Budgets.pm | 2 +- C4/Charset.pm | 2 +- C4/Circulation.pm | 2 +- C4/ClassSortRoutine.pm | 2 +- C4/ClassSortRoutine/Dewey.pm | 2 +- C4/ClassSortRoutine/Generic.pm | 2 +- C4/ClassSortRoutine/LCC.pm | 2 +- C4/ClassSource.pm | 2 +- C4/Context.pm | 214 -------------------- C4/Contract.pm | 2 +- C4/Form/MessagingPreferences.pm | 2 +- C4/Heading.pm | 2 +- C4/Heading/MARC21.pm | 2 +- C4/ImportBatch.pm | 2 +- C4/Input.pm | 2 +- C4/Installer.pm | 2 +- C4/Installer/PerlModules.pm | 11 +- C4/Items.pm | 1 - C4/Labels/Label.pm | 2 +- C4/Languages.pm | 2 +- C4/Letters.pm | 11 +- C4/Log.pm | 2 +- C4/Maintainance.pm | 2 +- C4/Matcher.pm | 2 +- C4/Members.pm | 29 +++ C4/Members/AttributeTypes.pm | 2 +- C4/Members/Attributes.pm | 2 +- C4/Members/Messaging.pm | 2 +- C4/Output.pm | 2 +- C4/Overdues.pm | 2 +- C4/Print.pm | 2 +- C4/Record.pm | 1 - C4/Reserves.pm | 24 ++- C4/Ris.pm | 3 - C4/Search.pm | 3 +- C4/Search/PazPar2.pm | 2 +- C4/Serials.pm | 2 +- C4/Serials/Frequency.pm | 2 +- C4/Serials/NumberPattern.pm | 2 +- C4/Stats.pm | 2 +- C4/Suggestions.pm | 2 +- C4/UploadedFile.pm | 2 +- C4/VirtualShelves.pm | 2 +- C4/VirtualShelves/Page.pm | 7 + C4/XSLT.pm | 2 +- C4/Z3950.pm | 78 +------- acqui/basket.pl | 1 + acqui/basketgroup.pl | 8 +- acqui/neworderbiblio.pl | 9 +- acqui/parcel.pl | 2 - acqui/pdfformat/layout2pages.pm | 5 +- acqui/pdfformat/layout3pages.pm | 5 +- acqui/z3950_search.pl | 11 +- admin/aqbudgets.pl | 4 +- admin/aqplan.pl | 17 ++- admin/authorised_values.pl | 6 +- admin/patron-attr-types.pl | 4 +- admin/systempreferences.pl | 1 - basket/basket.pl | 4 +- cataloguing/value_builder/labs_theses.pl | 3 - cataloguing/value_builder/marc21_leader_book.pl | 1 - .../value_builder/marc21_leader_computerfile.pl | 3 - cataloguing/value_builder/marc21_leader_video.pl | 1 - cataloguing/value_builder/stocknumberam123.pl | 1 - cataloguing/value_builder/unimarc_field_010.pl | 1 - debian/scripts/koha-create | 2 +- docs/history.txt | 2 + install_misc/UpgradeBackup.pm | 2 +- .../data/mysql/de-DE/mandatory/class_sources.sql | 2 +- .../data/mysql/de-DE/mandatory/class_sources.txt | 2 +- .../de-DE/mandatory/message_transport_types.sql | 2 +- .../de-DE/mandatory/message_transport_types.txt | 2 +- .../data/mysql/de-DE/mandatory/sample_notices.sql | 3 +- .../data/mysql/de-DE/mandatory/sample_notices.txt | 2 +- installer/data/mysql/de-DE/mandatory/stopwords.sql | 2 +- installer/data/mysql/de-DE/mandatory/stopwords.txt | 2 +- .../data/mysql/de-DE/mandatory/subtag_registry.txt | 2 +- installer/data/mysql/de-DE/mandatory/sysprefs.sql | 3 +- installer/data/mysql/de-DE/mandatory/sysprefs.txt | 2 +- installer/data/mysql/de-DE/mandatory/userflags.sql | 2 +- installer/data/mysql/de-DE/mandatory/userflags.txt | 2 +- .../data/mysql/de-DE/mandatory/userpermissions.sql | 11 +- .../data/mysql/de-DE/mandatory/userpermissions.txt | 2 +- .../marc21/mandatory/authorities_normal_marc21.sql | 2 +- .../marc21/mandatory/authorities_normal_marc21.txt | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.sql | 2 +- .../marc21/mandatory/marc21_framework_DEFAULT.txt | 2 +- .../optional/marc21_default_matching_rules.sql | 2 +- .../optional/marc21_default_matching_rules.txt | 2 +- .../marc21/optional/marc21_fastadd_framework.sql | 2 +- .../marc21/optional/marc21_fastadd_framework.txt | 2 +- .../optional/marc21_simple_bib_frameworks.sql | 2 +- .../optional/marc21_simple_bib_frameworks.txt | 2 +- installer/data/mysql/de-DE/optional/auth_val.sql | 2 +- installer/data/mysql/de-DE/optional/auth_val.txt | 2 +- .../optional/marc21_holdings_coded_values.sql | 2 +- .../optional/marc21_holdings_coded_values.txt | 2 +- installer/data/mysql/de-DE/optional/parameters.sql | 2 +- installer/data/mysql/de-DE/optional/parameters.txt | 2 +- .../mysql/de-DE/optional/patron_categories.sql | 2 +- .../mysql/de-DE/optional/patron_categories.txt | 2 +- .../mysql/de-DE/optional/sample_creator_data.sql | 2 +- .../mysql/de-DE/optional/sample_creator_data.txt | 2 +- .../data/mysql/de-DE/optional/sample_holidays.sql | 2 +- .../data/mysql/de-DE/optional/sample_holidays.txt | 2 +- .../data/mysql/de-DE/optional/sample_itemtypes.sql | 16 +- .../data/mysql/de-DE/optional/sample_itemtypes.txt | 2 +- .../data/mysql/de-DE/optional/sample_libraries.sql | 2 +- .../data/mysql/de-DE/optional/sample_libraries.txt | 2 +- .../data/mysql/de-DE/optional/sample_news.sql | 2 +- .../data/mysql/de-DE/optional/sample_news.txt | 2 +- .../optional/sample_notices_message_attributes.sql | 3 +- .../optional/sample_notices_message_attributes.txt | 2 +- .../optional/sample_notices_message_transports.sql | 2 - .../optional/sample_notices_message_transports.txt | 2 +- .../data/mysql/de-DE/optional/sample_patrons.txt | 2 +- .../data/mysql/en/mandatory/sample_notices.sql | 4 +- installer/data/mysql/en/mandatory/sysprefs.sql | 3 +- .../data/mysql/en/mandatory/userpermissions.sql | 8 + .../data/mysql/en/optional/sample_itemtypes.sql | 16 +- .../optional/sample_notices_message_attributes.sql | 1 - .../optional/sample_notices_message_transports.sql | 2 - .../mysql/fr-FR/1-Obligatoire/sample_notices.sql | 1 - .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 - .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 12 +- .../sample_notices_message_attributes.sql | 1 - .../sample_notices_message_transports.sql | 2 - installer/data/mysql/kohastructure.sql | 34 +++- .../data/mysql/pl-PL/mandatory/sample_notices.sql | 8 +- installer/data/mysql/pl-PL/mandatory/sysprefs.sql | 1 - .../data/mysql/pl-PL/mandatory/userpermissions.sql | 16 ++- .../optional/sample_notices_message_attributes.sql | 1 - .../optional/sample_notices_message_transports.sql | 2 - .../ru-RU/mandatory/permissions_and_user_flags.sql | 23 ++- .../data/mysql/ru-RU/mandatory/sample_notices.sql | 4 +- ...m_preferences_full_optimal_for_install_only.sql | 1 - ...ystem_preferences_only_translation_updating.sql | 2 - .../mysql/ru-RU/optional/library_item_types.sql | 16 +- .../data/mysql/ru-RU/optional/sample_notices.sql | 2 - .../optional/sample_notices_message_attributes.sql | 1 - .../optional/sample_notices_message_transports.sql | 2 - .../uk-UA/mandatory/permissions_and_user_flags.sql | 25 ++- .../data/mysql/uk-UA/mandatory/sample_notices.sql | 4 +- ...m_preferences_full_optimal_for_install_only.sql | 1 - ...ystem_preferences_only_translation_updating.sql | 3 - .../mysql/uk-UA/optional/library_item_types.sql | 50 +++--- .../data/mysql/uk-UA/optional/sample_notices.sql | 2 - .../optional/sample_notices_message_attributes.sql | 1 - .../optional/sample_notices_message_transports.sql | 2 - installer/data/mysql/updatedatabase.pl | 61 ++++++ koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css | 1 + .../prog/en/includes/biblio-default-view.inc | 9 + .../prog/en/includes/circ-toolbar.inc | 2 + .../intranet-tmpl/prog/en/includes/mainmenu.inc | 4 + .../prog/en/includes/serials-menu.inc | 15 +- .../prog/en/includes/serials-toolbar.inc | 56 ++++-- koha-tmpl/intranet-tmpl/prog/en/js/additem.js | 4 +- .../prog/en/modules/acqui/basket.tmpl | 6 +- .../prog/en/modules/acqui/booksellers.tmpl | 2 +- .../prog/en/modules/acqui/parcel.tmpl | 4 +- .../prog/en/modules/acqui/supplier.tmpl | 4 +- .../prog/en/modules/admin/aqbudgets.tmpl | 24 ++- .../prog/en/modules/admin/aqcontract.tmpl | 34 ++-- .../prog/en/modules/admin/aqplan.tmpl | 16 +-- .../en/modules/admin/preferences/acquisitions.pref | 4 +- .../prog/en/modules/admin/preferences/admin.pref | 9 +- .../en/modules/admin/preferences/circulation.pref | 7 +- .../prog/en/modules/admin/preferences/opac.pref | 4 +- .../prog/en/modules/admin/z3950servers.tmpl | 5 + .../prog/en/modules/authorities/authorities.tmpl | 8 +- .../prog/en/modules/catalogue/MARCdetail.tmpl | 20 +- .../prog/en/modules/catalogue/detail.tmpl | 22 ++- .../prog/en/modules/catalogue/results.tmpl | 12 +- .../prog/en/modules/cataloguing/addbiblio.tmpl | 6 +- .../prog/en/modules/cataloguing/merge.tmpl | 48 +++-- .../cataloguing/value_builder/unimarc_leader.tmpl | 2 +- .../prog/en/modules/circ/branchoverdues.tmpl | 7 +- .../prog/en/modules/circ/overdue.tmpl | 7 +- .../prog/en/modules/circ/pendingreserves.tmpl | 14 +-- .../prog/en/modules/circ/reserveratios.tmpl | 9 +- .../prog/en/modules/circ/transferstoreceive.tmpl | 7 +- .../prog/en/modules/circ/waitingreserves.tmpl | 8 +- .../prog/en/modules/help/members/member-flags.tmpl | 21 +-- .../prog/en/modules/members/moremember.tmpl | 4 +- .../prog/en/modules/reserve/request.tmpl | 12 +- .../prog/en/modules/serials/serials-edit.tmpl | 7 +- .../prog/en/modules/serials/serials-home.tmpl | 2 +- .../prog/en/modules/serials/subscription-add.tmpl | 11 +- .../prog/en/modules/suggestion/suggestion.tmpl | 105 +++++++++- .../prog/en/modules/tools/batchMod-del.tmpl | 4 - .../prog/en/modules/virtualshelves/shelves.tmpl | 18 +- .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 100 ++++------ .../prog/en/xslt/UNIMARCslim2intranetDetail.xsl | 54 +++--- .../intranet-tmpl/prog/img/clone-subfield.png | Bin 0 -> 263 bytes .../intranet-tmpl/prog/img/delete-subfield.png | Bin 0 -> 266 bytes .../prog/img/famfamfam/AR.png} | Bin 622 -> 622 bytes .../prog/img}/famfamfam/BK.png | Bin 593 -> 593 bytes .../prog/img}/famfamfam/CF.png | Bin 620 -> 620 bytes .../prog/img}/famfamfam/MM.png | Bin 760 -> 760 bytes .../prog/img}/famfamfam/MP.png | Bin 804 -> 804 bytes .../prog/img}/famfamfam/MU.png | Bin 610 -> 610 bytes .../prog/img}/famfamfam/SE.png | Bin 658 -> 658 bytes .../prog/img}/famfamfam/VM.png | Bin 653 -> 653 bytes .../intranet-tmpl/prog/pdf}/layout2pages.odt | Bin 12688 -> 12688 bytes .../intranet-tmpl/prog/pdf}/layout2pages.pdf | Bin 25541 -> 25541 bytes .../intranet-tmpl/prog/pdf}/layout3pages.odt | Bin 12973 -> 12973 bytes .../intranet-tmpl/prog/pdf}/layout3pages.pdf | Bin 26944 -> 26944 bytes .../prog/en/modules/opac-readingrecord.tmpl | 38 +++- .../prog/en/modules/opac-sendbasketform.tmpl | 2 +- .../prog/en/modules/opac-sendshelfform.tmpl | 4 +- .../opac-tmpl/prog/en/modules/opac-shelves.tmpl | 50 ++--- .../prog/en/modules/opac-suggestions.tmpl | 6 +- .../opac-tmpl/prog/en/modules/opac-userupdate.tmpl | 12 +- .../prog/en/xslt/MARC21slim2OPACDetail.xsl | 94 +++++---- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 7 +- .../prog/en/xslt/UNIMARCslim2OPACDetail.xsl | 54 +++--- .../prog/en/xslt/compact.xsl | 0 .../prog/famfamfam/{silk/book_open.png => AR.png} | Bin 622 -> 622 bytes kohaversion.pl | 4 +- labels/label-edit-template.pl | 1 - members/member-flags.pl | 106 +++++----- members/memberentry.pl | 5 + members/moremember.pl | 23 ++- members/notices.pl | 1 - misc/translator/tmpl_process3.pl | 14 +- opac/changelanguage.pl | 1 - opac/opac-ISBDdetail.pl | 5 +- opac/opac-MARCdetail.pl | 5 +- opac/opac-search.pl | 1 - opac/opac-showmarc.pl | 2 +- opac/opac-userupdate.pl | 1 - reports/cat_issues_top.pl | 1 - reports/guided_reports.pl | 13 -- reports/issues_avg_stats.pl | 2 - reports/manager.pl | 1 - reserve/renewscript.pl | 4 +- reserve/request.pl | 3 +- serials/acqui-search-result.pl | 2 +- serials/acqui-search.pl | 2 +- serials/checkexpiration.pl | 2 +- serials/claims.pl | 2 +- serials/member-search.pl | 4 +- serials/routing-preview.pl | 4 +- serials/routing.pl | 2 +- serials/serial-issues.pl | 2 +- serials/serials-collection.pl | 2 +- serials/serials-edit.pl | 13 +- serials/serials-home.pl | 2 +- serials/statecollection.pl | 2 +- serials/subscription-add.pl | 8 +- serials/subscription-bib-search.pl | 17 ++- serials/subscription-detail.pl | 22 ++- serials/subscription-renew.pl | 2 +- serials/viewalerts.pl | 2 +- suggestion/suggestion.pl | 16 +- svc/config/systempreferences | 4 +- t/Installer_pm.t | 25 +++ tools/batchMod.pl | 11 +- tools/export.pl | 1 - xt/author/test_template.pl | 2 +- xt/author/valid-templates.t | 2 +- xt/permissions.t | 10 +- xt/syspref.t | 9 +- 273 files changed, 1224 insertions(+), 1193 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/biblio-default-view.inc create mode 100644 koha-tmpl/intranet-tmpl/prog/img/clone-subfield.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/delete-subfield.png copy koha-tmpl/{opac-tmpl/prog/famfamfam/silk/book_open.png => intranet-tmpl/prog/img/famfamfam/AR.png} (100%) copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/BK.png (100%) copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/CF.png (100%) copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/MM.png (100%) copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/MP.png (100%) copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/MU.png (100%) copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/SE.png (100%) copy koha-tmpl/{opac-tmpl/prog => intranet-tmpl/prog/img}/famfamfam/VM.png (100%) rename {acqui/pdfformat => koha-tmpl/intranet-tmpl/prog/pdf}/layout2pages.odt (100%) rename {acqui/pdfformat => koha-tmpl/intranet-tmpl/prog/pdf}/layout2pages.pdf (100%) rename {acqui/pdfformat => koha-tmpl/intranet-tmpl/prog/pdf}/layout3pages.odt (100%) rename {acqui/pdfformat => koha-tmpl/intranet-tmpl/prog/pdf}/layout3pages.pdf (100%) mode change 100644 => 100755 koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl copy koha-tmpl/{intranet-tmpl => opac-tmpl}/prog/en/xslt/compact.xsl (100%) copy koha-tmpl/opac-tmpl/prog/famfamfam/{silk/book_open.png => AR.png} (100%) create mode 100755 t/Installer_pm.t 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