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

Test QA merge in travis #713

Merged
merged 105 commits into from
Feb 4, 2016
Merged

Test QA merge in travis #713

merged 105 commits into from
Feb 4, 2016

Conversation

nlitwin
Copy link
Contributor

@nlitwin nlitwin commented Feb 4, 2016

No description provided.

Nick Litwin and others added 30 commits January 24, 2016 21:59
-- Fixed member profile page to work according to the web pack restructuring.
-- Removed ngsticky because IMO, we are not using it anywhere. In case we need it again, I have it forked and published, as tc-ngsticky  npm package, with latest version for us.
-- >>Fork angular-intro and replace "intro" with "intro.js" on line 3 of angular-intro.js/src/angular-intro.js<< Done this but not sure why do we need it.
-- >>Use a different library for xml2js thats from NPM<< Used Leonidas-from-XIV/node-xml2js library to parse xml to JSON. IMO, it is used only in blog service.
-- >>Figure out why the error "Cannot read property 'split' of null" is happening from the angular-ellipsis library (account.title in linkedAccountsData null?)<< Fixed it. It was a bug in angular-ellipsis which is fixed in the original repo but the npm package still points to older version. Created new npm package, tc-angular-ellipsis , for pointing to latest version.
-- Fixed skills images to point to correct url
-- adding missing file from previous commit.
nlitwin and others added 28 commits February 2, 2016 18:14
Add correct encrypted keys and secrets for qa and production
Delete moment-timezone from scripts folder and use npm, fix image paths
* 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
fixed text-overrun issues in IE11 - issue 676
…nge-name-progress-bar

SUP-3048, [subflow] New Submit - Issue with sync on flow
…ssion-progress-bar

SUP-3047, [subflow] New Submit - Should be "Lose" not "Loose" Typo
nlitwin added a commit that referenced this pull request Feb 4, 2016
@nlitwin nlitwin merged commit 4caa756 into qa-integration Feb 4, 2016
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.

4 participants