Skip to content

Commit f2d7008

Browse files
author
Vikas Agarwal
committed
Merge branch 'dev' into feature/bring-back-draft
# Conflicts: # src/components/TopBar/ProjectsToolBar.js
2 parents d3946ba + 7c9155f commit f2d7008

File tree

101 files changed

+2165
-1252
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2165
-1252
lines changed

circle.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ compile:
1919

2020
deployment:
2121
development:
22-
branch: [dev]
22+
branch: dev
2323
owner: appirio-tech
2424
commands:
2525
- ./deploy.sh DEV
@@ -28,6 +28,11 @@ deployment:
2828
owner: appirio-tech
2929
commands:
3030
- ./deploy.sh TEST01
31+
test02:
32+
branch: test02
33+
owner: appirio-tech
34+
commands:
35+
- ./deploy.sh TEST02
3136
qa:
3237
branch: qa
3338
owner: appirio-tech

npm-shrinkwrap.json

Lines changed: 61 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
"redux-segment": "^1.6.2",
8080
"redux-thunk": "^2.1.0",
8181
"remarkable": "^1.7.1",
82+
"svg-react-loader": "^0.4.5",
8283
"tc-accounts": "git+https://github.com/appirio-tech/accounts-app.git#0.0.11",
8384
"tc-ui": "git+https://github.com/appirio-tech/tc-ui.git#feature/connectv2",
8485
"tlds": "^1.191.0"

src/assets/images/check.svg

Lines changed: 4 additions & 0 deletions
Loading
Lines changed: 15 additions & 8 deletions
Loading
Lines changed: 18 additions & 0 deletions
Loading

src/assets/images/product-app-visual-design.svg

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)