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

Qa integration #593

Merged
merged 92 commits into from
Dec 2, 2015
Merged

Qa integration #593

merged 92 commits into from
Dec 2, 2015

Conversation

tladendo
Copy link
Contributor

@tladendo tladendo commented Dec 2, 2015

No description provided.

vikasrohit and others added 30 commits October 5, 2015 17:22
-- Added option to add web link in UI. Seems like API don't have support for adding web links as of now.
Conflicts:
	app/directives/external-account/external-account.directive.js
	app/services/user.service.js
Merge branch 'feature/sup-1611-web-link-support-ui' into feature/sup-2481-intergrate-web-links-api

* feature/sup-1611-web-link-support-ui:
  more fixes
  major refactoring, moving data processing to services
  SUP-1611, Settings: Support adding an external web link.

Conflicts:
	app/directives/challenge-tile/challenge-tile.directive.jade
	app/directives/external-account/external-account.directive.js
	app/directives/external-account/external-link-data.directive.jade
	app/profile/about/about.jade
	app/settings/edit-profile/edit-profile.controller.js
	app/specs.html
-- Added more unit tests
-- Fixed existing unit tests
-- Fixed UI for Adding link
* dev:
  Update
  Fix search bar, styling and placement  of user handle
  Move footer links to bottom of mobile nav, style white
  Fix formatting
  Fix import
  adjusted winner ribbon positioning
  Fix test
  Remove stopPropagation
  fixed srm calc
  fixed some design card display stuff
  Prevent the section from flickering
  quick fix
  more nav styling changes
  removing "only" from tests and fixing logout
  redirecting logout to home page, removing cookies etc
  SUP-2272, Profile--> Remove the mouse hover from profile image.
  SUP-2420, SiteMap--> Remove the 'Footer' section.
  Finished nav basics
  placeholder
  logo 'beta' tag css fix
-- More unit tests
-- Fixed removeLink method in externalLinks.service.js
* dev: (25 commits)
  removed extra <git>
  fixed JADE style spacing; css clean, added helper classes for spacings (margin)
  button spacing fixed
  form > p style fixed
  back on track container style added, consistent with everything else.
  added .csscomb.json; fixed password style
  fixing the password styles
  Format and remove console logs
  iff -> ternary
  Add styleguide generator
  Hide money if 0
  Fix alignment for srm cards
  Remove flex on mobile and add vertical align
  SUP-2577, Bug Hunt should show wins not ratings as the main metric in profile and dashboard
  SUP-2599, Change copy on empty state for dashboard
  buncha new tests
  Change 2 links to use states
  Add includes and proper variables
  SUP-2582, Upcoming SRMs should be ordered by most recent date
  SUP-2582, Upcoming SRMs should be ordered by most recent date
  ...
-- Removed description field from the card.
-- Ellipsis the text for title field in the data card. Unable to do the same for hyperlink (URL field) because the angular-ellipsis is not working for it.
-- Fixed determination of pending status for an external account. It was using wrong field to set pending status. Came across this issue while debugging for SUP-2479
-- Fixed existing unit tests and added new for pending status fix
-- Code review changes
-- Fixed NPE when a new external account is added.
* dev:
  updating version
  fix for SUP-2224
  Fixed broken tests
  added extra check
  addressed comment
  One more change
  margin change
  Update version of ng-iso-constants
  made changes as per vic
  Some fixes
  Added front end sorting for history graph
  Cleanup
  Fixed image count
  SUP-2577, Bug Hunt should show wins not ratings as the main metric in profile and dashboard
  Fixed track and subtrack ordering
  SUP-2398, Skill Picker-->'Done' button is getting enabled for fraction of second after clicking on to done the informations.
  don't open community links in new window
-- More tests for external account directive (now it includes link and unlink method too)
-- Fixed CSS for mobile and desktop view
-- Fixed issue where added link was not visible immediately after addition
-- Handled already added link error
* dev:
  generic math icon added
  small fixes with missing IDs
  SUP-2729, Publish unit test results with build
  SUP-2729, Publish unit test results with build
  SUP-2673, Integrate with TravisCI
  SUP-2673, Integrate with TravisCI
  SUP-2673, Integrate with TravisCI
  skill icons updated
  removed hover for selected tab on subtrack
  Updated members of the month
  Mysterious solution because abs positioning is weird w/ flex
  cleanup
  Added reliability link for development
  Try to gzip css too
  Add styleguide folder to .gitignore
  switched to lodash sort
  Added sorting of submissions by placement
  SUP-2673, Integrate with TravisCI
  SUP-2486, Sticky header on profile is not working on Firefox
…-picker

SUP-2740, [Registration] Typo on reg skill picker
Nick Litwin and others added 28 commits November 30, 2015 13:53
-- Fixed unit tests to use correct base url for Auth APIs
…eblink-support-ut-fix

SUP-2481, intergrate-web-links-api
…remove-scroll-event-listener

SUP-2757, Remove scroll listener for tc-sticky directive to avoid memory leak
…eblink

SUP-2791, Weblink-->Not able to add domain.com as web link

-- Fixed URL pattern. Used from ASP code.
…eblink-support-url-pattern-fix

External Web Link Support:  Fixed URL pattern

Merging to get it QA'ed asap.
tladendo added a commit that referenced this pull request Dec 2, 2015
@tladendo tladendo merged commit d3de5aa into master Dec 2, 2015
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