Merge branch 'dev' of git://github.com/jigoshop/Jigoshop into dev

Conflicts: admin/write-panels/order-data-save.php admin/write-panels/order-data.php classes/jigoshop_product.class.php jigoshop_actions.php jigoshop_cron.php jigoshop_query.php jigoshop_template_functions.php jigoshop_templates.php shortcodes/cart.php
kdzwinel · Aug 26, 2011 · da8aeee · da8aeee
2 parents 9874d4c + 7adc0ff
commit da8aeee
Show file tree

Hide file tree

Showing 80 changed files with 3,479 additions and 1,624 deletions.
diff --git a/admin/jigoshop-admin-attributes.php b/admin/jigoshop-admin-attributes.php
@@ -4,14 +4,20 @@
  * 
  * The attributes section lets users add custom attributes to assign to products - they can also be used in the layered nav widgets.
  *
- * @author 		Jigowatt
- * @category 	Admin
- * @package 	JigoShop
+ * DISCLAIMER
+ *
+ * Do not edit or add directly to this file if you wish to upgrade Jigoshop to newer
+ * versions in the future. If you wish to customise Jigoshop core for your needs,
+ * please use our GitHub repository to publish essential changes for consideration.
+ *
+ * @package    Jigoshop
+ * @category   Admin
+ * @author     Jigowatt
+ * @copyright  Copyright (c) 2011 Jigowatt Ltd.
+ * @license    http://jigoshop.com/license/commercial-edition
  */
 
 /**
- * Attributes admin panel
- * 
  * Shows the created attributes and lets you add new ones.
  * The added attributes are stored in the database and can be used for layered navigation.
  *

diff --git a/admin/jigoshop-admin-dashboard.php b/admin/jigoshop-admin-dashboard.php
@@ -2,9 +2,17 @@
 /**
  * Functions used for displaying the jigoshop dashboard
  *
- * @author 		Jigowatt
- * @category 	Admin
- * @package 	JigoShop
+ * DISCLAIMER
+ *
+ * Do not edit or add directly to this file if you wish to upgrade Jigoshop to newer
+ * versions in the future. If you wish to customise Jigoshop core for your needs,
+ * please use our GitHub repository to publish essential changes for consideration.
+ *
+ * @package    Jigoshop
+ * @category   Admin
+ * @author     Jigowatt
+ * @copyright  Copyright (c) 2011 Jigowatt Ltd.
+ * @license    http://jigoshop.com/license/commercial-edition
  */
 
 /**
@@ -525,19 +533,20 @@ function showTooltip(x, y, contents) {
 				     			<li><a href="http://jigoshop.com/extend/extensions/"><?php _e('Jigoshop Extensions', 'jigoshop'); ?></a> &ndash; <?php _e('Extend Jigoshop with extra plugins and modules.', 'jigoshop'); ?></li>
 				     			<li><a href="http://jigoshop.com/extend/themes/"><?php _e('Jigoshop Themes', 'jigoshop'); ?></a> &ndash; <?php _e('Extend Jigoshop with themes.', 'jigoshop'); ?></li>
 				     			<li><a href="http://twitter.com/#!/jigoshop"><?php _e('@Jigoshop', 'jigoshop'); ?></a> &ndash; <?php _e('Follow us on Twitter.', 'jigoshop'); ?></li>
-				     			<li><a href="https://github.com/mikejolley/Jigoshop"><?php _e('Jigoshop on Github', 'jigoshop'); ?></a> &ndash; <?php _e('Help extend Jigoshop.', 'jigoshop'); ?></li>
+				     			<li><a href="https://github.com/jigoshop/Jigoshop"><?php _e('Jigoshop on Github', 'jigoshop'); ?></a> &ndash; <?php _e('Help extend Jigoshop.', 'jigoshop'); ?></li>
 				     			<li><a href="http://wordpress.org/extend/plugins/jigoshop/"><?php _e('Jigoshop on WordPress.org', 'jigoshop'); ?></a> &ndash; <?php _e('Leave us a rating!', 'jigoshop'); ?></li>
 				     		</ul>
 				     		<div class="social">
 
-				     			<h4 class="first"><?php _e('Show your support &amp; Help promote Jigoshop!', 'jigoshop'); ?></h4>
+				     			<h4 class="first"><?php _e('Jigoshop Project', 'jigoshop') ?></h4>
+				     			<p><?php _e('Join our growing developer community today, contribute to the jigoshop project via GitHub.') ?></p>
+
+				     			<p><a href="https://github.com/jigoshop/Jigoshop" class="gitforked-button gitforked-forks gitforked-watchers">Fork</a></p>
+				     			<script src="http://gitforked.com/api/1.1/button.js" type="text/javascript"></script>
+
+				     			<h4><?php _e('Jigoshop Social', 'jigoshop'); ?></h4>
 
-				     			<form action="https://www.paypal.com/cgi-bin/webscr" method="post" style="margin: 0 0 1em 0;">
-									<input type="hidden" name="cmd" value="_s-xclick">
-									<input type="hidden" name="hosted_button_id" value="TKRER2WH7UAD6">
-									<input type="image" src="https://www.paypalobjects.com/en_GB/i/btn/btn_donate_SM.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online." style="margin:0; padding:0; ">
-									<img alt="" border="0" src="https://www.paypalobjects.com/en_GB/i/scr/pixel.gif" width="1" height="1">
-								</form>
+				     			<div id="fb-root"></div><script src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script><fb:like href="http://jigoshop.com" send="true" layout="button_count" width="250" show_faces="true" action="like" font="arial"></fb:like>
 
 				     			<iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fjigoshop.com&amp;send=false&amp;layout=standard&amp;width=450&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font=segoe+ui&amp;height=24" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:450px; height:24px;" allowTransparency="true"></iframe>
 

diff --git a/admin/jigoshop-admin-post-types.php b/admin/jigoshop-admin-post-types.php
@@ -4,10 +4,17 @@
  *
  * These functions control columns in admin, and other admin interface bits 
  *
- * @author 		Jigowatt
- * @category 	Admin
- * @package 	JigoShop
- */
+ * DISCLAIMER
+ *
+ * Do not edit or add directly to this file if you wish to upgrade Jigoshop to newer
+ * versions in the future. If you wish to customise Jigoshop core for your needs,
+ * please use our GitHub repository to publish essential changes for consideration.
+ *
+ * @package    Jigoshop
+ * @category   Admin
+ * @author     Jigowatt
+ * @copyright  Copyright (c) 2011 Jigowatt Ltd.
+ * @license    http://jigoshop.com/license/commercial-edition
  
 /**
  * Custom columns

diff --git a/admin/jigoshop-admin-settings-options.php b/admin/jigoshop-admin-settings-options.php
@@ -1,4 +1,20 @@
 <?php
+/**
+ * $options_settings variable contains all the options used on the Jigoshop settings page
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add directly to this file if you wish to upgrade Jigoshop to newer
+ * versions in the future. If you wish to customise Jigoshop core for your needs,
+ * please use our GitHub repository to publish essential changes for consideration.
+ *
+ * @package    Jigoshop
+ * @category   Admin
+ * @author     Jigowatt
+ * @copyright  Copyright (c) 2011 Jigowatt Ltd.
+ * @license    http://jigoshop.com/license/commercial-edition
+ */
+
 /**
  * options_settings
  *