- Timestamp:
- 07/01/15 11:24:12 (9 years ago)
- Location:
- branches/HiveStatistics/sources
- Files:
-
- 7 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/HiveStatistics/sources
- Property svn:mergeinfo changed
/trunk/sources merged: 12552-12553,12556-12557
- Property svn:mergeinfo changed
-
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Configs/BundleConfig.cs
r12551 r12558 41 41 "~/WebApp/libs/bootstrap/css/bootstrap-theme.min.css", 42 42 "~/WebApp/libs/font-aweseome/font-aweseome.min.css", 43 "~/WebApp/libs/angularjs/loading-bar/loading-bar.css" 43 "~/WebApp/libs/angularjs/loading-bar/loading-bar.css", 44 "~/WebApp/libs/angularjs/angular-tablesort/tablesort.css" 44 45 )); 45 46 … … 70 71 "~/WebApp/libs/angularjs/angular-ui-router.min.js", 71 72 "~/WebApp/libs/angularjs/angular-knob/angular-knob.js", 73 "~/WebApp/libs/angularjs/angular-tablesort/angular-tablesort.js", 72 74 "~/WebApp/libs/angularjs/angular-ui/ui-bootstrap-tpls-0.13.0.min.js", 73 75 "~/WebApp/libs/angularjs/loading-bar/loading-bar.js", -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/Controllers/AppController.cs
r12435 r12558 47 47 } 48 48 49 public ActionResult RedirectUrl(string url) { 50 return RedirectPermanent(url); 51 } 49 52 } 50 53 } -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/HeuristicLab.Services.WebApp-3.3.csproj
r12551 r12558 143 143 <Content Include="WebApp\app.css" /> 144 144 <Content Include="Global.asax" /> 145 <Content Include="WebApp\libs\angularjs\angular-tablesort\angular-tablesort.js" /> 146 <Content Include="WebApp\libs\angularjs\angular-tablesort\tablesort.css" /> 145 147 <Content Include="WebApp\libs\angularjs\fittext\ng-FitText.js" /> 146 148 <Content Include="WebApp\main.js" /> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/login/loginCtrl.js
r12428 r12558 9 9 $window.location.reload(); 10 10 } else { 11 $scope.result = " error logging in";11 $scope.result = "Invalid username or password. Please try again."; 12 12 } 13 13 }); -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/plugins.cshtml
r12551 r12558 16 16 </div> 17 17 <div class="panel-body"> 18 <table class="table table-hover table-condensed" >18 <table class="table table-hover table-condensed" ts-wrapper> 19 19 <thead> 20 20 <tr> 21 21 <th>#</th> 22 <th >Name</th>23 <th >Assembly</th>24 <th >Last reload</th>22 <th ts-criteria="Name">Name</th> 23 <th ts-criteria="AssemblyName">Assembly</th> 24 <th ts-criteria="LastReload">Last reload</th> 25 25 <th>Status</th> 26 26 <th></th> 27 27 </tr> 28 28 </thead> 29 <tr ng-repeat="plugin in plugins"> 30 <td>{{$index + 1}}</td> 31 <td>{{plugin.Name}}</td> 32 <td>{{plugin.AssemblyName}}</td> 33 <td>{{plugin.LastReload}}</td> 34 <td> 35 <span ng-hide="plugin.Exception" class="glyphicon glyphicon glyphicon-ok" style="color: green"></span> 36 <span ng-show="plugin.Exception" class="glyphicon glyphicon glyphicon-remove" style="color: darkred" 37 ng-click="open(plugin.Name, plugin.Exception)"></span> 38 </td> 39 <td> 40 <a ng-href="" class="cursor-pointer" data-ng-click="reloadPlugin(plugin.Name)">Reload</a> 41 </td> 42 </tr> 29 <tbody> 30 <tr ng-repeat="plugin in plugins" ts-repeat> 31 <td>{{$index + 1}}</td> 32 <td>{{plugin.Name}}</td> 33 <td>{{plugin.AssemblyName}}</td> 34 <td>{{plugin.LastReload}}</td> 35 <td> 36 <span ng-hide="plugin.Exception" class="glyphicon glyphicon glyphicon-ok" style="color: green"></span> 37 <span ng-show="plugin.Exception" class="glyphicon glyphicon glyphicon-remove" style="color: darkred" 38 ng-click="open(plugin.Name, plugin.Exception)"></span> 39 </td> 40 <td> 41 <a ng-href="" class="cursor-pointer" data-ng-click="reloadPlugin(plugin.Name)">Reload</a> 42 </td> 43 </tr> 44 </tbody> 43 45 </table> 44 46 </div> -
branches/HiveStatistics/sources/HeuristicLab.Services.WebApp/3.3/WebApp/plugins/plugins/plugins.js
r12525 r12558 2 2 (function () { 3 3 var plugin = appPluginsPlugin; 4 plugin.dependencies = ['ngResource', 'ui.bootstrap' ];4 plugin.dependencies = ['ngResource', 'ui.bootstrap', 'tableSort']; 5 5 plugin.files = [ 6 6 'pluginsService.js',
Note: See TracChangeset
for help on using the changeset viewer.