Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop: (221 commits)
  [localization] [update]
  [version]
  [details-dialog] [optimization]
  [add-on] [dialog] Also check the premium releases count of an add-on when determining if it has any deployed versions.
  [first-time-path] Do not return an admin URL if the first-time path is empty.
  [ms] `get_sites()` should try to get the sites only when actually in a multisite environment.
  [storage-adjustment] Removed a redundant check.
  [storage-adjustment] [refactor] Aggregated and cleaned up the logic that handles storage changes when switching between site/network activations.
  [storage-adjustment] [refactor] Use "continue" instead of an if-else statement, for cleaner code.
  [storage-adjustment] [revert] Reverted an unnecessary change.
  [storage-adjustment] [refactor] [js-doc]
  [ms] Fixed an issue with the detection of network admin pages.
  [storage-adjustment] [minor]
  [storage-adjustment] [js] [refactor]
  [storage-adjustment] [refactor] When adjusting the storage options after changing the plugin activation type, set the install timestamp only if it's not yet set.
  [storage-adjustment] [refactor] Introduced a new network-level option that is used to decide if the storage should be adjusted.
  [network-storage] Updated the logic that decides which AJAX action to use when delegating the activation (`activate_license` or `network_activate`) and handled the setting of the network install and blog ID when delegating or skipping for all selected sites and there's already an install (any install).
  [storage-adjustment] [delegation] [refactor] When transitioning to network-level plugin activation/storage and there are installs that are not owned by the logged-in WP user, set the `is_delegated_connection` option for those sites to `true`.
  [plans] Fixed an issue with the retrieving of plan IDs that are still associated with installs on a multisite environment.
  [plans] Fixed an issue with the storing of plans after deleting an account.
  ...

# Conflicts:
#	start.php
#	templates/forms/deactivation/form.php
  • Loading branch information
vovafeldman committed Jun 5, 2019
2 parents a4cc02a + dfb9dc2 commit 5beaaab
Show file tree
Hide file tree
Showing 71 changed files with 10,566 additions and 6,470 deletions.
11 changes: 11 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Items to ignore when downloading a zip

.codeclimate.yml export-ignore
.git export-ignore
.github export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
gulpfile.js export-ignore
composer.json export-ignore
/assets/scss/ export-ignore
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ https://dashboard.freemius.com/register/

## Code Documentation

You can find the SDK's PHP-Doc documentation here:
https://codedoc.pub/freemius/wordpress-sdk/master/
You can find the SDK's documentation here:
https://freemius.com/help/documentation/wordpress-sdk/

## Initializing the SDK

Expand Down
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/add-ons.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion 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 5beaaab

Please sign in to comment.