Merge branch 'develop'

assets/js/all.js

@@ -489,7 +489,7 @@ this.oneil = this.oneil || {};
  * Licensed MIT (/blob/master/LICENSE.txt)
  */
 (function ($) { if (!$.support.cors && $.ajaxTransport && window.XDomainRequest) { var n = /^https?:\/\//i; var o = /^get|post$/i; var p = new RegExp('^' + location.protocol, 'i'); var q = /text\/html/i; var r = /\/json/i; var s = /\/xml/i; $.ajaxTransport('* text html xml json', function (i, j, k) { if (i.crossDomain && i.async && o.test(i.type) && n.test(i.url) && p.test(i.url)) { var l = null; var m = (j.dataType || '').toLowerCase(); return { send: function (f, g) { l = new XDomainRequest(); if (/^\d+$/.test(j.timeout)) { l.timeout = j.timeout } l.ontimeout = function () { g(500, 'timeout') }; l.onload = function () { var a = 'Content-Length: ' + l.responseText.length + '\r\nContent-Type: ' + l.contentType; var b = { code: 200, message: 'success' }; var c = { text: l.responseText }; try { if (m === 'html' || q.test(l.contentType)) { c.html = l.responseText } else if (m === 'json' || (m !== 'text' && r.test(l.contentType))) { try { c.json = $.parseJSON(l.responseText) } catch (e) { b.code = 500; b.message = 'parseerror' } } else if (m === 'xml' || (m !== 'text' && s.test(l.contentType))) { var d = new ActiveXObject('Microsoft.XMLDOM'); d.async = false; try { d.loadXML(l.responseText) } catch (e) { d = undefined } if (!d || !d.documentElement || d.getElementsByTagName('parsererror').length) { b.code = 500; b.message = 'parseerror'; throw 'Invalid XML: ' + l.responseText; } c.xml = d } } catch (parseMessage) { throw parseMessage; } finally { g(b.code, b.message, c, a) } }; l.onprogress = function () { }; l.onerror = function () { g(500, 'error', { text: l.responseText }) }; var h = ''; if (j.data) { h = ($.type(j.data) === 'string') ? j.data : $.param(j.data) } l.open(i.type, i.url); l.send(h) }, abort: function () { if (l) { l.abort() } } } } }) } })(jQuery);
-var stagingURL = 'http://ther29.com/2016/oneil';
+var stagingURL = 'http://oneilprint.flywheelsites.com';
 
 // Get Viewport Width
 $viewport = $(window).innerWidth();

assets/js/theme.js

@@ -1,4 +1,4 @@
-var stagingURL = 'http://ther29.com/2016/oneil';
+var stagingURL = 'http://oneilprint.flywheelsites.com';
 
 // Get Viewport Width
 $viewport = $(window).innerWidth();

functions.php

@@ -1,6 +1,6 @@
 <?php
 
-  define('PRELUDE_VERSION', '0.1.18');
+  define('PRELUDE_VERSION', '1.0.0');
 
   if ( !function_exists( 'prelude_features' ) ) {
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "oneil",
-  "version": "0.1.18",
+  "version": "1.0.0",
   "description": "A custom WordPress theme for O'neil Printing",
   "main": "index.php",
   "scripts": {

style.css

@@ -4,5 +4,5 @@ Theme URI:
 Author: Factor1
 Author URI: http://factor1studios.com
 Description: A custom WordPress theme for O'Neil Printing designed by Rule29 and developed by Factor1.
-Version: 0.1.18
+Version: 1.0.0
 */