Merge pull request #262 from MachoThemes/master

1.2.2 update

Author: cristianraiber

.DS_Store

@@ -0,0 +1,11 @@
+node_modules/*
+.idea/*
+.jscsrc
+.jshintignore
+.jshintrc
+.travis.yml
+Gruntfile.js
+phpcs.ruleset.xml
+.standard.json
+shapely.zip
+package-lock.json

.gitignore

@@ -4,7 +4,8 @@
   "excludeFiles": [
     "assets/js/**.min.js",
     "assets/js/owl-carousel/*",
-    "assets/js/dev/*"
+    "assets/js/dev/*",
+    "assets/js/**"
   ],
   "maxErrors": Infinity
-}
+}

.jscsrc

@@ -19,10 +19,11 @@
     "wp": false,
     "WPUrls": false,
     "Masonry": false,
-    "Vimeo" : false,
-    "shapelyWelcomeScreenObject" : false,
+    "Vimeo": false,
     "console": false,
-    "shapelyWelcomeScreenCustomizerObject" : false,
-    "ShapelyBuilder" : false
+    "shapelyWelcomeScreenCustomizerObject": false,
+    "shapelyWelcomeScreenObject": false,
+    "ShapelyAdminObject": false,
+    "ShapelyBuilder": false
   }
 }

.jshintrc

@@ -1,10 +1,9 @@
 sudo: false
 language: php
-dist: precise
+dist: trusty
 matrix:
   fast_finish: true
   include:
-  - php: '5.3'
   - php: '5.4'
   - php: '5.5'
   - php: '5.6'
@@ -72,4 +71,4 @@ deploy:
   file: shapely.zip
   on:
     branch: master
-    repo: puikinsh/shapely
+    repo: puikinsh/shapely

.travis.yml

@@ -12,6 +12,8 @@
 if ( 'sidebar-left' == $layout_class ) :
 	get_sidebar();
 endif;
+
+
 ?>
 	<div id="primary" class="content-area col-md-8 mb-xs-24 <?php echo esc_attr( $layout_class ); ?>">
 		<main id="main" class="site-main" role="main">
@@ -49,8 +51,15 @@
 						<div class="image-tile inner-title hover-reveal text-center" style="<?php echo $item_style; ?>">
 							<?php
 							if ( has_post_thumbnail() ) {
+
+								$portfolio_custom_url = get_post_meta( get_the_ID(), 'shapely_companion_portfolio_link', true );
+
+								if ( ! $portfolio_custom_url ) {
+									$portfolio_custom_url = get_the_permalink();
+								}
+
 								?>
-								<a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>">
+								<a href="<?php echo esc_url( $portfolio_custom_url ); ?>" title="<?php the_title_attribute(); ?>">
 									<?php
 									if ( 'mansonry' == $layout ) {
 										the_post_thumbnail( 'medium' );
@@ -70,7 +79,7 @@
 							?>
 						</div>
 					</article><!-- #post-## -->
-					<?php
+				<?php
 
 				endwhile;