Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/16/17 13:03:37 (7 years ago)
Author:
jkarder
Message:

#2743: merged r14722, r14726, r14732, r14738, r14748:14749, r14820, r14828, r15005 and r15075 into stable

Location:
stable
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Services.WebApp/3.3/Web.Debug.config

    r12428 r15261  
    1 <?xml version="1.0"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22
    33<!-- For more information on using Web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=301874 -->
  • stable/HeuristicLab.Services.WebApp/3.3/Web.Release.config

    r12428 r15261  
    1 <?xml version="1.0"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22
    33<!-- For more information on using Web.config transformation visit http://go.microsoft.com/fwlink/?LinkId=301874 -->
  • stable/HeuristicLab.Services.WebApp/3.3/Web.config

    r12563 r15261  
    11<?xml version="1.0" encoding="utf-8"?>
    22<configuration>
    3   <configSections>
    4   </configSections>
    53  <connectionStrings>
    64    <remove name="HeuristicLab.Authentication" />
    75    <remove name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" />
    8     <add name="HeuristicLab.Authentication" connectionString="data source=localhost;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
    9     <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=localhost;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient" />
     6    <add name="HeuristicLab.Authentication" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" />
     7    <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Hive-3.3" />
    108  </connectionStrings>
     9 
    1110  <appSettings>
    1211    <add key="webpages:Version" value="3.0.0.0" />
     
    1514    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
    1615  </appSettings>
     16 
    1717  <system.web>
    1818    <authentication mode="Forms">
    1919      <forms loginUrl="~/App/Empty" timeout="2880" cookieless="UseCookies" name=".HEURISTICLABWEBAPP" />
    2020    </authentication>
    21     <membership>
     21    <compilation debug="false" targetFramework="4.5" />
     22    <httpRuntime targetFramework="4.5" />
     23    <membership defaultProvider="AspNetSqlMembershipProvider">
    2224      <providers>
    2325        <clear />
    24         <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="false" requiresUniqueEmail="false" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="6" minRequiredNonalphanumericCharacters="0" passwordAttemptWindow="10" applicationName="HeuristicLab.Authentication" />
     26        <add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider" connectionStringName="HeuristicLab.Authentication"
     27             requiresQuestionAndAnswer="false" requiresUniqueEmail="false" applicationName="HeuristicLab.Authentication" minRequiredPasswordLength="8"
     28             minRequiredNonalphanumericCharacters="0" maxInvalidPasswordAttempts="5" />
    2529      </providers>
    2630    </membership>
    27     <roleManager enabled="true">
     31    <roleManager enabled="true" defaultProvider="AspNetSqlRoleProvider">
    2832      <providers>
    2933        <clear />
     
    3135      </providers>
    3236    </roleManager>
    33     <compilation debug="false" targetFramework="4.5" />
    34     <httpRuntime targetFramework="4.5" />
    3537  </system.web>
     38
    3639  <system.webServer>
    37     <staticContent>
    38       <mimeMap fileExtension=".woff2" mimeType="application/font-woff" />
    39     </staticContent>
    40  
    4140    <modules>
    4241      <remove name="FormsAuthentication" />
     
    4948      <add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule" />
    5049    </modules>
    51   <handlers>
     50    <handlers>
    5251      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
    5352      <remove name="OPTIONSVerbHandler" />
    5453      <remove name="TRACEVerbHandler" />
    5554      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
    56     </handlers></system.webServer>
     55    </handlers>
     56  </system.webServer>
     57
    5758  <runtime>
    5859    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
  • stable/HeuristicLab.Services.WebApp/3.3/WebApp/Web.config

    r12428 r15261  
    1 <?xml version="1.0"?>
    2 
     1<?xml version="1.0" encoding="utf-8"?>
    32<configuration>
    43  <configSections>
  • stable/HeuristicLab.Services.WebApp/3.3/WebApp/helper.js

    r12962 r15261  
    3131    var month = (1 + date.getMonth()).zeropad(2);
    3232    var year = date.getFullYear();
    33     var hour = (date.getHours() - 2).zeropad(2);
     33    var hour = (date.getHours() + date.getTimezoneOffset() / 60).zeropad(2);
    3434    var minute = date.getMinutes().zeropad(2);
    3535    var second = date.getSeconds().zeropad(2);
  • stable/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/Web.config

    r12428 r15261  
    1 <?xml version="1.0"?>
     1<?xml version="1.0" encoding="utf-8"?>
    22<configuration>
    33  <system.web>
Note: See TracChangeset for help on using the changeset viewer.