Skip to content

Commit 9f95b4e

Browse files
author
Rodrigo Gomez Palacio
authored
Merge pull request #336 from OneSignal/3.0.2
3.0.2
2 parents a387dd1 + e0a7090 commit 9f95b4e

File tree

5 files changed

+89
-5
lines changed

5 files changed

+89
-5
lines changed

.gitignore

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
ChromePhp.php
2+
onesignal-free-web-push-notifications.zip
3+
views/images/settings/ParseToOneSignal.png
4+
.vscode/
5+
6+
.map
7+
**/*.map
8+
onesignal-free-push-notifications.zip
9+
10+
### JetBrains template
11+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
12+
13+
*.iml
14+
15+
## Directory-based project format:
16+
.idea/
17+
# if you remove the above rule, at least ignore the following:
18+
19+
# User-specific stuff:
20+
# .idea/workspace.xml
21+
# .idea/tasks.xml
22+
# .idea/dictionaries
23+
24+
# Sensitive or high-churn files:
25+
# .idea/dataSources.ids
26+
# .idea/dataSources.xml
27+
# .idea/sqlDataSources.xml
28+
# .idea/dynamic.xml
29+
# .idea/uiDesigner.xml
30+
31+
# Gradle:
32+
# .idea/gradle.xml
33+
# .idea/libraries
34+
35+
# Mongo Explorer plugin:
36+
# .idea/mongoSettings.xml
37+
38+
## File-based project format:
39+
*.ipr
40+
*.iws
41+
42+
## Plugin-specific files:
43+
44+
# IntelliJ
45+
/out/
46+
47+
# mpeltonen/sbt-idea plugin
48+
.idea_modules/
49+
50+
# JIRA plugin
51+
atlassian-ide-plugin.xml
52+
53+
# Crashlytics plugin (for Android Studio and IntelliJ)
54+
com_crashlytics_export_strings.xml
55+
crashlytics.properties
56+
crashlytics-build.properties
57+
58+
# Created by .ignore support plugin (hsz.mobi)
59+
60+
.DS_Store
61+
62+
onesignal-extra.php
63+
64+
docker-instance-files/*
65+
# Expection to the rule as we need this files to modify plugin upload limits
66+
!uploads.ini

onesignal.php

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Plugin Name: OneSignal Push Notifications
77
* Plugin URI: https://onesignal.com/
88
* Description: Free web push notifications.
9-
* Version: 3.0.1
9+
* Version: 3.0.2
1010
* Author: OneSignal
1111
* Author URI: https://onesignal.com
1212
* License: MIT
@@ -54,4 +54,15 @@
5454
// Initialize V2 admin and public components
5555
add_action('init', ['OneSignal_Admin', 'init']);
5656
add_action('init', ['OneSignal_Public', 'init']);
57+
add_action('admin_notices', 'migration_notice');
58+
}
59+
60+
function migration_notice() {
61+
// Only show the notice on the Plugins page
62+
$screen = get_current_screen();
63+
if ($screen && $screen->id === 'plugins') {
64+
echo '<div class="notice notice-warning is-dismissible">
65+
<p><strong>OneSignal Migration Needed:</strong> All OneSignal prompt configurations are moving to OneSignal.com. See the plugin page for more info.</p>
66+
</div>';
67+
}
5768
}

readme.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Donate link: https://onesignal.com
44
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
55
Requires at least: 3.8
66
Tested up to: 6.7
7-
Stable tag: 3.0.1
7+
Stable tag: 3.0.2
88
License: GPLv2 or later
99
License URI: http://www.gnu.org/licenses/gpl-2.0.html
1010

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

6565
== Changelog ==
6666

67+
= 3.0.2 =
68+
- Adding an admin notice and updated styles to encourage settings migration.
69+
6770
= 3.0.1 =
6871
WARNING: this update contains changes that may break specific setups, as detailed below:
6972

v2/views/config.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,15 @@
6565
<div id="migration-confirmation-modal" class="ui modal">
6666
<div class="header">Confirm Migration</div>
6767
<div class="content">
68-
<p>Are you sure you want to mark the plugin as migrated? This action is irreversible.</p>
68+
<span class="onesignal-error-notice">
69+
This action is irreversible.
70+
</span><br/><br/>
71+
<p>By confirming the migration, you confirm that you have configured your prompt settings on the OneSignal.com dashboard.</p>
72+
<p>Are you sure you want to mark the plugin as migrated?</p>
6973
</div>
7074
<div class="actions">
7175
<button class="ui cancel button">Cancel</button>
72-
<button class="ui approve button" id="confirm-migration-submit">Confirm</button>
76+
<button class="ui approve button" id="confirm-migration-submit" style="background-color:#E54B4D">Confirm</button>
7377
</div>
7478
</div>
7579

v2/views/css/site.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)