- Timestamp:
- 07/03/15 16:35:17 (9 years ago)
- Location:
- branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs
r12558 r12584 59 59 // bootstrap 60 60 "~/WebApp/libs/bootstrap/js/bootstrap.min.js", 61 // cryptojs 62 "~/WebApp/libs/cryptojs/aes.js", 61 63 // angular js 62 64 "~/WebApp/libs/angularjs/angular.min.js", -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj
r12558 r12584 146 146 <Content Include="WebApp\libs\angularjs\angular-tablesort\tablesort.css" /> 147 147 <Content Include="WebApp\libs\angularjs\fittext\ng-FitText.js" /> 148 <Content Include="WebApp\libs\cryptojs\aes.js" /> 148 149 <Content Include="WebApp\main.js" /> 149 150 <Content Include="WebApp\helper.js" /> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Web.config
r12428 r12584 6 6 <remove name="HeuristicLab.Authentication" /> 7 7 <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" />8 <add name="HeuristicLab.Authentication" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;Initial Catalog=HeuristicLab.Authentication" /> 9 <add name="HeuristicLab.Services.Hive.DataAccess.Settings.HeuristicLab_Hive_LinqConnectionString" connectionString="Data Source=.\SQLEXPRESS;Initial Catalog=HeuristicLab.Hive-3.3;Integrated Security=True;" providerName="System.Data.SqlClient" /> 10 10 </connectionStrings> 11 11 <appSettings> … … 31 31 </providers> 32 32 </roleManager> 33 <compilation debug=" true" targetFramework="4.5" />33 <compilation debug="false" targetFramework="4.5" /> 34 34 <httpRuntime targetFramework="4.5" /> 35 35 </system.web> … … 59 59 <dependentAssembly> 60 60 <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" /> 61 <bindingRedirect oldVersion="0.0.0.0- 6.0.0.0" newVersion="6.0.0.0" />61 <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" /> 62 62 </dependentAssembly> 63 63 <dependentAssembly> … … 67 67 <dependentAssembly> 68 68 <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" /> 69 <bindingRedirect oldVersion="0.0.0.0-1. 5.2.14234" newVersion="1.5.2.14234" />69 <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" /> 70 70 </dependentAssembly> 71 71 <dependentAssembly> … … 81 81 <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" /> 82 82 </dependentAssembly> 83 <dependentAssembly> 84 <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" culture="neutral" /> 85 <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" /> 86 </dependentAssembly> 83 87 </assemblyBinding> 84 88 </runtime> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/helper.js
r12515 r12584 51 51 }; 52 52 53 54 53 var CSharpDateToString = function (datetime) { 55 54 var date = new Date(Date.parse(datetime)); … … 63 62 }; 64 63 64 function decryptString(s) { 65 return CryptoJS.AES.decrypt(s, "heuristiclab").toString(CryptoJS.enc.Utf8); 66 } -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/about.cshtml
r12560 r12584 27 27 </div> 28 28 <div class="panel-body"> 29 <p><strong>Support and Inquiries</strong>: <a href="mailto:support@heuristiclab.com">support@heuristiclab.com</a></p> 29 <p><strong>Support</strong>: <a href="App/RedirectUrl?url=http://groups.google.com/group/heuristiclab">HeuristicLab Google Group</a></p> 30 <p><strong>Inquiries</strong>: <a class="cursor-pointer" ng-click="mailToSupport()">support(at)heuristiclab.com</a></p> 30 31 <p><strong>Heuristic and Evolutionary Algorithms Laboratory (HEAL)</strong>: <a href="App/RedirectUrl?url=http://heal.heuristiclab.com">http://heal.heuristiclab.com</a></p> 31 32 <p><strong>HeuristicLab development site</strong>: <a href="App/RedirectUrl?url=http://dev.heuristiclab.com">http://dev.heuristiclab.com</a></p> … … 35 36 <span class="glyphicon glyphicon-phone-alt"></span> +43 50804 22030<br /> 36 37 <span class="glyphicon glyphicon-print"></span> +43 50804 21599<br /> 37 <span class="glyphicon glyphicon-envelope"></span> <a href="mailto:stefan.wagner@heuristiclab.com">stefan.wagner@heuristiclab.com</a><br />38 <span class="glyphicon glyphicon-envelope"></span> <a class="cursor-pointer" ng-click="mailToStefanWagner()">stefan.wagner(at)heuristiclab.com</a><br /> 38 39 </p> 39 40 </div> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/about/aboutCtrl.js
r12546 r12584 1 1 (function () { 2 2 var module = appAboutPlugin.getAngularModule(); 3 module.controller('app.about.ctrl', ['$scope', function ($scope) { }]); 3 module.controller('app.about.ctrl', ['$scope', '$log', function($scope, $log) { 4 $scope.mailToSupport = function () { 5 location.href = decryptString('U2FsdGVkX1/pCOITUzzsN36hx4sHh11FeVXkVyQ5b2KeZebFQ3KaNN8G9bKL3lU9'); 6 }; 7 8 $scope.mailToStefanWagner = function () { 9 location.href = decryptString('U2FsdGVkX1/Lzu8UFltiBl6VmBf9E0lmGna0+7o7cavCPwiCytBpSLsJoyhO9tl5hHCvJPVgsSndWdmGEuWrXw=='); 10 }; 11 }]); 4 12 })();
Note: See TracChangeset
for help on using the changeset viewer.