Merging with 0.9.3 branch

recprog · Jun 2, 2013 · ea6ce0b · ea6ce0b
1 parent 4be4bd0
commit ea6ce0b
Show file tree

Hide file tree

Showing 74 changed files with 1,773 additions and 1,138 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,10 @@
+language: php
+php:
+ - 5.3
+ - 5.4
+before_script:
+  - gem install sass
+  - gem install compass
+  - npm install -g grunt-cli
+  - npm install
+script: grunt test
diff --git a/404.php b/404.php
@@ -8,7 +8,7 @@
 	<div class="row">
 		<header>
 			<h1>
-			  <?php _e('Page Not Found', 'frank_theme'); ?>
+				<?php _e( 'Page Not Found', 'frank_theme' ); ?>
 			</h1>
 		</header>
 	</div>
@@ -17,18 +17,15 @@
 			<div class="six columns">
 					<p class="large">
 					<?php
-					  $home_link = sprintf('<a href="%s" title="%s">%s</a>',
-					                      home_url(),
-					                      get_bloginfo('name'),
-					                      _x('home', 'home_link_text', 'frank_theme'));
-					  echo sprintf(__('Unfortunately, the page you are looking for no longer exists or never existed in the first place. If you reached this page in error, you can go %s and start over.', 'frank_theme'), $home_link);
+						$home_link = sprintf( '<a href="%s" title="%s">%s</a>', home_url(), get_bloginfo( 'name' ), _x( 'home', 'home_link_text', 'frank_theme' ) );
+						echo sprintf( __( 'Unfortunately, the page you are looking for no longer exists or never existed in the first place. If you reached this page in error, you can go %s and start over.', 'frank_theme' ), $home_link );
 					?>
 					</p>
 				</div>
 				<div class="six columns search">
 					<p class="large">
 					<?php
-					  _e('If you believe this page exists, please try searching for the page in the search input below.', 'frank_theme');
+						_e( 'If you believe this page exists, please try searching for the page in the search input below.', 'frank_theme' );
 					?>
 					</p>
 					<?php get_search_form(); ?>

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -0,0 +1,15 @@
+PJ Onori <pj@somerandomdude.com>
+Jonathan Christopher <jonathandchr@gmail.com>
+Evster88 <evan.jacobs@brafton.com>
+Felix Holmgren <felix@sunnyzebra.com>
+Sebastian Grodzicki <sebastian@grodzicki.pl>
+Elliott Stocks <elliottstocks@hotmail.co.uk>
+Julián Porta <julian@porta.sh>
+Jeffrey Hearn <cowbellemoo@gmail.com>
+Chris Danek <chris@veboolabs.com>
+Brendan Tobolaski <btobolaski@aero.und.edu>
+Jérôme Pinguet <jerome@jerome.cc>
+Chris Bujok <chris.bujok@gmail.com>
+Boris Kuzmanov <boriskuzmanov2@gmail.com>
+JR Tashjian <jrtashjian@gmail.com>
+Peter Keating <peter@moov2.com>
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,14 @@
+#Frank Version History
+
+##0.9.3
+* Frank now uses [Grunt](http://gruntjs.com) for all automation tasks!
+	* Tons of optimization tools, WebP Image encoding, image optimization, SVG optimization, CSS optimization and JS opimization.
+	* Basic linting of Javascript. More to come in future versions.
+	* Deployment tools to remove all the development files for a clean WP theme.
+* More documentation added. Still a long way to go, but it's getting there.
+* Fixed home page loop bugs
+* Added option to remove WordPress version meta info
+
 ##0.9.2
 * Broke up the repository into two separate repos. The child theme now exists at [github.com/somerandomdude/frank-somerandomdude](https://github.com/somerandomdude/frank-somerandomdude)
 * Cleaned up the repo dramatically.
@@ -7,11 +18,11 @@
 * Fixed 404 template
 * Added individual IDs for comments
 * Made comments count in sidebar a link
-* Added simple image deferring Javascript (not included by default) 
+* Added simple image deferring Javascript (not included by default)
 * Fixed font size for unordered list within 3-up view
-* Fixed pagination margins 
+* Fixed pagination margins
 * Fixed list line-height in content section UI
-* Made the removal of script/style version URL parameter optional 
+* Made the removal of script/style version URL parameter optional
 * Moved core Javascript into parent theme (not included by default)
 * Text input placeholder replacements for IE
 * Added French translation

diff --git a/README.html b/README.html
diff --git a/README.md b/README.md
@@ -174,7 +174,7 @@ Frank has various widget spaces for you to customize your theme. Used correctly,
 Frank comes with some simple Javascript components that do not rely on jQuery. Unless your site has heavy *web-app-ish* features, it is strongly suggested to avoid using a framework.
 
 ####Install Alternative PHP Cache (APC)
-[APC](http://php.net/manual/en/book.apc.php) will provide significant performance increases if used correctly. There are plenty of guides for installing APC on [Google](https://www.google.com/search?q=Install+Alternative+PHP+Cache&aq=f&oq=Install+Alternative+PHP+Cache&aqs=chrome.0.57j0l3j62l2.1033&sugexp=chrome,mod=6&sourceid=chrome&ie=UTF-8#hl=en&tbo=d&sclient=psy-ab&q=Install+APC+for+PHP&oq=Install+APC+for+PHP&gs_l=serp.3..0l3j0i30.11068.14252.0.14581.16.11.5.0.0.0.200.1813.0j10j1.11.0.les%3Bepsugrpq1high.1.0.0...1.1.cOdurfjGwd0&pbx=1&bav=on.2,or.r_gc.r_pw.r_cp.r_qf.&fp=1ad8c242e1bf948a&bpcl=39967673&biw=1436&bih=783).
+[APC](http://php.net/manual/en/book.apc.php) will provide significant performance increases if used correctly. There are plenty of guides for installing APC on [Google](https://www.google.com/search?q=Install+Alternative+PHP+Cache&aq=f&oq=Install+Alternative+PHP+Cache&aqs=chrome.0.57j0l3j62l2.1033&sugexp=chrome,mod=6&sourceid=chrome&ie=UTF-8#hl=en&tbo=d&sclient=psy-ab&q=Install+APC+for+PHP&oq=Install+APC+for+PHP&gs_l=serp.3..0l3j0i30.11068.14252.0.14581.16.11.5.0.0.0.200.1813.0j10j1.11.0.les%3Bepsugrpq1high.1.0.0dist<<<...1.1.cOdurfjGwd0&pbx=1&bav=on.2,or.r_gc.r_pw.r_cp.r_qf.&fp=1ad8c242e1bf948a&bpcl=39967673&biw=1436&bih=783).
 
 ####Install W3 Total Cache (W3TC)
 [W3TC](http://wordpress.org/extend/plugins/w3-total-cache/) is the easiest way to take full advantage of APC. W3TC has a wide range of features, but if you build your theme correctly, you shouldn't need to use most of them.