Skip to content

Commit

Permalink
Merge pull request #1770 from rtCamp/develop
Browse files Browse the repository at this point in the history
Version Update v4.6.8
  • Loading branch information
SID177 authored Oct 25, 2021
2 parents ec78f24 + 185ae70 commit 90c4d1c
Show file tree
Hide file tree
Showing 35 changed files with 447 additions and 198 deletions.
33 changes: 33 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
---
name: Bug report
about: Create a bug to help us improve
title: ''
labels: ''
assignees: kjnanda

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots or Visual**
If applicable, add screenshots or visual to help explain your problem.

**Test Environment Used**
- WordPress: [e.g V5.3]
- BuddyPress: [e.g. V5.1.2]
- rtMedia [e.g. V4.5.1]
- Browser [e.g. stock browser, safari]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: enhancement, feature-request
assignees: kjnanda

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I would like the feature when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v12.16.1
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This guide details how to use issues and pull requests to improve rtMedia.

## Closing policy for issues

Github issue-tracker is used **only** for developer & contributor discussion.
GitHub issue-tracker is used **only** for developer & contributor discussion.

For support-request/feature-request, please use - https://rtmedia.io/support/

Expand Down
87 changes: 47 additions & 40 deletions README.md

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions app/admin/RTMediaAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public function __construct() {
);
add_action( 'wp_ajax_rtmedia_hide_premium_addon_notice', array( $this, 'rtmedia_hide_premium_addon_notice' ), 1 );

new RTMediaMediaSizeImporter(); // do not delete this line. We only need to create object of this class if we are in admin section.
new RTMediaMediaSizeImporter(); // Do not delete this line. We only need to create object of this class if we are in admin section.
if ( class_exists( 'BuddyPress' ) ) {
new RTMediaActivityUpgrade();
}
Expand Down Expand Up @@ -354,7 +354,7 @@ public function rtmedia_premium_addon_notice() {
);
?>
</span>
<a href="#" onclick="rtmedia_hide_premium_addon_notice('<?php echo esc_js( wp_create_nonce( 'rtcamp_pro_split' ) ); ?>');" style="float:right"><?php esc_html_e( 'Dismiss', 'buddypress-media' ); ?>></a>
<a href="#" onclick="rtmedia_hide_premium_addon_notice('<?php echo esc_js( wp_create_nonce( 'rtcamp_pro_split' ) ); ?>');" style="float:right"><?php esc_html_e( 'Dismiss', 'buddypress-media' ); ?></a>
</p>
</div>
<script type="text/javascript">
Expand Down Expand Up @@ -535,50 +535,50 @@ function rtmedia_hide_addon_update_notice() {
public function check_for_addon_update_notice() {
$return_flag = false;

// check for rtMedia Instagram version.
// Check for rtMedia Instagram version.
if ( defined( 'RTMEDIA_INSTAGRAM_PATH' ) ) {
$plugin_info = get_plugin_data( RTMEDIA_INSTAGRAM_PATH . 'index.php' );
if ( isset( $plugin_info['Version'] ) && ( - 1 === version_compare( $plugin_info['Version'], '2.1.14' ) ) ) {
$return_flag = true;
}
} elseif ( defined( 'RTMEDIA_PHOTO_TAGGING_PATH' ) ) {
// check for rtMedia Photo Tagging version.
// Check for rtMedia Photo Tagging version.
$plugin_info = get_plugin_data( RTMEDIA_PHOTO_TAGGING_PATH . 'index.php' );
if ( isset( $plugin_info['Version'] ) && ( - 1 === version_compare( $plugin_info['Version'], '2.2.14' ) ) ) {
$return_flag = true;
}
} elseif ( defined( 'RTMEDIA_FFMPEG_PATH' ) ) {
// check for rtMedia FFPMEG version.
// Check for rtMedia FFPMEG version.
$plugin_info = get_plugin_data( RTMEDIA_FFMPEG_PATH . 'index.php' );
if ( isset( $plugin_info['Version'] ) && ( - 1 === version_compare( $plugin_info['Version'], '2.1.14' ) ) ) {
$return_flag = true;
}
} elseif ( defined( 'RTMEDIA_KALTURA_PATH' ) ) {
// check for rtMedia Kaltura version.
// Check for rtMedia Kaltura version.
$plugin_info = get_plugin_data( RTMEDIA_KALTURA_PATH . 'index.php' );
if ( isset( $plugin_info['Version'] ) && ( - 1 === version_compare( $plugin_info['Version'], '3.0.16' ) ) ) {
$return_flag = true;
}
} elseif ( defined( 'RTMEDIA_PRO_PATH' ) ) {
// check for rtMedia Pro version.
// Check for rtMedia Pro version.
$plugin_info = get_plugin_data( RTMEDIA_PRO_PATH . 'index.php' );
if ( isset( $plugin_info['Version'] ) && ( - 1 === version_compare( $plugin_info['Version'], '2.6' ) ) ) {
$return_flag = true;
}
} elseif ( defined( 'RTMEDIA_SOCIAL_SYNC_PATH' ) ) {
// check for rtMedia Social Sync version.
// Check for rtMedia Social Sync version.
$plugin_info = get_plugin_data( RTMEDIA_SOCIAL_SYNC_PATH . 'index.php' );
if ( isset( $plugin_info['Version'] ) && ( - 1 === version_compare( $plugin_info['Version'], '1.3.1' ) ) ) {
$return_flag = true;
}
} elseif ( defined( 'RTMEDIA_MEMBERSHIP_PATH' ) ) {
// check for rtMedia Membership version.
// Check for rtMedia Membership version.
$plugin_info = get_plugin_data( RTMEDIA_MEMBERSHIP_PATH . 'index.php' );
if ( isset( $plugin_info['Version'] ) && ( - 1 === version_compare( $plugin_info['Version'], '2.1.5' ) ) ) {
$return_flag = true;
}
} elseif ( defined( 'RTMEDIA_WATERMARK_PATH' ) ) {
// check for rtMedia Photo Watermak version.
// Check for rtMedia Photo Watermak version.
$plugin_info = get_plugin_data( RTMEDIA_WATERMARK_PATH . 'index.php' );
if ( isset( $plugin_info['Version'] ) && ( - 1 === version_compare( $plugin_info['Version'], '1.1.8' ) ) ) {
$return_flag = true;
Expand Down
2 changes: 1 addition & 1 deletion app/admin/RTMediaUploadTermsAdmin.php
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ public function admin_setting_add_terms_option( $render_options, $options ) {
),
'group' => 40,
);
// add extra field for admin setting.
// Add extra field for admin setting.
$render_options['general_upload_terms_message'] = array(
'title' => __( 'Terms of Service Message', 'buddypress-media' ),
'callback' => array( 'RTMediaFormHandler', 'textbox' ),
Expand Down
1 change: 1 addition & 0 deletions app/assets/admin/css/admin.css.map

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

1 change: 1 addition & 0 deletions app/assets/admin/css/admin.min.css.map

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

1 change: 1 addition & 0 deletions app/assets/admin/css/widget.css.map

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

1 change: 1 addition & 0 deletions app/assets/admin/css/widget.min.css.map

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

Loading

0 comments on commit 90c4d1c

Please sign in to comment.