Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop: (84 commits)
  [version]
  [version]
  [tracking-links] [js] [fix] Register JS event handlers for the tracking links only when the user is registered.
  [translations] [update]
  [translations] Replaced 'ja_JP' (Japanese) translation with 'ja' one since 'ja_JP' is not in use at the WP project.
  [css] [compile]
  [deactivation-feedback-form] [ui] Adjusted the cancel button to be also a secondary button.
  [extensions-tracking] [refactor] Shorten the method name.
  [extensions-tracking] [refactor] Use the helper method instead of accessing the storage directly.
  [refactor] Configured the 'is_extensions_tracking_allowed' flag storage level in the storage class.
  [ms] When network-deleting an account, do not delete delegated installs.
  [extensions-tracking] Added a helper method for storing the relevant flag's value so that it would also work with multisite.
  [connect] [js-fix] [minor]
  [connect] [enrich] Added 2 actions to allow developers wrapping the opt-in template with custom HTML.
  [wp-js-coding-standards] [minor] Added spacing inside parentheses.
  [opt-out-form] [ui] [minor]
  [tracking-links] [fix] Don't add tracking links for premium-only products that were opted-in by relation (add-on or a parent product) before activating any license.
  [modal] [ui] Align all dash icons in FS modals to the middle.
  [updates] If the user opted-out from tracking, honor their request and do not automatically check for paid product updates in the background.
  [license-activation-form] [optimization] No need to execute the logic on every key stroke, instead, execute it once the user stops typing for at least 200 ms.
  ...

# Conflicts:
#	start.php
  • Loading branch information
vovafeldman committed Dec 18, 2019
2 parents d033b76 + a652aba commit dc6f3da
Show file tree
Hide file tree
Showing 37 changed files with 4,077 additions and 2,681 deletions.
2 changes: 1 addition & 1 deletion assets/css/admin/account.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions assets/css/admin/common.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit dc6f3da

Please sign in to comment.