Skip to content
This repository was archived by the owner on Mar 4, 2025. It is now read-only.

Commit 1307799

Browse files
author
vikasrohit
committed
Merge branch 'dev' into tco16-nav-url
* dev: (83 commits) Update to reflect bower changes Update test dependencies Remove bower Update format Delete moment-timezone from scripts folder and use npm, fix image paths Test travis build Add correct encrypted keys and secrets for qa and production Add travis build status indicator for master Add travis build indicator Update code and file references Update readme for webpack Update readme to test jenkins Update branch for merge Put back version Remove unused libraries Remove unused libraries and try gzip Fix skill path Comment out failing Firefox tests Add test script to travis and use master branch of webpack-config Run karma tests with Firefox in travis build ... Conflicts: app/services/nav.service.js app/topcoder.constants.js config.js
2 parents c5f7ed2 + f0e70c6 commit 1307799

File tree

216 files changed

+6259
-13271
lines changed

Some content is hidden

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

216 files changed

+6259
-13271
lines changed

.bowerrc

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

0 commit comments

Comments
 (0)