Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
79a11ff
Merge pull request #2709 from appirio-tech/hotfix/slider_dots_are_off…
Dec 3, 2018
5cc8f3c
Update config.yml
Gunasekar-K Dec 6, 2018
502b35a
fix issue when installing new dependencies via npm and "github:" pref…
maxceem Dec 12, 2018
d0c61db
Disabled CF cache for dev env.
RishiRajSahu Dec 12, 2018
a12ab54
team management flow update
gondzo Dec 13, 2018
07f84e6
Merge pull request #2719 from appirio-tech/hotfix/customer_unable_to_…
Dec 14, 2018
bdbdea7
Merge pull request #2721 from appirio-tech/hotfix/customer_not_able_t…
Dec 14, 2018
2cb134b
Merge pull request #2723 from appirio-tech/hotfix/disable_file_upload…
RishiRajSahu Dec 19, 2018
c85ae89
Revert "Hotfix/disable file upload for non managers cs"
RishiRajSahu Dec 20, 2018
9adcf35
Merge pull request #2725 from appirio-tech/revert-2723-hotfix/disable…
RishiRajSahu Dec 20, 2018
0149eb6
Allowing upload of files only if files subSection is present in templ…
RishiRajSahu Dec 20, 2018
a1d883d
Merge pull request #2729 from appirio-tech/master
RishiRajSahu Dec 20, 2018
3d53a80
Merge pull request #2732 from appirio-tech/hotfix/always_enable_add_m…
Dec 24, 2018
08e3d35
team management integration
gondzo Jan 3, 2019
7edacde
Resolved conflicts
Jan 7, 2019
92e0400
Lint fixes
Jan 7, 2019
022295e
Merge pull request #2734 from appirio-tech/feature/teamManagement
Jan 7, 2019
713c095
Winning submission from F2F challenge #30078550 - Horizontal Layout f…
maxceem Jan 8, 2019
fcc4c78
Merge branch 'dev' into feature/subsections-horizontal-layout
maxceem Jan 8, 2019
654375f
fix #2738
gondzo Jan 8, 2019
0bb5910
- fix: don't add prefixes to "spacing"
maxceem Jan 9, 2019
bca51a5
removed unnecessary generalization
maxceem Jan 9, 2019
d710ac1
Merge pull request #2737 from appirio-tech/feature/subsections-horizo…
RishiRajSahu Jan 10, 2019
f6b60df
Update config.yml
Gunasekar-K Jan 10, 2019
886779a
Fixed issue with customer project listing page
Jan 10, 2019
01b8993
Github issue#2736, [Team Management 2.0] Admin/Managers are not able …
Jan 11, 2019
fbcf2b4
Added alert for project invite success as well
RishiRajSahu Jan 11, 2019
2e5bbd8
Merge branch 'dev' of https://github.com/appirio-tech/connect-app int…
RishiRajSahu Jan 11, 2019
29c9920
Added support for removing invite for Admin always and corrected logi…
RishiRajSahu Jan 11, 2019
86db357
Copy change
Jan 12, 2019
52a089f
- GitIssue#2742[Team Management 2.0] Inviting already invited user f…
RishiRajSahu Jan 13, 2019
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
9 changes: 3 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ jobs:
docker:
- image: circleci/node:8.9.4-browsers
steps:
- run:
name: checking out qa framework repo
command: git clone --branch develop https://$GITUSER:$GITPASSWD@github.com/appirio-tech/qa-framework-js.git ../qa-framework
- checkout
- restore_cache:
key: test-node-modules-{{ .Environment.CACHE_VERSION }}-{{ checksum "package-lock.json" }}
Expand Down Expand Up @@ -34,9 +31,9 @@ jobs:
- deploy:
name: Running MasterScript
command: |
git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
git clone --branch v1.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
cp ./../buildscript/master_deploy.sh .
./master_deploy.sh -d CFRONT -e DEV -s connectapp
./master_deploy.sh -d CFRONT -e DEV -s connectapp -c false
# deploy to test02
deployTest02:
docker:
Expand All @@ -57,7 +54,7 @@ jobs:
- deploy:
name: Running MasterScript
command: |
git clone --branch master https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
git clone --branch v1.1 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
cp ./../buildscript/master_deploy.sh .
./master_deploy.sh -d CFRONT -e PROD -s connectapp

Expand Down
Loading