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  c2fcde413503027cfb8efa070e5a5c9c3172a628 (commit)
       via  166317bbbb40ab22e9ffa36a3456506846392982 (commit)
       via  debcf3f2d12d65ea7b29eaa0037b85f1245827df (commit)
       via  d80d87bc73980d3b41fb5a1c9e26ef6147afd115 (commit)
       via  a4f58501243157897fa534bfcde44a0dfcc14b57 (commit)
       via  2686d70bc0e4aa1857a6f5b2db2939c93018b001 (commit)
       via  804677265e1bb6c5118bc76d5f45b51ae0f579b4 (commit)
       via  922c8df511f54c8f968d351089abf15e2bbcc4ab (commit)
      from  c5a758d9a06dba412a8564c8574c68eebf0b6ff8 (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 c2fcde413503027cfb8efa070e5a5c9c3172a628
Author: Josef Moravec <josef.mora...@gmail.com>
Date:   Tue Jan 10 10:45:36 2017 +0000

    Bug 16239: Followup - remove unusable js from cateditor-ui.inc
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@biblibre.com>
    
    Signed-off-by: Kyle M Hall <k...@bywatersolutions.com>

commit 166317bbbb40ab22e9ffa36a3456506846392982
Author: Jonathan Druart <jonathan.dru...@bugs.koha-community.org>
Date:   Tue Jan 10 09:28:56 2017 +0100

    Bug 16239: Update Bootstrap's license on the about page
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@biblibre.com>
    
    Signed-off-by: Kyle M Hall <k...@bywatersolutions.com>

commit debcf3f2d12d65ea7b29eaa0037b85f1245827df
Author: Owen Leonard <oleon...@myacpl.org>
Date:   Tue Dec 20 18:17:50 2016 +0000

    Bug 16239 [CSS Follow-up] Upgrade Bootstrap in the staff client
    
    This followup tweaks some CSS and markup in order to correct conflicts
    between default Bootstrap styles and the expected (previous) style of
    the staff client. Included:
    
    - Corrections to the widths of some modals.
    - Corrections to the style of the <pre> tag, seen often in MARC preview
      modals.
    - Corrections to the default active and hover states for dropdown menus.
    
    To test, apply the patch and view various pages which use Bootstrap
    modals, confirming that they look correct.
    
    - Add order from staged file MARC preview
    - Add order from external source MARC preview
    - Cataloging record merge MARC preview
    - Batch record modification MARC preview
    - Authorities Z39.50 search MARC preview
    
    Signed-off-by: Claire Gravely <claire_grav...@hotmail.com>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@biblibre.com>
    
    Signed-off-by: Kyle M Hall <k...@bywatersolutions.com>

commit d80d87bc73980d3b41fb5a1c9e26ef6147afd115
Author: Josef Moravec <josef.mora...@gmail.com>
Date:   Fri Nov 25 09:25:35 2016 +0000

    Bug 16239: Use inline-block for split buttons only in tables
    
    Signed-off-by: Owen Leonard <oleon...@myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@biblibre.com>
    
    Signed-off-by: Kyle M Hall <k...@bywatersolutions.com>

commit a4f58501243157897fa534bfcde44a0dfcc14b57
Author: Josef Moravec <josef.mora...@gmail.com>
Date:   Thu Nov 10 09:59:00 2016 +0000

    Bug 16239: Update javascript files
    
    Signed-off-by: Owen Leonard <oleon...@myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@biblibre.com>
    
    Signed-off-by: Kyle M Hall <k...@bywatersolutions.com>

commit 2686d70bc0e4aa1857a6f5b2db2939c93018b001
Author: Josef Moravec <josef.mora...@gmail.com>
Date:   Thu Nov 10 09:58:37 2016 +0000

    Bug 16239: Update css files
    
    Signed-off-by: Owen Leonard <oleon...@myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@biblibre.com>
    
    Signed-off-by: Kyle M Hall <k...@bywatersolutions.com>

commit 804677265e1bb6c5118bc76d5f45b51ae0f579b4
Author: Josef Moravec <josef.mora...@gmail.com>
Date:   Thu Nov 10 09:57:47 2016 +0000

    Bug 16239: Update templates
    
    Signed-off-by: Owen Leonard <oleon...@myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@biblibre.com>
    
    Signed-off-by: Kyle M Hall <k...@bywatersolutions.com>

commit 922c8df511f54c8f968d351089abf15e2bbcc4ab
Author: Josef Moravec <josef.mora...@gmail.com>
Date:   Thu Nov 10 07:46:07 2016 +0000

    Bug 16239: Update Bootstrap to 3.3.7
    
    Customization tool used.
    
    Javascript modules:
        alert
        button
        dropdown
        modal
        tooltip
        popover
        transition
    
    CSS modules:
        type
        code
        grid
        tables
        forms
        buttons
        responsive-utilities
        button-groups
        input-groups
        navs
        navbar
        breadcrumbs
        pagination
        pager
        labels
        badges
        thumbnails
        alerts
        progress-bars
        media
        list-group
        panels
        responsive-embed
        close
        component-animations
        dropdowns
        tooltip
        popovers
        modals
    
    Test plan:
    1) Apply the patch
    2) Try to go through interface to find problems, inconsistencies, etc.
    3) Read the diff
    
    Migration guide for bootstrap: http://getbootstrap.com/migration/
    
    Signed-off-by: Owen Leonard <oleon...@myacpl.org>
    
    Signed-off-by: Jonathan Druart <jonathan.dru...@biblibre.com>
    
    Signed-off-by: Kyle M Hall <k...@bywatersolutions.com>

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

Summary of changes:
 .../lib/bootstrap/bootstrap-theme.min.css          |   14 +
 .../intranet-tmpl/lib/bootstrap/bootstrap.min.css  |  626 +-------------------
 .../intranet-tmpl/lib/bootstrap/bootstrap.min.js   |   18 +-
 koha-tmpl/intranet-tmpl/prog/css/cateditor.css     |   11 +-
 koha-tmpl/intranet-tmpl/prog/css/datatables.css    |   24 +-
 koha-tmpl/intranet-tmpl/prog/css/humanmsg.css      |    5 +
 koha-tmpl/intranet-tmpl/prog/css/mainpage.css      |    1 +
 koha-tmpl/intranet-tmpl/prog/css/staff-global.css  |  264 +++++++--
 .../prog/en/includes/acquisitions-toolbar.inc      |   10 +-
 .../prog/en/includes/auth-finder-search.inc        |    4 +-
 .../prog/en/includes/authorities-toolbar.inc       |   12 +-
 .../prog/en/includes/blocked-fines.inc             |    4 +-
 .../prog/en/includes/borrower_debarments.inc       |    2 +-
 .../prog/en/includes/budgets-admin-toolbar.inc     |    8 +-
 .../intranet-tmpl/prog/en/includes/cat-toolbar.inc |   28 +-
 .../prog/en/includes/cateditor-ui.inc              |   20 +-
 .../prog/en/includes/checkouts-table.inc           |    8 +-
 .../prog/en/includes/doc-head-close.inc            |    1 +
 .../intranet-tmpl/prog/en/includes/header.inc      |    8 +-
 .../prog/en/includes/intranet-bottom.inc           |    8 +-
 .../prog/en/includes/labels-toolbar.inc            |    4 +-
 .../prog/en/includes/members-toolbar.inc           |   92 +--
 .../prog/en/includes/patron-toolbar.inc            |    6 +-
 .../prog/en/includes/patroncards-toolbar.inc       |    4 +-
 .../prog/en/includes/quotes-toolbar.inc            |    6 +-
 .../prog/en/includes/quotes-upload-toolbar.inc     |    6 +-
 .../prog/en/includes/reports-toolbar.inc           |   14 +-
 .../en/includes/rotating-collections-toolbar.inc   |    8 +-
 .../prog/en/includes/serials-toolbar.inc           |   18 +-
 .../prog/en/includes/virtualshelves-toolbar.inc    |   10 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt   |    2 +-
 .../prog/en/modules/acqui/addorderiso2709.tt       |   10 +-
 .../intranet-tmpl/prog/en/modules/acqui/basket.tt  |   38 +-
 .../prog/en/modules/acqui/basketgroup.tt           |   10 +-
 .../prog/en/modules/acqui/booksellers.tt           |   14 +-
 .../prog/en/modules/acqui/edifactmsgs.tt           |   14 +-
 .../prog/en/modules/acqui/invoices.tt              |    2 +-
 .../prog/en/modules/acqui/neworderbiblio.tt        |    8 +-
 .../prog/en/modules/acqui/neworderempty.tt         |   12 +-
 .../prog/en/modules/acqui/newordersuggestion.tt    |    4 +-
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   10 +-
 .../prog/en/modules/acqui/supplier.tt              |    8 +-
 .../en/modules/acqui/tables/members_results.tt     |    4 +-
 .../prog/en/modules/acqui/transferorder.tt         |    8 +-
 .../prog/en/modules/acqui/z3950_search.tt          |   10 +-
 .../prog/en/modules/admin/aqbudgetperiods.tt       |    2 +-
 .../prog/en/modules/admin/aqbudgets.tt             |    2 +-
 .../prog/en/modules/admin/aqcontract.tt            |    4 +-
 .../prog/en/modules/admin/audio_alerts.tt          |    8 +-
 .../en/modules/admin/auth_subfields_structure.tt   |    2 +-
 .../prog/en/modules/admin/auth_tag_structure.tt    |    4 +-
 .../prog/en/modules/admin/authorised_values.tt     |    8 +-
 .../prog/en/modules/admin/authtypes.tt             |    4 +-
 .../prog/en/modules/admin/biblio_framework.tt      |   38 +-
 .../prog/en/modules/admin/branches.tt              |   12 +-
 .../prog/en/modules/admin/categories.tt            |    6 +-
 .../intranet-tmpl/prog/en/modules/admin/cities.tt  |    6 +-
 .../prog/en/modules/admin/classsources.tt          |   12 +-
 .../prog/en/modules/admin/currency.tt              |    6 +-
 .../prog/en/modules/admin/edi_accounts.tt          |    4 +-
 .../prog/en/modules/admin/edi_ean_accounts.tt      |    6 +-
 .../prog/en/modules/admin/fieldmapping.tt          |    2 +-
 .../prog/en/modules/admin/items_search_fields.tt   |    6 +-
 .../prog/en/modules/admin/itemtypes.tt             |    6 +-
 .../prog/en/modules/admin/koha2marclinks.tt        |    2 +-
 .../en/modules/admin/marc_subfields_structure.tt   |    4 +-
 .../prog/en/modules/admin/marctagstructure.tt      |    6 +-
 .../prog/en/modules/admin/matching-rules.tt        |    6 +-
 .../prog/en/modules/admin/oai_set_mappings.tt      |    4 +-
 .../prog/en/modules/admin/oai_sets.tt              |    4 +-
 .../prog/en/modules/admin/patron-attr-types.tt     |    6 +-
 .../prog/en/modules/admin/printers.tt              |    2 +-
 .../admin/searchengine/elasticsearch/mappings.tt   |    6 +-
 .../prog/en/modules/admin/smart-rules.tt           |   22 +-
 .../prog/en/modules/admin/sms_providers.tt         |    6 +-
 .../prog/en/modules/admin/systempreferences.tt     |    6 +-
 .../prog/en/modules/admin/z3950servers.tt          |    6 +-
 .../prog/en/modules/authorities/authorities.tt     |    4 +-
 .../en/modules/authorities/searchresultlist.tt     |    2 +-
 .../intranet-tmpl/prog/en/modules/basket/basket.tt |   14 +-
 .../prog/en/modules/catalogue/advsearch.tt         |   12 +-
 .../prog/en/modules/catalogue/detail.tt            |   12 +-
 .../prog/en/modules/catalogue/itemsearch.tt        |    2 +-
 .../prog/en/modules/catalogue/results.tt           |   12 +-
 .../prog/en/modules/cataloguing/addbiblio.tt       |   22 +-
 .../prog/en/modules/cataloguing/addbooks.tt        |   22 +-
 .../prog/en/modules/cataloguing/additem.tt         |    2 +-
 .../prog/en/modules/cataloguing/editor.tt          |   83 +--
 .../prog/en/modules/cataloguing/merge.tt           |   10 +-
 .../en/modules/cataloguing/z3950_auth_search.tt    |   12 +-
 .../prog/en/modules/cataloguing/z3950_search.tt    |    9 +-
 .../prog/en/modules/circ/article-requests.tt       |    6 +-
 .../prog/en/modules/circ/circulation.tt            |   14 +-
 .../prog/en/modules/circ/offline-mf.tt             |    1 +
 .../intranet-tmpl/prog/en/modules/circ/offline.tt  |    4 +-
 .../prog/en/modules/circ/request-article.tt        |    2 +-
 .../intranet-tmpl/prog/en/modules/circ/returns.tt  |   22 +-
 .../prog/en/modules/circ/transferstoreceive.tt     |    2 +-
 .../prog/en/modules/common/patron_search.tt        |    2 +-
 .../en/modules/course_reserves/course-details.tt   |   14 +-
 .../en/modules/course_reserves/course-reserves.tt  |    2 +-
 .../intranet-tmpl/prog/en/modules/intranet-main.tt |    2 +-
 .../prog/en/modules/labels/label-edit-batch.tt     |   16 +-
 .../prog/en/modules/labels/label-manage.tt         |    6 +-
 .../intranet-tmpl/prog/en/modules/labels/result.tt |    8 +-
 .../prog/en/modules/members/boraccount.tt          |    6 +-
 .../prog/en/modules/members/housebound.tt          |   16 +-
 .../prog/en/modules/members/memberentrygen.tt      |   26 +-
 .../prog/en/modules/members/moremember.tt          |    4 +
 .../prog/en/modules/members/notices.tt             |    2 +-
 .../en/modules/members/purchase-suggestions.tt     |    2 +-
 .../en/modules/members/tables/guarantor_search.tt  |    2 +-
 .../en/modules/members/tables/members_results.tt   |    2 +-
 .../prog/en/modules/patron_lists/list.tt           |    4 +-
 .../prog/en/modules/patron_lists/lists.tt          |   10 +-
 .../prog/en/modules/patroncards/edit-batch.tt      |   16 +-
 .../prog/en/modules/patroncards/edit-layout.tt     |    2 +-
 .../prog/en/modules/patroncards/image-manage.tt    |    6 +-
 .../prog/en/modules/patroncards/manage.tt          |    6 +-
 .../modules/patroncards/tables/members_results.tt  |    2 +-
 .../prog/en/modules/plugins/plugins-home.tt        |    4 +-
 .../prog/en/modules/reports/dictionary.tt          |    4 +-
 .../en/modules/reports/guided_reports_start.tt     |    8 +-
 .../prog/en/modules/reviews/reviewswaiting.tt      |    4 +-
 .../rotating_collections/rotatingCollections.tt    |    2 +-
 .../prog/en/modules/serials/acqui-search-result.tt |    4 +-
 .../prog/en/modules/serials/add_fields.tt          |    6 +-
 .../prog/en/modules/serials/checkexpiration.tt     |    4 +-
 .../prog/en/modules/serials/result.tt              |    4 +-
 .../en/modules/serials/routing-preview-slip.tt     |    2 +-
 .../prog/en/modules/serials/routing.tt             |    2 +-
 .../prog/en/modules/serials/serials-collection.tt  |   10 +-
 .../prog/en/modules/serials/serials-search.tt      |   12 +-
 .../en/modules/serials/subscription-frequencies.tt |    6 +-
 .../modules/serials/subscription-numberpatterns.tt |    6 +-
 .../en/modules/serials/tables/members_results.tt   |    2 +-
 .../prog/en/modules/suggestion/suggestion.tt       |    6 +-
 .../intranet-tmpl/prog/en/modules/tags/list.tt     |    2 +-
 .../intranet-tmpl/prog/en/modules/tags/review.tt   |   20 +-
 .../tools/automatic_item_modification_by_age.tt    |   10 +-
 .../prog/en/modules/tools/batchMod-del.tt          |    6 +-
 .../prog/en/modules/tools/batchMod-edit.tt         |    6 +-
 .../en/modules/tools/batch_record_modification.tt  |   26 +-
 .../prog/en/modules/tools/csv-profiles.tt          |    2 +-
 .../prog/en/modules/tools/holidays.tt              |    2 +-
 .../prog/en/modules/tools/koha-news.tt             |    6 +-
 .../intranet-tmpl/prog/en/modules/tools/letter.tt  |   10 +-
 .../prog/en/modules/tools/manage-marc-import.tt    |   12 +-
 .../modules/tools/marc_modification_templates.tt   |   22 +-
 .../prog/en/modules/tools/stage-marc-import.tt     |    4 +-
 .../intranet-tmpl/prog/en/modules/tools/upload.tt  |   10 +-
 .../prog/en/modules/virtualshelves/shelves.tt      |    8 +-
 .../virtualshelves/tables/shelves_results.tt       |    4 +-
 koha-tmpl/intranet-tmpl/prog/js/holds.js           |   10 +-
 154 files changed, 1012 insertions(+), 1275 deletions(-)
 create mode 100644 
koha-tmpl/intranet-tmpl/lib/bootstrap/bootstrap-theme.min.css


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

Reply via email to