Merge branch 'release/1.5'

crowdfavorite · Dec 26, 2013 · 065c0d0 · 065c0d0
2 parents 64fd7e0 + a3b34ae
commit 065c0d0
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,8 +1,14 @@
 # FavePersonal
 
+## Version 1.5
+
+- (change) Update the included Social plugin to version 2.10 (fixes threaded comments)
+- (change) Update the included Post Formats Admin UI plugin to version 1.3.1 (WP 3.8 admin UI)
+- (change) Update the included CF Colors plugin to version 2.1 (WP 3.8 admin UI)
+- (change) admin UI refresh for WordPress 3.8 compatibility
+
 ## Version 1.4.1
 
-- (announce) First release on WordPress.org
 - (change) Update the included Post Formats Admin UI plugin to version 1.2
 
 ## Version 1.4

diff --git a/assets/css/admin.css b/assets/css/admin.css
@@ -41,7 +41,6 @@ Used for common styles across all admin pages
 .cf-elm-block {
 	clear: both;
 	margin: 10px 0;
-	padding: 3px 5px;
 	border-radius: 5px;
 	-moz-border-radius: 5px;
 	-webkit-border-radius: 5px;

diff --git a/functions.php b/functions.php
@@ -37,7 +37,7 @@
 /**
  * Theme version.
  */
-define('CFCT_THEME_VERSION', '1.4.1');
+define('CFCT_THEME_VERSION', '1.5');
 
 /**
  * Theme URL version.

diff --git a/plugins/cf-colors b/plugins/cf-colors
diff --git a/plugins/cf-post-formats b/plugins/cf-post-formats
diff --git a/plugins/social b/plugins/social
diff --git a/style.css b/style.css
@@ -2,7 +2,7 @@
  * Theme Name: FavePersonal
  * Theme URI: http://crowdfavorite.com/favepersonal/
  * Description: A personal and customizable theme perfect for your personal site. Customizable colors from COLOURlovers, social network integrations, baked-in mobile and tablet device support, unique post format display styles and much more.
- * Version: 1.4.1
+ * Version: 1.5
  * Author: Crowd Favorite
  * Author URI: http://crowdfavorite.com/
  * License: GNU General Public License
+4 −0		CHANGELOG.txt
+2 −2		cf-colors.php
+7 −11		css/admin.css
+8 −0		CHANGELOG.txt
+2 −2		cf-post-formats.php
+20 −23		css/admin.css
+105 −76		README.md
+22 −12		README.txt
+12 −2		assets/admin.css
+ −		assets/child-account-bullet.gif
+ −		assets/like.png
+ −		assets/mailchimp.png
+ −		assets/retweet.png
+ −		assets/social.png
+ −		assets/sprite-y-24-icons.png
+ −		lang/social-es_ES.mo
+ −		lang/social-ja.mo
+1,145 −0		lang/social-ja.po
+2 −2		lib/social/controller/cron.php
+2 −2		lib/social/controller/settings.php
+3 −2		lib/social/semaphore.php
+2 −1		lib/social/service.php
+5 −5		lib/social/walker/comment.php
+ −		screenshot-1.png
+ −		screenshot-2.png
+ −		screenshot-3.png
+ −		screenshot-4.png
+8 −8		social.php
+5 −12		views/wp-admin/options.php
+1 −1		views/wp-admin/parts/accounts.php