Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
581 commits
Select commit Hold shift + click to select a range
116a879
Merge pull request #940 from hrushikesh07/hkDev
udeshrl Nov 18, 2016
1248518
BOTs Audit Trail Implementation
Durgesh1988 Nov 18, 2016
2aeb22e
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 18, 2016
8fd43c4
BOTs Audit Trail Implementation
Durgesh1988 Nov 18, 2016
da7a857
Show/hide left side tree elements on click of provider in design.
divakarkonakalla Nov 18, 2016
a54315f
BOTs Audit Trail Implementation
Durgesh1988 Nov 18, 2016
f0b9f99
Merge pull request #942 from Durgesh1988/dev
liteverge-bot Nov 18, 2016
e6db5b8
resolved conflicts with main.html
divakarkonakalla Nov 18, 2016
5053e66
Change Date formet for Schuler:
Durgesh1988 Nov 18, 2016
55e41c4
Merge pull request #943 from Durgesh1988/dev
Nov 18, 2016
04f1c34
view , edit , add is completed for schedule
Nov 18, 2016
20ebed0
Merge pull request #939 from srikanthv02/devSrikanth
udeshrl Nov 18, 2016
a5e2b8d
Merge pull request #944 from hrushikesh07/hkDev
udeshrl Nov 18, 2016
e9bcf00
Merge pull request #941 from divakarkonakalla/divakar-dev
udeshrl Nov 18, 2016
a44f2e2
Control Panel Issue in Scheduler
Durgesh1988 Nov 18, 2016
ff9c8a4
Scheuler Update issue
Durgesh1988 Nov 18, 2016
0107e79
Merge pull request #945 from Durgesh1988/dev
Nov 18, 2016
c2a5ace
Stop Old Cron Jobs Ids
Durgesh1988 Nov 18, 2016
e71367c
view , edit , add is completed for schedule
Nov 21, 2016
4766750
Merge pull request #946 from hrushikesh07/hkDev
Nov 21, 2016
f5b1710
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Nov 21, 2016
34413ef
edit section for scheduler
Nov 21, 2016
f3828ad
Merge pull request #947 from hrushikesh07/hkDev
udeshrl Nov 21, 2016
555f763
Bots Audit Trail Logs Implementation
Durgesh1988 Nov 21, 2016
b3871e3
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 21, 2016
f907522
Fix for CAT-2511 and CAT-2492
srikanthv02 Nov 21, 2016
8ec29e1
Merge pull request #948 from Durgesh1988/dev
liteverge-bot Nov 21, 2016
ac90009
Merge remote-tracking branch 'upstream/dev' into devSrikanth
srikanthv02 Nov 21, 2016
ad956ed
Merge pull request #949 from srikanthv02/devSrikanth
Nov 21, 2016
b176d6e
BOTs Summary Implementation
Durgesh1988 Nov 21, 2016
91b8255
Bot Audit Trail & logs related changes.
divakarkonakalla Nov 21, 2016
75277b4
removed unused json file
divakarkonakalla Nov 21, 2016
9da06c8
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Nov 21, 2016
44dcefd
Merge pull request #950 from divakarkonakalla/topic-service-deliver
udeshrl Nov 21, 2016
03f170d
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 21, 2016
30aa6eb
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Nov 21, 2016
4459e34
Merge pull request #951 from Durgesh1988/dev
liteverge-bot Nov 21, 2016
68fd79a
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Nov 21, 2016
c3dab06
BOTs Summary Implementation
Durgesh1988 Nov 21, 2016
c23b6cf
BOTs Audit Trail Implementation
Durgesh1988 Nov 21, 2016
1e98bae
Ui Grid for Different Template Types
srikanthv02 Nov 21, 2016
ea79961
Merge remote-tracking branch 'upstream/dev' into devSrikanth
srikanthv02 Nov 21, 2016
943040a
Resolved CAT-2507,2508
srikanthv02 Nov 21, 2016
48550ca
removed the condition of 1st index of time
Nov 22, 2016
a1528f5
removed the condition of 1st index of time
Nov 22, 2016
26158de
Merge pull request #953 from srikanthv02/devSrikanth
udeshrl Nov 22, 2016
8933cf4
Merge pull request #954 from hrushikesh07/hkDev
udeshrl Nov 22, 2016
daca241
fixed build issue
udeshrl Nov 22, 2016
78f5c97
Merge pull request #955 from udeshrl/udeshDev
udeshrl Nov 22, 2016
a7f98cb
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
d69bf87
one card select
Nov 22, 2016
f78d450
one card select
Nov 22, 2016
72c9f86
Merge pull request #956 from hrushikesh07/hkDev
udeshrl Nov 22, 2016
75a9d15
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
0c2b240
rebase with dev
udeshrl Nov 22, 2016
dbb7ca0
added validation for day select
Nov 22, 2016
8f350ce
Merge pull request #957 from hrushikesh07/hkDev
udeshrl Nov 22, 2016
97ea9f6
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
c2099ba
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
41e15af
left tree CAT-2473
Nov 22, 2016
d7711ac
Merge pull request #958 from hrushikesh07/hkDev
udeshrl Nov 22, 2016
d55f4d7
Bots Audit trail changes, bots summary page UI modifications.
divakarkonakalla Nov 22, 2016
2e10eac
changed ui grid height based upon bot summary data height.
divakarkonakalla Nov 22, 2016
7466c04
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Nov 22, 2016
fc955b4
Merge pull request #959 from divakarkonakalla/topic-service-deliver
udeshrl Nov 22, 2016
7f6d643
BOTs Audit Trail Implementation
Durgesh1988 Nov 22, 2016
8a30ccc
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Nov 22, 2016
ecd1645
Resolved merge conflicts
Durgesh1988 Nov 22, 2016
94b5b78
Resolved merge conflicts
Durgesh1988 Nov 22, 2016
dea4e65
Merge pull request #952 from Durgesh1988/dev
liteverge-bot Nov 22, 2016
3423d3f
resolved issues with the injecting dependencies.
divakarkonakalla Nov 22, 2016
a5656a8
added display name property to show ui grid header values properly.
divakarkonakalla Nov 22, 2016
27250c2
Merge pull request #960 from divakarkonakalla/topic-service-deliver
udeshrl Nov 22, 2016
31fc741
Jenkins Job Issue
Durgesh1988 Nov 22, 2016
968d99a
Jenkins Job Logs Implementation
Durgesh1988 Nov 22, 2016
26e49ec
Changes for design
srikanthv02 Nov 22, 2016
7ebe807
Merge remote-tracking branch 'upstream/dev' into devSrikanth
srikanthv02 Nov 22, 2016
c323e6e
Resolved Blueprint logs related issue, added status icons in audittra…
divakarkonakalla Nov 22, 2016
7841bed
Design Changes for composite blueprints
srikanthv02 Nov 22, 2016
4b33d25
Merge pull request #962 from divakarkonakalla/topic-service-deliver
udeshrl Nov 23, 2016
a2d2366
API integration for jenkins logs, added running bots in summary.
divakarkonakalla Nov 23, 2016
034139d
Merge pull request #961 from Durgesh1988/dev
liteverge-bot Nov 23, 2016
e710c97
rebase with dev
udeshrl Nov 23, 2016
5f68bfa
Merge pull request #963 from srikanthv02/devSrikanth
udeshrl Nov 23, 2016
d885e1c
changes.
divakarkonakalla Nov 23, 2016
d720868
Merge pull request #964 from divakarkonakalla/topic-service-deliver
udeshrl Nov 23, 2016
7b14a25
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Nov 23, 2016
8b88ae2
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Nov 23, 2016
675ba24
BOTs Summary and Audit Trail Implementation
Durgesh1988 Nov 23, 2016
30eff72
BOTs Summary and Audit Trail Implementation
Durgesh1988 Nov 23, 2016
37b7caf
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 23, 2016
2fc0723
Merge pull request #968 from Durgesh1988/dev
liteverge-bot Nov 24, 2016
1cab700
installing sensu cookbook with instance bootstrap
udeshrl Nov 24, 2016
2fcb335
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Nov 24, 2016
0cc4d8f
Merge pull request #971 from udeshrl/Feature-CAT-2417
udeshrl Nov 24, 2016
fe0373f
Installing sensu client for provider import and import by ip
udeshrl Nov 24, 2016
940fcfe
Merge pull request #972 from udeshrl/Feature-CAT-2417
udeshrl Nov 24, 2016
f3cf380
Bots Summary UI changes, added icons for status in audit trail page, …
divakarkonakalla Nov 24, 2016
dcfb1d9
QA Bugs fixed and enhancements
srikanthv02 Nov 24, 2016
0b5330f
Added saved time as NA for executions which are failed.
divakarkonakalla Nov 24, 2016
597b997
Changed delete button color in design
srikanthv02 Nov 24, 2016
79f29ca
Merge remote-tracking branch 'upstream/dev' into devSrikanth
srikanthv02 Nov 24, 2016
7f4407e
UI fixes in New Task Page.
divakarkonakalla Nov 24, 2016
0c5339e
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Nov 24, 2016
ec0a81b
After copy of blueprint
srikanthv02 Nov 25, 2016
2ba4745
Merge pull request #974 from srikanthv02/devSrikanth
udeshrl Nov 25, 2016
a5051b3
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Nov 25, 2016
cd54f06
CAT-2528 and CAT-2529 Fixed
Durgesh1988 Nov 25, 2016
640c755
Merge pull request #976 from Durgesh1988/dev
liteverge-bot Nov 25, 2016
933d29e
Library UI changes.
divakarkonakalla Nov 25, 2016
1dbc8af
Resolved Merge conflicts.
divakarkonakalla Nov 25, 2016
b3da8f4
Bots summary selecteion related UI changes.
divakarkonakalla Nov 25, 2016
0acc6e0
removed unused code
divakarkonakalla Nov 25, 2016
ab96ee7
Merge pull request #975 from divakarkonakalla/topic-service-deliver
udeshrl Nov 25, 2016
bc01d5c
Task Scheduler Implementation
Durgesh1988 Nov 25, 2016
9522988
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 25, 2016
d693dd0
Merge pull request #973 from RLOpenCatalyst/topic-telemetry
liteverge-bot Nov 25, 2016
88e8468
Task Scheduler Implementation
Durgesh1988 Nov 25, 2016
b4f93cd
Task Scheduler Implementation
Durgesh1988 Nov 25, 2016
a446bd5
Resolved JShint errors.
divakarkonakalla Nov 25, 2016
888f073
Task Scheduler Implementation
Durgesh1988 Nov 25, 2016
46b433d
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 25, 2016
1b4022f
resolved jshint error
divakarkonakalla Nov 25, 2016
a0259ec
Merge pull request #979 from Durgesh1988/dev
liteverge-bot Nov 25, 2016
5b25219
Changes for task scheduler
srikanthv02 Nov 27, 2016
7368bde
Merge remote-tracking branch 'upstream/dev' into devSrikanth
srikanthv02 Nov 27, 2016
02e521f
Merge pull request #980 from divakarkonakalla/topic-service-deliver
udeshrl Nov 28, 2016
ce50617
sensu client install for chef import
udeshrl Nov 28, 2016
536d4af
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Nov 28, 2016
02ed642
Making the monitorId value as null for chef server
srikanthv02 Nov 28, 2016
6b58eea
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 28, 2016
023de8f
provider import changes and bug fixes
udeshrl Nov 28, 2016
237c2ab
Merge pull request #982 from udeshrl/Feature-CAT-2417
udeshrl Nov 28, 2016
a2caa70
Changes for task scheduler
srikanthv02 Nov 28, 2016
b2851e5
Merge remote-tracking branch 'upstream/dev' into devSrikanth
srikanthv02 Nov 28, 2016
7647daf
Bots summary, Bots audittrail logs UI changes.
divakarkonakalla Nov 28, 2016
9fc4585
library ui grid changes.
divakarkonakalla Nov 28, 2016
2a8186c
Merge pull request #985 from srikanthv02/devSrikanth
udeshrl Nov 28, 2016
7aa9a1b
review comments has been taken care.
divakarkonakalla Nov 28, 2016
ccdc58e
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 28, 2016
bdbef93
Merge pull request #986 from divakarkonakalla/topic-service-deliver
udeshrl Nov 28, 2016
c8e0db9
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 28, 2016
f8042c9
UI enhancements for BOTs
divakarkonakalla Nov 28, 2016
e2d614b
Task Scheduler Implementation
Durgesh1988 Nov 28, 2016
74d8be0
Task Scheduler Implementation
Durgesh1988 Nov 28, 2016
e38fa27
Merge pull request #987 from divakarkonakalla/topic-service-deliver
udeshrl Nov 29, 2016
0d93a9d
Merge pull request #988 from Durgesh1988/dev
liteverge-bot Nov 29, 2016
e094958
Task Scheduler Implementation
Durgesh1988 Nov 29, 2016
6964d6c
Merge pull request #990 from Durgesh1988/dev
liteverge-bot Nov 29, 2016
ee44f60
CAT-2531/CAT-2529/CAT-2521/CAT-2532 Fixed
Durgesh1988 Nov 29, 2016
f5d6f38
Changes for task scheduler
srikanthv02 Nov 29, 2016
eceb641
Merge pull request #992 from Durgesh1988/dev
liteverge-bot Nov 29, 2016
a43adbc
Merge pull request #993 from srikanthv02/devSrikanth
liteverge-bot Nov 29, 2016
e697952
Removed one condition and added task for scheduler
srikanthv02 Nov 29, 2016
1d48707
Merge pull request #995 from srikanthv02/devSrikanth
udeshrl Nov 29, 2016
f1b1d20
CAT-2533 fixed
Durgesh1988 Nov 29, 2016
ce29d95
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 29, 2016
7b2c4d5
Merge pull request #997 from Durgesh1988/dev
liteverge-bot Nov 29, 2016
f0713be
bots running & failed page refresh issue when deleting a bot.
divakarkonakalla Nov 29, 2016
9effeae
CAT-2552 Fixed
Durgesh1988 Nov 29, 2016
691d532
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Nov 29, 2016
ff55d2b
CAT-2552 Fixed
Durgesh1988 Nov 29, 2016
06dc780
sensu client at instance level
udeshrl Nov 30, 2016
4355f69
rebase with dev
udeshrl Nov 30, 2016
873dc8c
Merge pull request #1000 from divakarkonakalla/topic-service-deliver
udeshrl Nov 30, 2016
8e5bce0
Merge pull request #1002 from udeshrl/Feature-CAT-2417
udeshrl Nov 30, 2016
d97b53d
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Nov 30, 2016
05610fb
CAT-2521 fixed
Durgesh1988 Nov 30, 2016
935cdc7
Fixed issue with schedule edit.
divakarkonakalla Nov 30, 2016
8567145
Merge pull request #1003 from divakarkonakalla/topic-service-deliver
udeshrl Nov 30, 2016
df3ba4f
Changes for monitoring server in blueprint launch,Import by Ip,provid…
srikanthv02 Nov 30, 2016
5e6dd33
Merge pull request #1001 from Durgesh1988/dev
liteverge-bot Dec 1, 2016
b7c68b7
Changes for monitorId while blueprintlaunch
srikanthv02 Dec 1, 2016
f52f144
For blueprint Launch
srikanthv02 Dec 1, 2016
97d27b6
Review comments handled
srikanthv02 Dec 1, 2016
0ed8d76
Changed a condition
srikanthv02 Dec 1, 2016
5ed57f2
Removed find from js
srikanthv02 Dec 1, 2016
1e3a282
Merge pull request #981 from srikanthv02/srikanth-telemetry
udeshrl Dec 1, 2016
f8ddc68
rebase with dev
udeshrl Dec 1, 2016
6b9bcfc
Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab
Dec 1, 2016
1b2fcfc
Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab
Dec 1, 2016
da40788
Merge branch 'dev' of https://github.com/kkn/core into dev
Dec 1, 2016
fc81903
added monitor filter for instances api
udeshrl Dec 1, 2016
326e598
Merge pull request #1004 from udeshrl/Feature-CAT-2417
udeshrl Dec 1, 2016
0bb74d0
Check for undefined and null
srikanthv02 Dec 1, 2016
c6d67c7
Review comments taken care
srikanthv02 Dec 1, 2016
cd086e6
Merge pull request #1005 from srikanthv02/devSrikanth
udeshrl Dec 1, 2016
a8cb446
Merge remote-tracking branch 'upstream/dev' into Feature-CAT-2417
udeshrl Dec 2, 2016
5ab8fa9
Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab
Dec 1, 2016
db11d2b
Merge branch 'dev' of https://github.com/kkn/core into dev
Dec 2, 2016
d93e296
Script Executor for Python and bots library Issue
Durgesh1988 Dec 2, 2016
e91c540
Resolved merge conflicts
Durgesh1988 Dec 2, 2016
aeb49c5
Resolved merge conflicts
Durgesh1988 Dec 2, 2016
4394ff1
Script Executor for Python Implementation
Durgesh1988 Dec 5, 2016
d66b946
Fix for CAT-2445 Incorrect Total Cost is showing in Analytics tab
Dec 1, 2016
cb39b4a
Merge branch 'dev' of https://github.com/kkn/core into dev
Dec 5, 2016
ddd65fb
Merge pull request #1006 from Durgesh1988/dev
liteverge-bot Dec 5, 2016
0717119
Add some debug points for debugging
Durgesh1988 Dec 5, 2016
4167096
Bots Library, Summary enhancements.
divakarkonakalla Dec 5, 2016
c15a8e1
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Dec 5, 2016
52f566b
cost aggregation fixes
Dec 5, 2016
e7d309b
Merge pull request #1007 from kkn/dev
liteverge-bot Dec 5, 2016
fcaf679
Add Task Execution Standard Time in Task/History Schema
Durgesh1988 Dec 5, 2016
0fe2676
manual execution time related changes.
divakarkonakalla Dec 5, 2016
7741989
Add Task Execution Standard Time in Task/History Schema
Durgesh1988 Dec 5, 2016
00131b4
Merge pull request #1008 from Durgesh1988/dev
liteverge-bot Dec 5, 2016
1bc6a96
added filterby in instances api and actionLogs api
udeshrl Dec 5, 2016
860f365
rebase with dev
udeshrl Dec 5, 2016
05256b5
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Dec 5, 2016
ce9a193
Changed & to ? for filterBy
srikanthv02 Dec 5, 2016
1ca4635
Merge pull request #1011 from srikanthv02/srikanth-telemetry
udeshrl Dec 5, 2016
59b91b6
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Dec 5, 2016
2de9c97
Dynamic manual execution time changes added.
divakarkonakalla Dec 5, 2016
7d4a8a0
Merge pull request #1009 from divakarkonakalla/topic-service-deliver
udeshrl Dec 5, 2016
a5b0b70
Add Task Execution Standard Time in Task/History Schema
Durgesh1988 Dec 5, 2016
166e548
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Dec 5, 2016
9371f28
Merge pull request #1012 from Durgesh1988/dev
liteverge-bot Dec 5, 2016
2b295bc
Merge pull request #1010 from udeshrl/Feature-CAT-2417
liteverge-bot Dec 5, 2016
4b0f0b6
resolved conflicts
udeshrl Dec 5, 2016
5043db3
Function call for provider sync
srikanthv02 Dec 5, 2016
dab35a2
Merge remote-tracking branch 'upstream/topic-telemetry' into srikanth…
srikanthv02 Dec 5, 2016
35a5cde
Merge pull request #1013 from srikanthv02/srikanth-telemetry
udeshrl Dec 5, 2016
ba525af
Merge remote-tracking branch 'upstream/topic-telemetry' into Feature-…
udeshrl Dec 5, 2016
c87ee8b
Task-Scheduler/Instance-Scheduler/Script-Gallery Issue Solution
Durgesh1988 Dec 5, 2016
a67ac0e
Merge pull request #1016 from Durgesh1988/dev
liteverge-bot Dec 6, 2016
751030d
Merge pull request #1014 from udeshrl/Feature-CAT-2417
udeshrl Dec 6, 2016
58c613c
Bots UI related changes & enhancements.
divakarkonakalla Dec 6, 2016
3bb9211
resolved conflicts
udeshrl Dec 7, 2016
c2166df
Merge pull request #1021 from udeshrl/Feature-CAT-2417
udeshrl Dec 7, 2016
51c36f5
Merge pull request #1015 from RLOpenCatalyst/topic-telemetry
liteverge-bot Dec 7, 2016
1b2ff62
Execution time related changes in orchestration history popup.
divakarkonakalla Dec 7, 2016
ef687a0
Resolved issue with NaN in execution time column in history.
divakarkonakalla Dec 7, 2016
21485b8
BOTs FilterBy/Search/Pagination/Scheduler Implementation
Durgesh1988 Dec 7, 2016
41d1969
Resolved merge conflicts
Durgesh1988 Dec 7, 2016
1c0d012
Stop cron Job after updating
Durgesh1988 Dec 7, 2016
087de53
BOTs FilterBy/Search/Pagination/Scheduler Implementation
Durgesh1988 Dec 7, 2016
308379a
changes to show selected icon in blue color in the header, minor UI c…
divakarkonakalla Dec 7, 2016
d118930
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Dec 7, 2016
12aa682
Merge pull request #1023 from Durgesh1988/dev
liteverge-bot Dec 8, 2016
1dba13c
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Dec 8, 2016
d122a05
BOTs FilterBy/Search/Pagination/Scheduler Implementation
Durgesh1988 Dec 8, 2016
97e6beb
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Dec 8, 2016
d3d9ca2
Merge pull request #1020 from divakarkonakalla/topic-service-deliver
udeshrl Dec 9, 2016
a879392
BOTs Scheduler and Launch Implementation
Durgesh1988 Dec 9, 2016
50f6e67
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Dec 9, 2016
961ba20
BOTs Scheduler and Launch Implementation
Durgesh1988 Dec 9, 2016
2e44d48
BOTs Scheduler and Launch Implementation
Durgesh1988 Dec 9, 2016
4d04565
Merge pull request #1029 from Durgesh1988/dev
liteverge-bot Dec 9, 2016
d4affd1
Merge remote-tracking branch 'upstream/dev' into topic-service-deliver
divakarkonakalla Dec 9, 2016
44aeb07
New changes for Bots
divakarkonakalla Dec 15, 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
1 change: 1 addition & 0 deletions client/cat3/Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ module.exports = function(grunt) {
{'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/analytics.css':'src/partials/sections/dashboard/analytics/analytics.scss'},
{'catalyst/partials/sections/dashboard/design/design.css':'src/partials/sections/dashboard/design/design.scss'},
{'catalyst/partials/sections/dashboard/bots/bots.css':'src/partials/sections/dashboard/bots/bots.scss'},
{'catalyst/partials/sections/dashboard/setting/setting.css':'src/partials/sections/dashboard/setting/setting.scss'}
]
Expand Down
85 changes: 42 additions & 43 deletions client/cat3/bower.json
Original file line number Diff line number Diff line change
@@ -1,45 +1,44 @@
{
"name": "catalyst",
"version": "3.0.0",
"main": "index.js",
"license": "MIT",
"homepage": "index.html",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"authors": [
"revinjacob"
],
"dependencies": {
"angular": "~1.4.4",
"angular-route": "~1.4.4",
"angular-strap": "~2.3.1",
"angular-ui-router": "~0.2.15",
"font-awesome": "~4.4.0",
"angular-animate": "~1.4.6",
"angular-datatables": "~0.5.0",
"angular-sanitize": "~1.4.7",
"angular-touch": "~1.4.7",
"font-awesome": "~4.4.0",
"jquery": "~2.1.4",
"ngstorage": "~0.3.9",
"angular-ui-grid": "^3.1.1",
"lodash": "^4.11.2",
"ng-file-upload": "^12.0.4",
"angular-nvd3": "^1.0.7"
},
"exportsOverride": {
"font-awesome": {
"fonts": "fonts/*",
"css": "css/font-awesome.css",
"less": "less/*"
},
"lodash": {
"lodash": "lodash.js"
}
}
"name": "catalyst",
"version": "3.0.0",
"main": "index.js",
"license": "MIT",
"homepage": "index.html",
"ignore": [
"**/.*",
"node_modules",
"bower_components",
"test",
"tests"
],
"authors": [
"revinjacob"
],
"dependencies": {
"angular": "~1.4.4",
"angular-route": "~1.4.4",
"angular-strap": "~2.3.1",
"angular-ui-router": "~0.2.15",
"font-awesome": "~4.4.0",
"angular-animate": "~1.4.6",
"angular-datatables": "~0.5.0",
"angular-sanitize": "~1.4.7",
"angular-touch": "~1.4.7",
"jquery": "~2.1.4",
"ngstorage": "~0.3.9",
"angular-ui-grid": "^3.1.1",
"lodash": "^4.11.2",
"ng-file-upload": "^12.0.4",
"angular-nvd3": "^1.0.7"
},
"exportsOverride": {
"font-awesome": {
"fonts": "fonts/*",
"css": "css/font-awesome.css",
"less": "less/*"
},
"lodash": {
"lodash": "lodash.js"
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
.dtp { position: fixed; top: 0; left: 0; right: 0; bottom: 0; background: rgba(0, 0, 0, 0.4); z-index: 2000; font-size: 15px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; }
.dtp > .dtp-content { background: #fff; max-width: 300px; box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12); max-height: 520px; position: relative; left: 50%; }
.dtp > .dtp-content > .dtp-date-view > header.dtp-header { background: #689F38; color: #fff; text-align: center; padding: 0.3em; }

.dtp div.dtp-date, .dtp div.dtp-time { background: #8BC34A; text-align: center; color: #fff; padding: 10px; }
.dtp div.dtp-date > div { padding: 0; margin: 0; }
.dtp div.dtp-actual-month { font-size: 1.5em; }
.dtp div.dtp-actual-num { font-size: 3em; line-height: 0.9; }
.dtp div.dtp-actual-maxtime { font-size: 3em; line-height: 0.9; }
.dtp div.dtp-actual-year { font-size: 1.5em; color: #DCEDC8; }
.dtp div.dtp-picker { padding: 1em; text-align: center; }

.dtp div.dtp-picker-month, .dtp div.dtp-actual-time { font-weight: 500; text-align: center; }
.dtp div.dtp-picker-month { padding-bottom:20px!important; text-transform: uppercase!important; }

.dtp .dtp-close { position: absolute; top: 0.5em; right: 1em; }
.dtp .dtp-close > a { color: #fff; }
.dtp .dtp-close > a > i { font-size: 1em; }

.dtp table.dtp-picker-days { margin: 0; min-height: 251px;}
.dtp table.dtp-picker-days, .dtp table.dtp-picker-days tr, .dtp table.dtp-picker-days tr > td { border: none; }
.dtp table.dtp-picker-days tr > td { font-weight: 700; font-size: 0.8em; text-align: center; padding: 0.5em 0.3em; }
.dtp table.dtp-picker-days tr > td > span.dtp-select-day { color: #BDBDBD!important; padding: 0.4em 0.5em 0.5em 0.6em;}
.dtp table.dtp-picker-days tr > td > a, .dtp .dtp-picker-time > a { color: #212121; text-decoration: none; padding: 0.4em 0.5em 0.5em 0.6em; border-radius: 50%!important; }
.dtp table.dtp-picker-days tr > td > a.selected{ background: #8BC34A; color: #fff; }
.dtp table.dtp-picker-days tr > th { color: #757575; text-align: center; font-weight: 700; padding: 0.4em 0.3em; }

.dtp .p10 > a { color: #689F38; text-decoration: none; }
.dtp .p10 { width: 10%; display: inline-block; }
.dtp .p20 { width: 20%; display: inline-block; }
.dtp .p60 { width: 60%; display: inline-block; }
.dtp .p80 { width: 80%; display: inline-block; }

.dtp a.dtp-meridien-am, .dtp a.dtp-meridien-pm { position: relative; top: 10px; color: #212121; font-weight: 500; padding: 0.7em 0.5em; border-radius: 50%!important;text-decoration: none; background: #eee; font-size:1em; }
.dtp .dtp-actual-meridien a.selected { background: #689F38; color: #fff; }

.dtp .dtp-picker-time > .dtp-select-hour { cursor: pointer; }
.dtp .dtp-picker-time > .dtp-select-minute { cursor: pointer; }

.dtp .dtp-buttons { padding: 0 1em 1em 1em; text-align: right; }

.dtp.hidden, .dtp .hidden { display: none; }
.dtp .invisible { visibility: hidden; }

.dtp .left { float: left; }
.dtp .right { float: right; }
.dtp .clearfix { clear: both; }

.dtp .center { text-align: center; }
Loading