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

Feature/filestack int #825

Merged
merged 3 commits into from
Jun 13, 2016
Merged

Feature/filestack int #825

merged 3 commits into from
Jun 13, 2016

Conversation

vikasrohit
Copy link
Contributor

-- Unit tests fix
-- Excluded external javascripts from linting

@parthshah fyi, I have to merge this in dev to get dev env with latest build

vikasrohit added 3 commits June 9, 2016 11:30
…s & angular-filepicker.js

-- Fixed lint errors
* dev: (81 commits)
  fixing linting errors
  Branch name fix for qa env
  adding a coupel of media types for zip
  AS#100297043256582, Move all login to link of Members to accounts.topcoder.com
  AS#100297043256582, Move all login to link of Members to accounts.topcoder.com
  AS#100297043256582, Move all login to link of Members to accounts.topcoder.com
  AS#100297043256582, Move all login to link of Members to accounts.topcoder.com
  Restricted the version of webpack-config to be 0.3.6 to have the mail chimp constants.
  fixing unit tests
  AS#100297043256582, Move all login to link of Members to accounts.topcoder.com
  Merge branch 'dev' into feature/sso-accounts-app-integration
  AS#131482348128949, Refactor Mailchimp API wrapper to be generic user preferences service
  AS#131482348128949, Refactor Mailchimp API wrapper to be generic user preferences service
  supporting sentry logging
  supporting sentry logging
  Fixed lint errors
  Added code comments
  Removed tabs
  updated package.json
  Final fix - all review comments
  ...

Conflicts:
	app/directives/tc-fp-file-input/tc-fp-file-input.directive.js
	app/services/submissions.service.js
	app/submissions/submit-design-files/submit-design-files.controller.js
	webpack.config.js
@vikasrohit vikasrohit merged commit 1ec6a45 into dev Jun 13, 2016
@vikasrohit vikasrohit deleted the feature/filestack-int branch August 3, 2016 06:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant