Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Geodirectory master #10

Merged
merged 4 commits into from
Mar 26, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions bp-compliments.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,28 @@
/**
* This is the main BuddyPress Compliments plugin file, here we declare and call the important stuff
*
* @since 0.0.1
* @package BuddyPress_Compliments
* @package BuddyPress_Compliments
* @copyright 2016 AyeCode Ltd
* @license GPL-2.0+
*
* @wordpress-plugin
* Plugin Name: BuddyPress Compliments
* Plugin URI: http://wpgeodirectory.com/
* Description: Compliments module for BuddyPress.
* Version: 1.0.5
* Author: GeoDirectory
* Author URI: http://wpgeodirectory.com
* Text Domain: bp-compliments
* Domain Path: /languages
* Requires at least: 3.1
* Tested up to: 4.4
*/

/*
Plugin Name: BuddyPress Compliments
Plugin URI: http://wpgeodirectory.com/
Description: Compliments module for BuddyPress.
Version: 1.0.4
Author: GeoDirectory
Author URI: http://wpgeodirectory.com
*/

// Exit if accessed directly
if ( !defined( 'ABSPATH' ) ) exit;

// Define the plugin version.
define( 'BP_COMPLIMENTS_VER', '1.0.4' );
define( 'BP_COMPLIMENTS_VER', '1.0.5' );

/**
* BuddyPress compliments text domain.
Expand Down
Binary file modified languages/bp-compliments-en_US.mo
Binary file not shown.
28 changes: 14 additions & 14 deletions languages/bp-compliments-en_US.po
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
msgid ""
msgstr ""
"Project-Id-Version: BuddyPress Compliments 1.0.3\n"
"POT-Creation-Date: 2016-02-25 14:58-0000\n"
"PO-Revision-Date: 2016-02-25 14:58-0000\n"
"Project-Id-Version: BuddyPress Compliments 1.0.5\n"
"POT-Creation-Date: 2016-03-11 11:11-0000\n"
"PO-Revision-Date: 2016-03-11 11:11-0000\n"
"Last-Translator: \n"
"Language-Team: GeoDirectory <[email protected]>\n"
"Language: en_US\n"
Expand Down Expand Up @@ -99,20 +99,20 @@ msgid "No compliments found."
msgstr ""

#: includes/bp-compliments-notifications.php:49
#: includes/bp-compliments-notifications.php:188
#: includes/bp-compliments-notifications.php:178
#, php-format
msgid "%s has sent you a %s"
msgstr ""

#: includes/bp-compliments-notifications.php:191
#: includes/bp-compliments-notifications.php:181
#, php-format
msgid ""
"%s has sent you a %s.\n"
"\n"
"To view %s's %s: %s"
msgstr ""

#: includes/bp-compliments-notifications.php:198
#: includes/bp-compliments-notifications.php:188
#, php-format
msgid ""
"\n"
Expand All @@ -122,21 +122,21 @@ msgid ""
"%s"
msgstr ""

#: includes/bp-compliments-notifications.php:281
#: includes/bp-compliments-notifications.php:271
#: includes/bp-compliments-settings.php:89
#: includes/bp-compliments-settings.php:98
#: includes/bp-compliments-settings.php:107
msgid "Yes"
msgstr ""

#: includes/bp-compliments-notifications.php:282
#: includes/bp-compliments-notifications.php:272
#: includes/bp-compliments-settings.php:90
#: includes/bp-compliments-settings.php:99
#: includes/bp-compliments-settings.php:108
msgid "No"
msgstr ""

#: includes/bp-compliments-notifications.php:289
#: includes/bp-compliments-notifications.php:279
#, php-format
msgid "A member sends you a %s"
msgstr ""
Expand Down Expand Up @@ -316,27 +316,27 @@ msgstr ""
msgid "Delete"
msgstr ""

#: includes/templates/buddypress/members/single/compliments.php:133
#: includes/templates/buddypress/members/single/compliments.php:134
#, php-format
msgid "1 of 1"
msgid_plural "%1$s to %2$s of %3$s"
msgstr[0] ""
msgstr[1] ""

#: includes/templates/buddypress/members/single/compliments.php:136
#: includes/templates/buddypress/members/single/compliments.php:137
msgid "Go to Page"
msgstr ""

#: includes/templates/buddypress/members/single/compliments.php:152
#: includes/templates/buddypress/members/single/compliments.php:153
msgid "You don't have permission to access this page."
msgstr ""

#: includes/templates/buddypress/members/single/compliments.php:159
#: includes/templates/buddypress/members/single/compliments.php:160
#, php-format
msgid "Aw, you have no %1$s yet. To get some try sending %1$s to others."
msgstr ""

#: includes/templates/buddypress/members/single/compliments.php:165
#: includes/templates/buddypress/members/single/compliments.php:166
#, php-format
msgid "Sorry, no %1$s just yet."
msgstr ""
12 changes: 8 additions & 4 deletions readme.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
=== BuddyPress Compliments ===
Contributors: viruthagiri, stiofansisland, paoltaia
Donate link: http://wpgeodirectory.com/
Tags: buddypress, buddypress compliments, wordpress yelp compliments, buddypress integration, business directory plugin, directory, directory plugin, geodirectory, geodirectory buddypress, geodirectory buddypress integration, social network, yelp clone, yelp compliments
Tags: buddypress, buddypress compliments, WordPress yelp compliments, buddypress integration, business directory plugin, directory, directory plugin, geodirectory, geodirectory buddypress, geodirectory buddypress integration, social network, yelp clone, yelp compliments
Requires at least: 3.1
Tested up to: 4.3
Stable tag: 1.0.4
Tested up to: 4.4
Stable tag: 1.0.5
License: GPLv3
License URI: http://www.gnu.org/licenses/gpl-3.0.html

Expand All @@ -20,7 +20,7 @@ BuddyPress compliments adds a smart way for BuddyPress members to interact with
* When you click the Compliments button, a popup will show up with compliment types
* Submitted compliments will be visible in user's compliments section.
* Compliments can be set as private and visible only to the member receiving them.
* A notification is optioonally sent to the compliment receiving member.
* A notification is optionally sent to the compliment receiving member.
* Compliments can optionally be tracked in BuddyPress Activity
* Members can delete compliments received (option to prevent this available).
* Compliments are now paginated
Expand Down Expand Up @@ -72,6 +72,10 @@ No questions so far, but don't hesitate to ask!

== Changelog ==

= 1.0.5 =
Email notifications not working - FIXED
Compliment line break and clickable support removed. Use filter to override - CHANGED

= 1.0.4 =
Compliment user settings page - ADDED
Linebreaks are removed on compliment messages - FIXED
Expand Down