Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
9af1e88
Merge remote-tracking branch 'upstream/dev' into vijayDev
VIJAYKUMARNINGANURE Aug 30, 2016
563248e
Merge pull request #706 from RLOpenCatalyst/release-3.4.0-hot-fixes
liteverge-bot Sep 12, 2016
05338b3
Merge remote-tracking branch 'upstream/dev' into vijayDev
VIJAYKUMARNINGANURE Sep 14, 2016
008b7d6
Merge remote-tracking branch 'upstream/dev' into vijayDev
VIJAYKUMARNINGANURE Sep 14, 2016
24682d7
Merge pull request #731 from RLOpenCatalyst/dev
RLIndia Sep 19, 2016
041090d
Merge pull request #734 from RLOpenCatalyst/dev
RLIndia Sep 19, 2016
1e50cdb
Merge pull request #735 from RLOpenCatalyst/master
RLIndia Sep 19, 2016
390fba5
Docker-Audit Trail Implimentation
VIJAYKUMARNINGANURE Sep 27, 2016
4a922d5
Resolved merge conflicts
VIJAYKUMARNINGANURE Sep 27, 2016
5223ab2
Merge pull request #765 from VIJAYKUMARNINGANURE/vijayDev
liteverge-bot Sep 28, 2016
13545bf
Added new HTML for Container Logs audit trail, modified CSS for conta…
divakarkonakalla Sep 28, 2016
671b7ed
Merge pull request #769 from divakarkonakalla/container-logs
udeshrl Sep 28, 2016
35225a0
Add category and short description for creating a orchestation job
Durgesh1988 Sep 29, 2016
1ed2680
Add category and short description for creating a orchestation job
Durgesh1988 Sep 29, 2016
6fff799
Merge pull request #782 from RLOpenCatalyst/topic-cloud-analytics
liteverge-bot Sep 29, 2016
1ddabd9
Implemented the Docker container audit trail logs
VIJAYKUMARNINGANURE Sep 29, 2016
4ed088a
Merge pull request #783 from VIJAYKUMARNINGANURE/vijayDev
liteverge-bot Sep 29, 2016
08aa819
UI changes for docker container audit trail.
divakarkonakalla Sep 29, 2016
b5c6f08
Task Model Implementation for BOTS
Durgesh1988 Sep 30, 2016
ddbd5d1
Add User Configuration in Setting Wizard
Durgesh1988 Sep 30, 2016
571929e
Implemted the Docker container status
VIJAYKUMARNINGANURE Oct 3, 2016
10aaba2
Implemented the Action of Docker container Audit Trail
VIJAYKUMARNINGANURE Oct 3, 2016
bdde055
CAT-2349 Fixed
Durgesh1988 Oct 3, 2016
6d26da0
Merge pull request #787 from VIJAYKUMARNINGANURE/vijayDev
Oct 3, 2016
39ee189
Merge pull request #784 from divakarkonakalla/container-logs
udeshrl Oct 3, 2016
b065dde
Merge pull request #788 from RLOpenCatalyst/topic-cloud-analytics
Oct 3, 2016
03b5290
minor UI changes releted to table header text.
divakarkonakalla Oct 3, 2016
761f8e9
minor UI changes releted to table header text, refresh table related …
divakarkonakalla Oct 3, 2016
55b8bdc
CAT-2349 Fixed
Durgesh1988 Oct 3, 2016
a7f19c7
Added animation for chart
Oct 3, 2016
ed6418e
Merge pull request #789 from divakarkonakalla/container-logs
udeshrl Oct 3, 2016
cb410be
Changed the ui
Oct 3, 2016
b0ff43e
UI changes done
Oct 3, 2016
a9d0a3f
CAT-2348 Fixed
Durgesh1988 Oct 3, 2016
57b83cb
Changed the usage split
Oct 4, 2016
c52fc47
Merge pull request #792 from RLOpenCatalyst/topic-docker-audit-trail
udeshrl Oct 4, 2016
24bd7ec
Merge pull request #790 from hrushikesh07/analytics
udeshrl Oct 4, 2016
14d2cba
CAT-2249 Fixed
Durgesh1988 Oct 4, 2016
0852c85
Merge pull request #785 from Durgesh1988/stage
Oct 4, 2016
fe45a35
Merge pull request #791 from Durgesh1988/dev
Oct 4, 2016
8a7acc7
Hiding the left tree menu on page load, converted it into floating menu.
divakarkonakalla Oct 4, 2016
244065f
Hiding the left tree menu on page load, converted it into floating me…
divakarkonakalla Oct 4, 2016
e93b2e4
CAT-2404 and CAT-2405 Fixed
Durgesh1988 Oct 4, 2016
7284fe3
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Oct 4, 2016
d3a4df4
CAT-2404 and CAT-2405 Fixed
Durgesh1988 Oct 4, 2016
d4f73bc
Merge pull request #794 from Durgesh1988/dev
RLIndia Oct 4, 2016
cdf152d
Merge remote-tracking branch 'upstream/dev' into dev-divakar
divakarkonakalla Oct 4, 2016
130f5ce
Converted left tree menu into floating menu in design, track & Settings.
divakarkonakalla Oct 4, 2016
f338d4f
analytics UI changes
udeshrl Oct 4, 2016
a18b6ac
usage type dropdown setting
udeshrl Oct 4, 2016
46f41e0
Merge pull request #795 from udeshrl/topic-cloud-analytics
udeshrl Oct 4, 2016
6470db6
Resolved Bugs for Settings wizard
srikanthv02 Oct 4, 2016
7d54c08
Changes for settings wizard
srikanthv02 Oct 4, 2016
f82b460
Fix to get rid of duplicate line item entries adding up to the total …
Oct 5, 2016
ad8214d
Bugs resolved for settings wizard
srikanthv02 Oct 5, 2016
d643e41
Resolved Bugs for setting wizards
srikanthv02 Oct 5, 2016
69fb544
Merge pull request #796 from srikanthv02/devSrikanth
udeshrl Oct 5, 2016
a53b08d
Updated seed data for audit trail containers
srikanthv02 Oct 5, 2016
5dbcdf4
Removed selection
srikanthv02 Oct 5, 2016
a212ce6
Merge pull request #797 from srikanthv02/devSrikanth
udeshrl Oct 5, 2016
ef21240
UI changes to apply transition for left panel on open, modified UI fo…
divakarkonakalla Oct 5, 2016
bd9a396
Merge remote-tracking branch 'upstream/dev' into dev-divakar
divakarkonakalla Oct 5, 2016
0ade30a
Merge pull request #793 from divakarkonakalla/dev-divakar
udeshrl Oct 5, 2016
0e156bc
usage chart changed
Oct 5, 2016
1119c06
usage chart changed
Oct 5, 2016
476909d
Merge pull request #799 from hrushikesh07/analytics
udeshrl Oct 6, 2016
f6b2ce1
usage chart legend-text changed
Oct 6, 2016
377814c
Merge remote-tracking branch 'upstream/dev' into analytics
Oct 6, 2016
06ebe9d
usage filter changed
Oct 6, 2016
3831503
Merge pull request #800 from hrushikesh07/analytics
udeshrl Oct 6, 2016
1b3a1d1
Merge pull request #801 from kkn/dev
liteverge-bot Oct 6, 2016
fda3fba
usage data time added , text position changed
Oct 6, 2016
6387820
usage and cost css changed
Oct 6, 2016
82a7cdb
Resolved CAT-2415 for composite
srikanthv02 Oct 6, 2016
63d79dd
Merge pull request #805 from srikanthv02/devSrikanth
RLIndia Oct 6, 2016
3af311a
floating menu issue with firefox got resolved, moved all the common c…
divakarkonakalla Oct 6, 2016
60dd8ae
Merge remote-tracking branch 'upstream/dev' into dev-divakar
divakarkonakalla Oct 6, 2016
6787c70
removed both the css files for left tree menu as all the css moved to…
divakarkonakalla Oct 6, 2016
ba1754b
Merge pull request #806 from divakarkonakalla/dev-divakar
udeshrl Oct 6, 2016
024e867
Responsiveness related fixes for breadcrumb, filter options in workzone.
divakarkonakalla Oct 6, 2016
b9e7915
Status column changes for docker container audit trail listing table.
divakarkonakalla Oct 6, 2016
95c756d
filter changed
Oct 7, 2016
5736316
filter changed
Oct 7, 2016
7e4c0c5
Merge pull request #807 from divakarkonakalla/dev-divakar
udeshrl Oct 7, 2016
9adc66e
CSS added for filter
Oct 7, 2016
3651dae
Merge pull request #804 from hrushikesh07/analytics
udeshrl Oct 7, 2016
9e9f5ff
Change the if else ladder implementation to switch case for status co…
divakarkonakalla Oct 7, 2016
0899b28
Merge pull request #808 from divakarkonakalla/container-logs
udeshrl Oct 7, 2016
bd90749
Merge pull request #809 from RLOpenCatalyst/topic-docker-audit-trail
udeshrl Oct 7, 2016
4a44ce1
fix to match aggregated cost with total cost calcualted by AWS
Oct 7, 2016
1e2bd02
Merge pull request #810 from kkn/dev
liteverge-bot Oct 7, 2016
f4d68e5
CAT-2409 Fixed
Durgesh1988 Oct 7, 2016
6b51280
CAT-2414 Fixed
Durgesh1988 Oct 7, 2016
4d956a8
Merge pull request #812 from Durgesh1988/dev
liteverge-bot Oct 10, 2016
cb729fe
Usage report added
Oct 10, 2016
d393d5d
Merge remote-tracking branch 'upstream/dev' into analytics
Oct 10, 2016
3cf4990
Merge pull request #813 from hrushikesh07/analytics
Oct 10, 2016
13ead65
Design base changed , tree router created
Oct 10, 2016
218f778
Design base changed , tree router created
Oct 10, 2016
bf13fa0
Merge remote-tracking branch 'upstream/topic-jobs-enhancement-release…
Durgesh1988 Oct 12, 2016
8d1d74c
Task Job Implementation for Server Delivery
Durgesh1988 Oct 12, 2016
56ec80c
Merge pull request #816 from Durgesh1988/dev
liteverge-bot Oct 12, 2016
6a0a1ff
Merge remote-tracking branch 'upstream/dev' into analytics
Oct 13, 2016
fa93ac8
Conflict erroe
Oct 13, 2016
dd2f1b0
capacity html added
Oct 13, 2016
bef1912
capacity html added
Oct 13, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions client/cat3/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,12 @@ module.exports = function(grunt) {
{'catalyst/partials/global.css':'src/partials/global.scss'},
{'catalyst/partials/globals/treeComponent/treeDirective.css':'src/partials/globals/treeComponent/treeDirective.scss'},
{'catalyst/partials/sections/dashboard/workzone/workzone.css':'src/partials/sections/dashboard/workzone/workzone.scss'},
{'catalyst/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.css':'src/partials/sections/dashboard/workzone/workzoneTreeMenu/workzoneTreeMenu.scss'},
{'catalyst/partials/sections/dashboard/workzone/instance/instance.css':'src/partials/sections/dashboard/workzone/instance/instance.scss'},
{'catalyst/partials/sections/dashboard/workzone/blueprint/blueprint.css':'src/partials/sections/dashboard/workzone/blueprint/blueprint.scss'},
{'catalyst/partials/sections/dashboard/workzone/cloudFormation/cloudFormation.css':'src/partials/sections/dashboard/workzone/cloudFormation/cloudFormation.scss'},
{'catalyst/partials/sections/dashboard/workzone/container/container.css':'src/partials/sections/dashboard/workzone/container/container.scss'},
{'catalyst/partials/sections/dashboard/workzone/orchestration/orchestration.css':'src/partials/sections/dashboard/workzone/orchestration/orchestration.scss'},
{'catalyst/partials/sections/dashboard/workzone/application/application.css':'src/partials/sections/dashboard/workzone/application/application.scss'},
{'catalyst/partials/sections/dashboard/analytics/view/analyticsTreeMenu.css':'src/partials/sections/dashboard/analytics/view/analyticsTreeMenu.scss'},
{'catalyst/partials/sections/dashboard/analytics/analytics.css':'src/partials/sections/dashboard/analytics/analytics.scss'},
{'catalyst/partials/sections/dashboard/setting/setting.css':'src/partials/sections/dashboard/setting/setting.scss'}
]
Expand Down
12 changes: 10 additions & 2 deletions client/cat3/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,14 @@
</div>
<div class="breadcrumb-wrapper">
<div class="container-fluid" id="breadcrumb-block" ng-controller="breadcrumbCtrl" ng-show="isBreadCrumbAvailable">
<div ng-cloak id="section-name" class="col-lg-2 col-md-2 col-sm-2 col-xs-2">
{{sectionName}}
<div class="col-lg-2 col-md-2 col-sm-2 col-xs-2 no-padding">
<div id="section-name">
<span ng-mouseover="showTreeOverlay()" ng-mouseleave="hideTreeOverlay()" class="cursor">
<i class="fa fa-bars tree-toggle">
</i>
Menu
</span>
</div>
</div>
<div id="breadcrumb-nav" class="col-lg-10 col-md-10 col-sm-10 col-xs-10">
<ul>
Expand Down Expand Up @@ -97,6 +103,8 @@
<script src="src/partials/sections/dashboard/analytics/controller/capacityCtrl.js"></script>
<script src="src/partials/sections/dashboard/analytics/controller/usageCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/designCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/controllers/blueprintCreateCtrl.js"></script>
<script src="src/partials/sections/dashboard/design/controllers/blueprintListCtrl.js"></script>
<script src="src/partials/sections/dashboard/help/helpCtrl.js"></script>
<script src="src/partials/sections/dashboard/setting/organization/organizationCtrl.js"></script>
<script src="src/partials/sections/dashboard/setting/organization/organizationListCtrl.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion client/cat3/src/clientRoutes.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ function routeConfig($stateProvider, $urlRouterProvider, $httpProvider, modulePe
}).state('dashboard.design', {
url: "/design",
templateUrl: "src/partials/sections/dashboard/design/design.html",
controller: "designCtrl",
controller: "designCtrl as desCtrl",
resolve: {
auth: ["$q", function ($q) {
var deferred = $q.defer();
Expand Down
10 changes: 8 additions & 2 deletions client/cat3/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,15 @@ var angularApp = angular.module('catapp', ['ui.router','ngTouch','toastr',
'global.messages'
]);

angularApp.run(['$rootScope', 'auth', '$state', '$stateParams',
function ($rootScope, Auth, $state, $stateParams) {
angularApp.run(['$rootScope', 'auth', '$state', '$stateParams','$http','$window',
function ($rootScope, Auth, $state, $stateParams,$http,$window) {
'use strict';
$http.get('/organizations/getTreeNew').success(function (result) {
// if(result.data && result.data.length >0){
// console.log(result);
// $window.location.href="/private/index.html#ajax/Settings/Dashboard.html";
// }
});
$rootScope.$on('$stateChangeStart', function (event, toState) {
//More function params: function (event, toState, toParams, fromState, fromParams)
function checkAuthentication() {
Expand Down
Loading