Show
Ignore:
Timestamp:
04/22/08 22:06:38 (2 months ago)
Author:
erickson
Message:

Merged revisions 9425,9428,9430-9435 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9425 | erickson | 2008-04-22 10:36:27 -0400 (Tue, 22 Apr 2008) | 1 line


default estimated hit count to 0 to protect against null counts in the case of a search timeout/failure

........

r9428 | erickson | 2008-04-22 14:01:05 -0400 (Tue, 22 Apr 2008) | 1 line


added support for defining pivot data and label columns

........

r9430 | erickson | 2008-04-22 14:32:12 -0400 (Tue, 22 Apr 2008) | 1 line


added support for taking pivot info from the report def

........

r9431 | miker | 2008-04-22 21:41:36 -0400 (Tue, 22 Apr 2008) | 1 line


move the translation widget out to openils.widget

........

r9432 | miker | 2008-04-22 21:42:25 -0400 (Tue, 22 Apr 2008) | 1 line


move the translation widget out to openils.widget

........

r9433 | miker | 2008-04-22 21:42:49 -0400 (Tue, 22 Apr 2008) | 1 line


OO-ify openils.User

........

r9434 | miker | 2008-04-22 21:45:21 -0400 (Tue, 22 Apr 2008) | 1 line


typo in name

........

r9435 | miker | 2008-04-22 22:03:48 -0400 (Tue, 22 Apr 2008) | 1 line


back-compat global population

........

Location:
branches/acq-experiment
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • branches/acq-experiment

    • Property svnmerge-integrated changed from /trunk:1-9414 to /trunk:1-9435
  • branches/acq-experiment/Open-ILS/web/conify/global/actor/org_unit_type.html

    r9378 r9436  
    191191                                                                                </script> 
    192192                                                                        </span> 
    193                                                                         <span dojoType="openils.I18N.translationWidget" targetObject="current_fm_type" field="name"></span> 
     193                                                                        <span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="name"></span> 
    194194                                                                </td> 
    195195                                                        </tr> 
     
    204204                                                                                </script> 
    205205                                                                        </span> 
    206                                                                         <span dojoType="openils.I18N.translationWidget" targetObject="current_fm_type" field="opac_label"></span> 
     206                                                                        <span dojoType="openils.widget.TranslatorPopup" targetObject="current_fm_type" field="opac_label"></span> 
    207207                                                                </td> 
    208208                                                        </tr>