Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_8401' into 3.12-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-01-17 20:55:47 -05:00
commit 02c7bec65c
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/history.txt
View file

@ -651,3 +651,4 @@ December 22 2012 Koha 3.8.8 released releases
December 27 2012 Koha 3.6.11 released releases December 27 2012 Koha 3.6.11 released releases
January 17 2013 Hugh Davenport becomes the 199th developer to have a patch pushed January 17 2013 Hugh Davenport becomes the 199th developer to have a patch pushed
January 17 2013 Corey Fuimaono becomes the 200th developer to have a patch pushed January 17 2013 Corey Fuimaono becomes the 200th developer to have a patch pushed
January 17 2013 Fred Pierre becomes the 201st developer to have a patch pushed

2
koha-tmpl/intranet-tmpl/prog/en/js/pages/preferences.js
View file

@ -108,7 +108,7 @@ $( document ).ready( function () {
var words = to_highlight.split( ' ' ); var words = to_highlight.split( ' ' );
$( '.prefs-tab table' ).find( 'td, th' ).not( '.name-cell' ).each( function ( i, td ) { $( '.prefs-tab table' ).find( 'td, th' ).not( '.name-cell' ).each( function ( i, td ) {
$.each( words, function ( i, word ) { $( td ).highlight( word ) } ); $.each( words, function ( i, word ) { $( td ).highlight( word ) } );
} ).find( 'option' ).removeHighlight(); } ).find( 'option, textarea' ).removeHighlight();
} }
if ( search_jumped ) { if ( search_jumped ) {

3
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
View file

@ -302,8 +302,9 @@
<li>H. Passini</li> <li>H. Passini</li>
<li>Dobrica Pavlinusic</li> <li>Dobrica Pavlinusic</li>
<li>Maxime Pelletier</li> <li>Maxime Pelletier</li>
<li>Polytechnic University</li>
<li>Shari Perkins</li> <li>Shari Perkins</li>
<li>Fred Pierre</li>
<li>Polytechnic University</li>
<li>Romina Racca</li> <li>Romina Racca</li>
<li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li> <li><a href="https://www.ohloh.net/p/koha/contributors/6620692116417">MJ Ray</a></li>
<li>Liz Rea</li> <li>Liz Rea</li>