[koha-commits] main Koha release repository branch master updated. v17.05.00-620-ge98c178

Git repo owner gitmaster at git.koha-community.org
Tue Sep 19 16:52:27 CEST 2017


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  e98c178c081d4bb5673e6b04bf817b9c452cba8c (commit)
       via  6ce1cc6aada33d7f72b8d3b0b9af4add65a93842 (commit)
       via  06b602b0976e2a8d53ff31f95a2213cbeb98e9cb (commit)
       via  438a3dea0c8ef1a5adcec58d8b97474d14ccca9b (commit)
       via  17c5b76597b9a356bc215a3682d7293e307fcc46 (commit)
       via  a59eaa5277b60055df216373247efc654551d579 (commit)
       via  7f5e8668a75e2a75b638fbb39ca3b5576bcf76d3 (commit)
       via  c7ac741e6a5d5e9bf4fb96dda3e4fabeace7f025 (commit)
       via  45aea7ae1df815d241e7a34fbb5c42e9475f6d04 (commit)
       via  9355e5204074349c232c58caa678a8ab40c18efe (commit)
       via  83704cb1fab33feb0262fdab99bccf0052243d14 (commit)
       via  e722c0a29f730869df24cbe48afcedc12bb57344 (commit)
       via  0f9dce409f6dba60cbb52ae682e70d8203e96ea1 (commit)
       via  80c749df80f08be46b895715045b38cd1ded2ed1 (commit)
       via  30311019987dcddd410fd86c018443e9480253b5 (commit)
       via  6ead305ba4ee9ae5795b3956b41b6a723d7c894d (commit)
       via  2fcf6e88ba6c95461df127293ffd4931a48118f4 (commit)
       via  b36a0e1a59b92294cabe0ea33886f43f8ef1a5fe (commit)
       via  e2d56c0b2b6b45af2926fe3c8b80c35868fb3738 (commit)
       via  e4eee19747cb4c1bea2b71b9759a7bc940079492 (commit)
       via  91bdd9533b38f79e084dbfd34c7db4ada2b4041c (commit)
       via  ed94450bd6bfa509b96d0c2dcd77a3b1cf20086c (commit)
       via  c0d4313e571d44841cb2a472487e0616cd91c88f (commit)
       via  0ae70349809d51552e4297625db1382aa4e26dc5 (commit)
       via  ff22cb46a5f6a1f75422c2a90e1f80ccb05c30b9 (commit)
       via  0d03f143e25f498de780d2ddd1972c3be7947519 (commit)
       via  5bb19808bb23a01a257a0970bd7e2ae43fb5b3d6 (commit)
      from  c73b6d51dac3d07d32135f0f891cc6418101a53b (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 e98c178c081d4bb5673e6b04bf817b9c452cba8c
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Aug 29 05:02:29 2017 +0000

    Bug 19195: Preventing noisy warns when creating or editing a basket
    
    To test:
    1) Open the koha intranet error log
    2) Go to Acquisitions -> Find or create a vendor
    3) Create a new basket, filling all fields
    4) Notice warns in error log
    5) Edit this basket
    6) Notice warns in error log
    7) Apply patch
    8) Create another basket, confirm warns do not show
    9) Edit this basket, confirm warns do not show
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6ce1cc6aada33d7f72b8d3b0b9af4add65a93842
Author: Dobrica Pavlinusic <dpavlin at rot13.org>
Date:   Mon Sep 18 17:37:21 2017 +0200

    Bug 19332 - Basket grouping PDF and CSV exports empty
    
    This bug was introduced in commit 2bf3ce268de6bc8b2386cfb5d768f60b05d75f44
    Bug 17196: [QA Follow-up] Additional fix on acqui/basketgroup
    
    Signed-off-by: Lee Jamison <ldjamison at marywood.edu>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 06b602b0976e2a8d53ff31f95a2213cbeb98e9cb
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Tue Aug 29 21:21:00 2017 +0000

    Bug 19180: [FOLLOW-UP] Renaming all instances of 'name' variable to 'booksellername'
    
    ... when referring to the name of the vendor.
    
    To test:
    1) Confirm vendor shows on webpage title (tab name)
    2) Confirm vendor shows in breadcrumbs
    3) Confirm vendor shows in heading when viewing basket ('Basket x (1) for
    vendor')
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    Signed-off-by: Caroline Cyr La Rose <caroline.cyr-la-rose at inlibro.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 438a3dea0c8ef1a5adcec58d8b97474d14ccca9b
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Sun Aug 27 23:00:15 2017 +0000

    Bug 19180: Add vendor name to breadcrumbs when closing an order
    
    To test:
    1) Go to Acquisitions
    2) Find a vendor and a basket
    3) Click 'Close basket' button
    4) Notice that on confirmation page, breadcrumbs are missing vendor
    5) Apply patch and refresh page
    6) Vendor name should now show
    7) Confirm link to vendor works as expected
    
    Sponsored-by: Catalyst IT
    
    Signed-off-by: Mark Tompsett <mtompset at hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 17c5b76597b9a356bc215a3682d7293e307fcc46
Author: Aleisha Amohia <aleishaamohia at hotmail.com>
Date:   Wed Aug 30 04:36:50 2017 +0000

    Bug 16204: Show friendly error message if trying to edit record which no longer exists
    
    To test:
    1) Create a record
    2) Click Edit -> Edit record. open this in another tab
    3) Delete the record in the original tab
    4) Refresh the edit form in the other tab. Notice the software error
    5) Apply patch and refresh page
    6) There should be a nice error message with the form fields and buttons
    hidden. Confirm links work as expected.
    
    Sponsored-by: Catalyst IT
    Signed-off-by: Claire Gravely <claire.gravely at bsz-bw.de>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit a59eaa5277b60055df216373247efc654551d579
Author: Marc Véron <veron at veron.ch>
Date:   Wed Sep 6 17:46:27 2017 +0200

    Bug 18541: (QA follow-up) Add some POD for draw_guide_grid
    
    Add description to POD for draw_guide_grid
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    Amended: Moved the description from draw_guide_box to .._grid.
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 7f5e8668a75e2a75b638fbb39ca3b5576bcf76d3
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Wed Sep 6 16:14:26 2017 +0200

    Bug 18541: [QA Follow-up] Add POD to Patroncard.pm
    
    Just adding the POD framework to make qa tools happy. The authors
    are encouraged to complete this information.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c7ac741e6a5d5e9bf4fb96dda3e4fabeace7f025
Author: Marc Véron <veron at veron.ch>
Date:   Wed Sep 6 15:56:55 2017 +0200

    Bug 18541: (QA follow-up) Fix wrong variable name ($layout_xml vs $print_layout_xml)
    
    This patch changes variable names as mentioned in comments #11 and #13
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 45aea7ae1df815d241e7a34fbb5c42e9475f6d04
Author: Marc Véron <veron at veron.ch>
Date:   Thu May 4 17:36:24 2017 +0200

    Bug 18541 - Patron card creator: Add a grid to support layout design
    
    Add a layout grid to patron card creator to figure out the positions of text
    fields, barcode and images.
    
    To test:
    - Apply on top of patch 18465
    - Go to Home > Tools > Patron card creator
    - Edit or create a layout
    - Turn on new choice 'Guide grid' in section 'General settings'
    - Leave 'Units' unchanged
    - Crate a PDF using 'Card batches'
    - Notice that card is printed with a layout grid that reflects selected unit
      with each 5th and 10th line in different color, unit description displayed
      bottom left, card dimensions displayed top right in small print inside the
      layout grid
    - Print PDF. Set printer settings in Adobe Reader or other PDF printing
      software to 'Actual size' to prevent scaling to printer's printable
      region
    - Mesure out printed PDF and verify that grid corresponds to selecte unit.
    - Go back to layout definition and choose an other unit, repeat steps
      to verify that grid respects selected unit.
    - Go back to layout definition, turn grid off, create PDF, verify that grid
      does not display in PDF
    
    Note for testers / QAers: Position of card elements (text, image...) do not
    respect the unit, this will be fixed in Bug 18550
    
    Followed test plan and it worked as intended
    Signed-off-by: Alex Buckley <alexbuckley at catalyst.net.nz>
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 9355e5204074349c232c58caa678a8ab40c18efe
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Tue Jun 6 18:35:07 2017 +0000

    Bug 18739 - Add SVG version of staff-home-icons-sprite image
    
    Images display correctly. Followed test plan and patch works as described.
    
    Signed-off-by: Dilan Johnpullé <dilan at calyx.net.au>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 83704cb1fab33feb0262fdab99bccf0052243d14
Author: Owen Leonard <oleonard at myacpl.org>
Date:   Thu Jun 8 16:01:32 2017 +0000

    Bug 15644 - City dropdown default selection when modifying a patron matches only on city
    
    This patch modifies the include files which contain the form fields for
    city, state, zipcode, etc. shown on the patron entry screen. The files
    are modified so that the city/state/zip <select> preselects a value
    based on city, state, and zipcode matching the values in the
    corresponding text fields.
    
    To test, confirm that the bug's steps to reproduce are fixed:
    
    - Enter two cities via Administration -> Patrons and circulation
      -> Cities and towns:
        Springfield, MA 01101
        Springfield, VT 05156
    - Edit a patron choosing, Springfield VT, and save.
    - Edit the patron again and confirm that the correct city is
      pre-selected.
    - Confirm this result with all three different settings of the
      "AddressFormat" system preference.
    
    Signed-off-by: Amit Gupta <amit.gupta at informaticsglobal.com>
    
    Signed-off-by: Nick Clemens <nick at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e722c0a29f730869df24cbe48afcedc12bb57344
Author: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
Date:   Thu Jun 29 13:03:39 2017 +0200

    Bug 18149: Move CountUsage calls to Koha namespace
    
    After the introduction of Koha::Authorities->get_usage_count with bug
    9988, we can now replace the remaining occurrences of CountUsage.
    
    At the same time we remove CountUsageChildren. This was an empty sub.
    The typo get_count_usage in a subtest title is adjusted.
    
    Test plan:
    [1] Run t/db_dependent/Koha/Authorities.t
    [2] Perform a search on authorities-home.pl and verify that you see
        plausible numbers for 'used in xx records'.
    [3] Click on Details for one authority. See the same number?
    [4] Do the same as in 2/3 for Authority search on OPAC.
    [5] Remember the authid and enter this in the record numbers box on
        tools/batch_delete_records.pl. Select Authorities and click
        Continue. The next form shows a column "Used in". Do you see
        the same count again?
    [6] Git grep CountUsage.
        You should see just one hit in a comment that can be kept in
        Koha/Authorities.pm.
    
    Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
    
    Signed-off-by: Josef Moravec <josef.moravec at gmail.com>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0f9dce409f6dba60cbb52ae682e70d8203e96ea1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 19 11:46:51 2017 -0300

    Bug 10132: DBRev 17.05.00.007
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 80c749df80f08be46b895715045b38cd1ded2ed1
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Tue Sep 19 09:59:36 2017 -0300

    Bug 10132: Simplify code, call the method only once
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 30311019987dcddd410fd86c018443e9480253b5
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Sep 11 16:14:41 2017 -0300

    Bug 10132: (QA followup) Open LOC URL on a separate window
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 6ead305ba4ee9ae5795b3956b41b6a723d7c894d
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Sep 11 16:08:09 2017 -0300

    Bug 10132: (QA followup) Add POD to ->get_effective_marcorgcode
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 2fcf6e88ba6c95461df127293ffd4931a48118f4
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Sep 11 16:02:00 2017 -0300

    Bug 10132: (QA followup) Organize tests in subtest
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit b36a0e1a59b92294cabe0ea33886f43f8ef1a5fe
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:23:41 2017 +0000

    Bug 10132: Add ability to set MARC Organization Code at library level
    
    Test plan:
    0. Apply patches
    1. Update database
    2. Go to administration -> libraries, try to update some library and
    fill in some value into Marc Organization code field
    3. Save this library and edit again - the code should be stored
    correctly
    4. Go to system preferences and fill in some value into MARCOrgCode
    preference, note there is enhanced description mentioning the ability to
    set organization code on library level
    5. Set active library to the one with own org code stored
    6. Go to cataloguing, create new empty record and click into field 003 -
    there should be the code you filled for that library
    7. Set active library to one withou marc org code
    8. Go to cataloguing, create new empty record and click into field 003 -
    there should be the code from system preference
    9. Go to system preferences again and set AutoCreateAuthorities to
    'generate' and BiblioAddsAuthorities to 'allow'
    10. Go to cataloguing and create some biblio record, fill in any author
    in to create its authority record, save the biblio
    11. Go to authorities and find this created authority, go to details and
    check the fields: 003, 040$a, 040$c, 670$a - there should be used right org code
    12. prove t/db_dependent/AuthoritiesMarc.t t/db_dependent/Biblio.t t/db_dependent/Koha/Libraries.t
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e2d56c0b2b6b45af2926fe3c8b80c35868fb3738
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:22:06 2017 +0000

    Bug 10132: Admin pages changes
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit e4eee19747cb4c1bea2b71b9759a7bc940079492
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:48:50 2017 +0000

    Bug 10132: Unit tests
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 91bdd9533b38f79e084dbfd34c7db4ada2b4041c
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:21:16 2017 +0000

    Bug 10132: DBIC update
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ed94450bd6bfa509b96d0c2dcd77a3b1cf20086c
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Sun Jun 11 19:19:38 2017 +0000

    Bug 10132: Database changes
    
    Signed-off-by: Hugo Agud <hagud at orex.es>
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit c0d4313e571d44841cb2a472487e0616cd91c88f
Author: Josef Moravec <josef.moravec at gmail.com>
Date:   Tue Jun 20 13:06:47 2017 +0200

    Bug 18810: Update Font Awesome to 4.7.0
    
    Test plan:
    
    0) Apply the patch
    1) Edit a template and use any of the new icons, see
    http://fontawesome.io/icons/
    2) Verify that the added icon is shown
    
    For alternative test see comment #2. Works as expected.
    Signed-off-by: Marc Véron <veron at veron.ch>
    
    Signed-off-by: Kyle M Hall <kyle at bywatersolutions.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0ae70349809d51552e4297625db1382aa4e26dc5
Author: Julian Maurice <julian.maurice at biblibre.com>
Date:   Fri Sep 1 16:07:36 2017 +0200

    Bug 18742: (QA followup) Fix indentation
    
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit ff22cb46a5f6a1f75422c2a90e1f80ccb05c30b9
Author: Nick Clemens <nick at bywatersolutions.com>
Date:   Wed Jun 7 10:56:47 2017 -0400

    Bug 18742: Circulation statistics wizard no longer exports the total row
    
    To test:
    - Run the circulation wizard
    - Export to csv
    - Note there is no total row
    - Apply patch
    - Export to csv
    - Total row totally there!
    
    Signed-off-by: Christopher Brannon <cbrannon at cdalibrary.org>
    Signed-off-by: Julian Maurice <julian.maurice at biblibre.com>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 0d03f143e25f498de780d2ddd1972c3be7947519
Author: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
Date:   Mon Sep 18 14:23:54 2017 -0300

    Bug 19335: Fix 00-merge-conflict-markers.t when dockerised
    
    This does not make sense, but fix a bug (why?)
    Without this patch, the tests failed on po files:
    
    [17:14:26] t/00-merge-conflict-markers.t .. Failed 1/1 subtests
    Test Summary Report
    -------------------
    t/00-merge-conflict-markers.t (Wstat: 9 Tests: 0 Failed: 0)
      Non-zero wait status: 9
      Parse errors: Bad plan.  You planned 1 tests but ran 0.
    Result: FAIL
    
    Note that this is not related to bug 19227.
    
    if the ^>>>>>> and ^<<<<<< matches are done on the same line, the test fail
    As saw it failed on *-pref.po files
      misc/translator/po/kn-Knda-pref.po
      misc/translator/po/ja-Jpan-JP-pref.po
      misc/translator/po/nl-BE-pref.po
      misc/translator/po/sr-Cyrl-pref.po
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

commit 5bb19808bb23a01a257a0970bd7e2ae43fb5b3d6
Author: Tomas Cohen Arazi <tomascohen at theke.io>
Date:   Mon Sep 18 15:58:15 2017 -0300

    Bug 19337: Make basic_workflow.t configurable through ENV
    
    This patch makes the basic_workflow.t selenium tests read ENV for the
    following vars:
    
    KOHA_USER
    KOHA_PASS
    KOHA_INTRANET_URL
    SELENIUM_ADDR
    SELENIUM_PORT
    
    to properly configure the running environment. If absent, all variables
    fallback to current behaviour:
    
    KOHA_USER // 'koha'
    KOHA_PASS // 'koha'
    KOHA_INTRANET_URL (unchanged)
    SELENIUM_ADDR // 'localhost'
    SELENIUM_PORT // 4444
    
    [*] Selenium defaults are documented on the Selenium::Remote::Driver docs.
    
    Prerequisites:
    Make sure you have a working environment for the Selenium tests:
    - Run:
      $ sudo apt update
      $ sudo apt install xvfb firefox-esr
    
    To test:
    - Run:
      $ sudo koha-shell kohadev
     k$ cd kohaclone
     k$ wget https://selenium-release.storage.googleapis.com/2.53/selenium-server-standalone-2.53.1.jar \
         -O /tmp/selenium.jar
     k$ SELENIUM_PATH=/tmp/selenium.jar
     k$ Xvfb :1 -screen 0 1024x768x24 2>&1 >/dev/null &
     k$ DISPLAY=:1 java -jar $SELENIUM_PATH &
     k$ prove t/db_dependent/selenium/basic_workflow.t
    => SUCCESS: Tests pass
    - Apply this patch
    - Run:
     k$ prove t/db_dependent/selenium/basic_workflow.t
    => SUCCESS: Tests pass!
    - Sign off :-D
    
    Signed-off-by: Tomas Cohen Arazi <tomascohen at theke.io>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>
    
    Signed-off-by: Jonathan Druart <jonathan.druart at bugs.koha-community.org>

-----------------------------------------------------------------------

Summary of changes:
 C4/AuthoritiesMarc.pm                              |   55 +-
 C4/Biblio.pm                                       |    7 +-
 C4/Patroncards/Patroncard.pm                       |  139 +-
 Koha.pm                                            |    2 +-
 Koha/Library.pm                                    |   39 +-
 Koha/Schema/Result/Branch.pm                       |   12 +-
 acqui/basket.pl                                    |    7 +-
 acqui/basketgroup.pl                               |    2 +-
 acqui/basketheader.pl                              |   38 +-
 admin/branches.pl                                  |    1 +
 authorities/detail.pl                              |    2 +-
 cataloguing/addbiblio.pl                           |   10 +-
 cataloguing/value_builder/marc21_orgcode.pl        |    5 +-
 installer/data/mysql/kohastructure.sql             |    1 +
 installer/data/mysql/updatedatabase.pl             |   10 +
 .../lib/font-awesome/css/font-awesome.css          |  329 +-
 .../lib/font-awesome/css/font-awesome.min.css      |    4 +-
 .../lib/font-awesome/fonts/FontAwesome.otf         |  Bin 106260 -> 134808 bytes
 .../lib/font-awesome/fonts/fontawesome-webfont.eot |  Bin 68875 -> 165742 bytes
 .../lib/font-awesome/fonts/fontawesome-webfont.svg | 3305 ++++++++++++++++----
 .../lib/font-awesome/fonts/fontawesome-webfont.ttf |  Bin 138204 -> 165548 bytes
 .../font-awesome/fonts/fontawesome-webfont.woff    |  Bin 81284 -> 98024 bytes
 .../font-awesome/fonts/fontawesome-webfont.woff2   |  Bin 64464 -> 77160 bytes
 .../lib/font-awesome/less/font-awesome.less        |    3 +-
 .../intranet-tmpl/lib/font-awesome/less/icons.less |  114 +-
 .../lib/font-awesome/less/mixins.less              |   38 +-
 .../intranet-tmpl/lib/font-awesome/less/path.less  |    2 +-
 .../lib/font-awesome/less/screen-reader.less       |    5 +
 .../lib/font-awesome/less/variables.less           |  118 +-
 .../lib/font-awesome/scss/_icons.scss              |  114 +-
 .../lib/font-awesome/scss/_mixins.scss             |   38 +-
 .../lib/font-awesome/scss/_screen-reader.scss      |    5 +
 .../lib/font-awesome/scss/_variables.scss          |  118 +-
 .../lib/font-awesome/scss/font-awesome.scss        |    3 +-
 .../en/includes/member-main-address-style-de.inc   |    2 +-
 .../en/includes/member-main-address-style-fr.inc   |    2 +-
 .../en/includes/member-main-address-style-us.inc   |    2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |   22 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   10 +-
 .../prog/en/modules/admin/branches.tt              |    1 +
 .../en/modules/admin/preferences/cataloguing.pref  |    2 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |   13 +
 .../prog/en/modules/patroncards/edit-layout.tt     |   10 +
 .../prog/img/staff-home-icons-sprite.png           |  Bin 5262 -> 8960 bytes
 .../staff-home-icons-sprite.psd                    |  Bin 126748 -> 0 bytes
 .../staff-home-icons-sprite.svg                    |    1 +
 opac/opac-authoritiesdetail.pl                     |    4 +-
 patroncards/create-pdf.pl                          |    1 +
 patroncards/edit-layout.pl                         |    2 +
 reports/issues_stats.pl                            |    6 +
 t/00-merge-conflict-markers.t                      |   13 +-
 t/db_dependent/Koha/Authorities.t                  |    2 +-
 t/db_dependent/Koha/Libraries.t                    |   33 +-
 t/db_dependent/selenium/basic_workflow.t           |   21 +-
 tools/batch_delete_records.pl                      |    3 +-
 55 files changed, 3895 insertions(+), 781 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/font-awesome/less/screen-reader.less
 create mode 100644 koha-tmpl/intranet-tmpl/lib/font-awesome/scss/_screen-reader.scss
 delete mode 100644 misc/interface_customization/staff-home-icons-sprite.psd
 create mode 100644 misc/interface_customization/staff-home-icons-sprite.svg


hooks/post-receive
-- 
main Koha release repository


More information about the koha-commits mailing list