Ignore:
Timestamp:
11/09/15 11:16:25 (9 years ago)
Author:
davor.ostojic@oeaw.ac.at
Message:

merged with trunk

Location:
vlo/branches/vlo-3.3-oeaw/vlo-solr
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • vlo/branches/vlo-3.3-oeaw/vlo-solr

    • Property svn:mergeinfo set to (toggle deleted branches)
      /vlo/trunk/vlo-solrmergedeligible
      /vlo/branches/to-wicket-1.6-twagoo/vlo-solr4212-4219
      /vlo/branches/vlo-2.13-param/vlo-solr2570-2767
      /vlo/branches/vlo-3.0/vlo-solr5201
      /vlo/branches/vlo-3.2-ticket575/vlo-solr6112-6188
      /vlo/branches/vlo-ticket761/vlo-solr6189-6283
  • vlo/branches/vlo-3.3-oeaw/vlo-solr/src/main/webapp/admin.html

    r4734 r6753  
    2323  <title>Solr Admin</title>
    2424   
    25   <link rel="icon" type="image/ico" href="img/favicon.ico?_=4.6.0">
     25  <link rel="icon" type="image/ico" href="img/favicon.ico?_=${version}">
    2626
    27   <link rel="stylesheet" type="text/css" href="css/styles/common.css?_=4.6.0">
    28   <link rel="stylesheet" type="text/css" href="css/styles/analysis.css?_=4.6.0">
    29   <link rel="stylesheet" type="text/css" href="css/styles/cloud.css?_=4.6.0">
    30   <link rel="stylesheet" type="text/css" href="css/styles/cores.css?_=4.6.0">
    31   <link rel="stylesheet" type="text/css" href="css/styles/dashboard.css?_=4.6.0">
    32   <link rel="stylesheet" type="text/css" href="css/styles/dataimport.css?_=4.6.0">
    33   <link rel="stylesheet" type="text/css" href="css/styles/index.css?_=4.6.0">
    34   <link rel="stylesheet" type="text/css" href="css/styles/java-properties.css?_=4.6.0">
    35   <link rel="stylesheet" type="text/css" href="css/styles/logging.css?_=4.6.0">
    36   <link rel="stylesheet" type="text/css" href="css/styles/menu.css?_=4.6.0">
    37   <link rel="stylesheet" type="text/css" href="css/styles/plugins.css?_=4.6.0">
    38   <link rel="stylesheet" type="text/css" href="css/styles/documents.css?_=4.6.0">
    39   <link rel="stylesheet" type="text/css" href="css/styles/query.css?_=4.6.0">
    40   <link rel="stylesheet" type="text/css" href="css/styles/replication.css?_=4.6.0">
    41   <link rel="stylesheet" type="text/css" href="css/styles/schema-browser.css?_=4.6.0">
    42   <link rel="stylesheet" type="text/css" href="css/styles/threads.css?_=4.6.0">
    43   <link rel="stylesheet" type="text/css" href="css/chosen.css?_=4.6.0">
     27  <link rel="stylesheet" type="text/css" href="css/styles/common.css?_=${version}">
     28  <link rel="stylesheet" type="text/css" href="css/styles/analysis.css?_=${version}">
     29  <link rel="stylesheet" type="text/css" href="css/styles/cloud.css?_=${version}">
     30  <link rel="stylesheet" type="text/css" href="css/styles/cores.css?_=${version}">
     31  <link rel="stylesheet" type="text/css" href="css/styles/dashboard.css?_=${version}">
     32  <link rel="stylesheet" type="text/css" href="css/styles/dataimport.css?_=${version}">
     33  <link rel="stylesheet" type="text/css" href="css/styles/files.css?_=${version}">
     34  <link rel="stylesheet" type="text/css" href="css/styles/index.css?_=${version}">
     35  <link rel="stylesheet" type="text/css" href="css/styles/java-properties.css?_=${version}">
     36  <link rel="stylesheet" type="text/css" href="css/styles/logging.css?_=${version}">
     37  <link rel="stylesheet" type="text/css" href="css/styles/menu.css?_=${version}">
     38  <link rel="stylesheet" type="text/css" href="css/styles/plugins.css?_=${version}">
     39  <link rel="stylesheet" type="text/css" href="css/styles/documents.css?_=${version}">
     40  <link rel="stylesheet" type="text/css" href="css/styles/query.css?_=${version}">
     41  <link rel="stylesheet" type="text/css" href="css/styles/replication.css?_=${version}">
     42  <link rel="stylesheet" type="text/css" href="css/styles/schema-browser.css?_=${version}">
     43  <link rel="stylesheet" type="text/css" href="css/styles/threads.css?_=${version}">
     44  <link rel="stylesheet" type="text/css" href="css/chosen.css?_=${version}">
    4445
    4546  <meta http-equiv="x-ua-compatible" content="IE=9">
     
    151152  <div id="connection_status">
    152153
    153     <span>Connection lost 
</span>
     154    <span>Connection lost &hellip;</span>
    154155
    155156  </div>
    156157 
    157   <script type="text/javascript"> var require = { urlArgs: '_=4.6.0' }; </script>
    158   <script src="js/require.js?_=4.6.0" data-main="js/main"></script>
     158  <script type="text/javascript"> var require = { urlArgs: '_=${version}' }; </script>
     159  <script src="js/require.js?_=${version}" data-main="js/main"></script>
    159160
    160161</body>
Note: See TracChangeset for help on using the changeset viewer.