Changeset 7926


Ignore:
Timestamp:
Feb 24, 2021, 11:31:05 AM (9 months ago)
Author:
Nicklas Nordborg
Message:

Merge 3.18 to the trunk.

Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/build.xml

    r7918 r7926  
    6969  <property name="base.minorversion" value="19" />
    7070  <property name="base.maintenanceversion" value="0" />
    71   <property name="base.versionsuffix" value="-dev" />
     71  <property name="base.versionsuffix" value="" />
    7272  <property name="base.version"
    7373    value="${base.majorversion}.${base.minorversion}.${base.maintenanceversion}" />
  • trunk/credits.txt

    r7874 r7926  
    11$Id$
    22
    3 The current BASE team is (at BASE 3.17 release)
     3The current BASE team is (at BASE 3.18 release)
    44{{{
    55Jari Häkkinen
  • trunk/src/core/net/sf/basedb/core/Application.java

    r7900 r7926  
    428428  /**
    429429    Starts the BASE application.
    430     @param installation TRUE if we are starting the application for
    431       installation, FALSE for a normal start
     430    @param options Options for how BASE should be started
    432431    @throws BaseException If BASE cannot be started
    433432    @see #start()
  • trunk/src/core/net/sf/basedb/core/PropertyFilter.java

    r7895 r7926  
    553553      is ignored by the BASE core code. The rest of the property should be a unique
    554554      identifier for the extension that is handling the filter.
     555    </ul>
    555556    <p>
    556557    The property may also start with $@.
  • trunk/src/core/net/sf/basedb/core/Update.java

    r7899 r7926  
    454454    <td>
    455455      Added {@link ItemListSyncFilterData#getFilterGroup()}, {@link ItemListSyncFilterData#getLastSyncProperties()},
    456       {@link ItemListData#getSizeAtLastSync()}, {@link ItemListData#getMd5AtLastSync().
     456      {@link ItemListData#getSizeAtLastSync()}, {@link ItemListData#getMd5AtLastSync()}.
    457457      The update will set the filterGroup value to 'A+' for all existing filters and generate a lastSyncProperties value from
    458458      current settings. The update will also set sizeAtLastSync to -1 for existing item lists.
  • trunk/www/common/annotations/annotate.js

    r7832 r7926  
    244244      }
    245245     
     246      entry.visible = show;
    246247      Doc.showHide(entry.id, show);
    247248    }
     
    751752    {
    752753      var entry = annotations[i];
    753       if (entry.source == 'PRIMARY')
     754      if (entry.visible && entry.source == 'PRIMARY')
    754755      {
    755756        var checkbox = Doc.element('check.'+entry.id);
     
    774775    {
    775776      var entry = annotations[i];
    776       if (entry.source != 'PRIMARY')
     777      if (entry.visible && entry.source != 'PRIMARY')
    777778      {
    778779        var checkbox = Doc.element('check.'+entry.id);
Note: See TracChangeset for help on using the changeset viewer.