[koha-commits] main Koha release repository branch master updated. v3.08.00-915-gbd1f621

[Git repo owner]

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  bd1f62137de9a1b7f511bda881f4ffcc9e9d597f (commit)
       via  b2bb0c78e5c51997262712f9f4cb83ac1f9ba39d (commit)
       via  af96a8ead38462b1c75f5825f451d2c66d7bbe7e (commit)
       via  9b656b57cb6980227099cdd9b20b01ca653bd735 (commit)
       via  83370c519c4291e81a76c02d5142a818f940fa50 (commit)
       via  d0c6c2d068d31d30376813d62d791df2851da000 (commit)
      from  30dbc1c0a1c8b1b432181fe3d9ea9df8da6ea61a (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 bd1f62137de9a1b7f511bda881f4ffcc9e9d597f
Merge: 30dbc1c b2bb0c7
Author: Paul Poulain <paul.poulain at biblibre.com>
Date:   Fri Sep 21 16:37:25 2012 +0200

    Merge remote-tracking branch 'origin/new/bug_8523'
    
    Conflicts:
    	kohaversion.pl

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

Summary of changes:
 C4/AuthoritiesMarc.pm                              |  220 +-
 authorities/detail.pl                              |   23 +-
 installer/data/mysql/sysprefs.sql                  |    1 +
 installer/data/mysql/updatedatabase.pl             |    8 +
 .../lib/jquery/plugins/jquery.jstree.js            | 4551 ++++++++++++++++++++
 .../lib/jquery/plugins/themes/classic/d.gif        |  Bin 0 -> 3003 bytes
 .../lib/jquery/plugins/themes/classic/d.png        |  Bin 0 -> 7535 bytes
 .../jquery/plugins/themes/classic/dot_for_ie.gif   |  Bin 0 -> 43 bytes
 .../lib/jquery/plugins/themes/classic/style.css    |   77 +
 .../lib/jquery/plugins/themes/classic/throbber.gif |  Bin 0 -> 1849 bytes
 .../intranet-tmpl/prog/en/css/staff-global.css     |   10 +
 .../intranet-tmpl/prog/en/includes/authorities.inc |   21 +
 .../en/modules/admin/preferences/authorities.pref  |    7 +
 .../prog/en/modules/authorities/detail.tt          |   68 +-
 koha-tmpl/opac-tmpl/ccsr/en/css/opac.css           |   10 +
 .../opac-tmpl/lib/jquery/plugins/jquery.jstree.js  | 4551 ++++++++++++++++++++
 .../lib/jquery/plugins/themes/classic/d.gif        |  Bin 0 -> 3003 bytes
 .../lib/jquery/plugins/themes/classic/d.png        |  Bin 0 -> 7535 bytes
 .../jquery/plugins/themes/classic/dot_for_ie.gif   |  Bin 0 -> 43 bytes
 .../lib/jquery/plugins/themes/classic/style.css    |   77 +
 .../lib/jquery/plugins/themes/classic/throbber.gif |  Bin 0 -> 1849 bytes
 koha-tmpl/opac-tmpl/prog/en/css/opac.css           |    9 +
 .../prog/en/includes/opac-authorities.inc          |   56 +
 .../prog/en/modules/opac-auth-MARCdetail.tt        |   68 +-
 .../opac-tmpl/prog/en/modules/opac-auth-detail.tt  |  101 +-
 kohaversion.pl                                     |    2 +-
 opac/opac-authoritiesdetail.pl                     |   27 +-
 t/AuthoritiesMarc.t                                |   86 +-
 28 files changed, 9672 insertions(+), 301 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/jquery.jstree.js
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/themes/classic/d.gif
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/themes/classic/d.png
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/themes/classic/dot_for_ie.gif
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/themes/classic/style.css
 create mode 100644 koha-tmpl/intranet-tmpl/lib/jquery/plugins/themes/classic/throbber.gif
 create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/authorities.inc
 create mode 100644 koha-tmpl/opac-tmpl/lib/jquery/plugins/jquery.jstree.js
 create mode 100644 koha-tmpl/opac-tmpl/lib/jquery/plugins/themes/classic/d.gif
 create mode 100644 koha-tmpl/opac-tmpl/lib/jquery/plugins/themes/classic/d.png
 create mode 100644 koha-tmpl/opac-tmpl/lib/jquery/plugins/themes/classic/dot_for_ie.gif
 create mode 100644 koha-tmpl/opac-tmpl/lib/jquery/plugins/themes/classic/style.css
 create mode 100644 koha-tmpl/opac-tmpl/lib/jquery/plugins/themes/classic/throbber.gif
 create mode 100644 koha-tmpl/opac-tmpl/prog/en/includes/opac-authorities.inc


hooks/post-receive
-- 
main Koha release repository