Skip to content

Commit

Permalink
Merge pull request #336 from OneSignal/3.0.2
Browse files Browse the repository at this point in the history
3.0.2
  • Loading branch information
rgomezp authored Dec 20, 2024
2 parents a387dd1 + e0a7090 commit 9f95b4e
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 5 deletions.
66 changes: 66 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
ChromePhp.php
onesignal-free-web-push-notifications.zip
views/images/settings/ParseToOneSignal.png
.vscode/

.map
**/*.map
onesignal-free-push-notifications.zip

### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio

*.iml

## Directory-based project format:
.idea/
# if you remove the above rule, at least ignore the following:

# User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries

# Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

# Mongo Explorer plugin:
# .idea/mongoSettings.xml

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
/out/

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties

# Created by .ignore support plugin (hsz.mobi)

.DS_Store

onesignal-extra.php

docker-instance-files/*
# Expection to the rule as we need this files to modify plugin upload limits
!uploads.ini
13 changes: 12 additions & 1 deletion onesignal.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Plugin Name: OneSignal Push Notifications
* Plugin URI: https://onesignal.com/
* Description: Free web push notifications.
* Version: 3.0.1
* Version: 3.0.2
* Author: OneSignal
* Author URI: https://onesignal.com
* License: MIT
Expand Down Expand Up @@ -54,4 +54,15 @@
// Initialize V2 admin and public components
add_action('init', ['OneSignal_Admin', 'init']);
add_action('init', ['OneSignal_Public', 'init']);
add_action('admin_notices', 'migration_notice');
}

function migration_notice() {
// Only show the notice on the Plugins page
$screen = get_current_screen();
if ($screen && $screen->id === 'plugins') {
echo '<div class="notice notice-warning is-dismissible">
<p><strong>OneSignal Migration Needed:</strong> All OneSignal prompt configurations are moving to OneSignal.com. See the plugin page for more info.</p>
</div>';
}
}
5 changes: 4 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Donate link: https://onesignal.com
Tags: push notification, push notifications, desktop notifications, mobile notifications, chrome push, android, android notification, android notifications, android push, desktop notification, firefox, firefox push, mobile, mobile notification, notification, notifications, notify, onesignal, push, push messages, safari, safari push, web push, chrome
Requires at least: 3.8
Tested up to: 6.7
Stable tag: 3.0.1
Stable tag: 3.0.2
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -64,6 +64,9 @@ OneSignal is trusted by over 1.8M+ developers and marketing strategists. We powe

== Changelog ==

= 3.0.2 =
- Adding an admin notice and updated styles to encourage settings migration.

= 3.0.1 =
WARNING: this update contains changes that may break specific setups, as detailed below:

Expand Down
8 changes: 6 additions & 2 deletions v2/views/config.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,15 @@
<div id="migration-confirmation-modal" class="ui modal">
<div class="header">Confirm Migration</div>
<div class="content">
<p>Are you sure you want to mark the plugin as migrated? This action is irreversible.</p>
<span class="onesignal-error-notice">
This action is irreversible.
</span><br/><br/>
<p>By confirming the migration, you confirm that you have configured your prompt settings on the OneSignal.com dashboard.</p>
<p>Are you sure you want to mark the plugin as migrated?</p>
</div>
<div class="actions">
<button class="ui cancel button">Cancel</button>
<button class="ui approve button" id="confirm-migration-submit">Confirm</button>
<button class="ui approve button" id="confirm-migration-submit" style="background-color:#E54B4D">Confirm</button>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion v2/views/css/site.css

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

0 comments on commit 9f95b4e

Please sign in to comment.