Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Oil 214 cpc spring #165

Merged
merged 37 commits into from
Jul 10, 2018
Merged

Oil 214 cpc spring #165

merged 37 commits into from
Jul 10, 2018

Conversation

subsend
Copy link
Contributor

@subsend subsend commented Jul 10, 2018

No description provided.

Awerkow-Schäfer, Dmitri and others added 30 commits July 4, 2018 16:58
…abels and remove documentation for obsolete labels
Awerkow-Schäfer, Dmitri added 3 commits July 10, 2018 14:02
* master:
  Trying to stabilize tests
  Increment version
  Adding new release 1.2.1-RELEASE
  Fixing e2e tests on old chromes
  Fixing e2e tests on ipads
  Trying to FIX e2e tests
  Fix review issues
  Dont try being smart
  Return gdpr_applies_globally value from config in ping response
  Rename api function to applyGDPR() for clarity
  Refactor for clarity of variable names
  Add test page for gdpr_applies config element
  Add setGdprApplies function
  no ticket: fix double invocation of tag management at startup
  add getVendorConsentData and getConsentDataString test for gdpr_applies
  when gdpr_applies should not render oil
  add gdpr_applies config to readme
  Rename file spelling Fix configuration load value Fix test
  add gdprApplies config and wire it to cookie

# Conflicts:
#	src/styles/cpc_standard.scss
#	test/e2e/advanced_settings_custom_purposes_test.js
#	test/test_constants.js
@coveralls
Copy link

Pull Request Test Coverage Report for Build 454

  • 0 of 0 changed or added relevant lines in 0 files are covered.
  • 218 unchanged lines in 1 file lost coverage.
  • Overall coverage increased (+0.1%) to 22.539%

Files with Coverage Reduction New Missed Lines %
dist/oil.bundle.js 218 22.54%
Totals Coverage Status
Change from base Build 412: 0.1%
Covered Lines: 919
Relevant Lines: 3274

💛 - Coveralls

@subsend subsend merged commit 14f75b4 into master Jul 10, 2018
@ltparis2018 ltparis2018 deleted the OIL-214-cpc-spring branch July 10, 2018 15:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants