Merge pull request #50 from Codeinwp/production

Sync dev with production

Author: rodica-andronache

CHANGELOG.md

@@ -0,0 +1,19 @@
+
+### 2.0.1 - 12/07/2017
+**Changes:** 
+- Fixed issues with type number options not visible in Mozilla
+
+### 2.0.0 - 29/05/2017
+**Changes:** 
+- Added About FlyMag page
+- Redid upsells
+- Make frontpage images clickable
+
+### 1.10 - 03/06/2016
+**Changes:** 
+- Updated documentation link
+- Fixed issue with recommended plugin WPPR
+
+### 1.09 - 16/05/2016
+**Changes:** 
+ ### 1.07 - 15/01/2016 Changes: flymag Merge pull request #8 from abaicus/development !!! Changed author name and uri. ### 1.06 - 14/12/2015 Changes: flymag Fixed #2, Notice: the called constructor method for WP_Widget is deprecated flymag Added TGM plugin activator flymag Merge pull request #5 from abaicus/development Added TGM plugin activator flymag Closed #6. Added Upsells in customizer flymag Fixed TGM plugin activator. flymag Fixed Extra Widget Areas section text. flymag Merge pull request #7 from abaicus/development Closed #6. Added Upsells in customizer

functions.php

@@ -252,13 +252,10 @@ function flymag_setup() {
 				'deactivate_label' => esc_html__( 'Deactivate', 'flymag' ),
 				'content'                   => array(
 					array(
-						'slug'        => 'pirate-forms',
-					),
-					array(
-						'link'        => 'http://themeisle.com/plugins/easy-content-types/',
+						'slug'        => 'themeisle-companion',
 					),
 					array(
-						'slug'        => 'siteorigin-panels',
+						'slug'        => 'pirate-forms',
 					),
 					array(
 						'slug'        => 'intergeo-maps',
@@ -405,20 +402,11 @@ function flymag_customizer_custom_css() {
 function flymag_register_required_plugins() {
 	$plugins = array(
 		array(
-			'name'     => 'WP Product Review',
-			'slug'     => 'wp-product-review',
-			'required' => false,
-		),
-		array(
-			'name'     => 'Login customizer',
-			'slug'     => 'login-customizer',
-			'required' => false,
-		),
-		array(
-			'name'     => 'Intergeo Maps - Google Maps Plugin',
-			'slug'     => 'intergeo-maps',
+			'name'     => 'Orbit Fox',
+			'slug'     => 'themeisle-companion',
 			'required' => false,
 		),
+
 		array(
 			'name'     => 'Pirate Forms',
 			'slug'     => 'pirate-forms',

style.css

@@ -4,7 +4,7 @@ Theme URI: http://themeisle.com/themes/flymag/
 Author: Themeisle
 Author URI: http://themeisle.com
 Description: Flymag is a responsive magazine theme with a modern look. Flymag lets you use any of the 600+ Google Fonts, provides color options for a lot of the theme elements and also offers you some useful page templates. With Flymag you can easily build your front page magazine-layout using the built in widgets specifically designed for this task.
-Version: 2.0.1
+Version: 2.0.2
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: flymag