WP-Themes/jollylama.git
8 years agoMerge tag 'v1.1.8' into develop
Steve Sutton [Wed, 28 Dec 2016 16:58:35 +0000 (11:58 -0500)]
Merge tag 'v1.1.8' into develop

Version 1.1.8

8 years agoMerge branch 'hotfix/1.1.8' v1.1.8
Steve Sutton [Wed, 28 Dec 2016 16:58:27 +0000 (11:58 -0500)]
Merge branch 'hotfix/1.1.8'

8 years agoUpdate footer for sharethis call
Steve Sutton [Wed, 28 Dec 2016 16:58:03 +0000 (11:58 -0500)]
Update footer for sharethis call

Use https call all the time.

8 years agoMerge tag 'v1.1.7' into develop
Ian Weller [Tue, 27 Dec 2016 20:53:22 +0000 (15:53 -0500)]
Merge tag 'v1.1.7' into develop

version 1.1.7

8 years agoMerge branch 'hotfix/1.1.7' v1.1.7
Ian Weller [Tue, 27 Dec 2016 20:52:53 +0000 (15:52 -0500)]
Merge branch 'hotfix/1.1.7'

8 years agofixing favicon code
Ian Weller [Tue, 27 Dec 2016 20:49:12 +0000 (15:49 -0500)]
fixing favicon code

I replaced the favicon call.  Also bumped up the version number.

8 years agoMerge tag 'v1.1.6' into develop
Steve Sutton [Fri, 4 Nov 2016 15:06:02 +0000 (11:06 -0400)]
Merge tag 'v1.1.6' into develop

Version 1.1.6

8 years agoMerge branch 'hotfix/1.1.6' v1.1.6
Steve Sutton [Fri, 4 Nov 2016 15:05:55 +0000 (11:05 -0400)]
Merge branch 'hotfix/1.1.6'

8 years agoUpdate version number in css call
Steve Sutton [Fri, 4 Nov 2016 15:05:27 +0000 (11:05 -0400)]
Update version number in css call

Needed for cache busting of app.css

8 years agoMerge tag 'v1.1.5' into develop
Ian Weller [Fri, 4 Nov 2016 14:26:21 +0000 (10:26 -0400)]
Merge tag 'v1.1.5' into develop

version 1.1.5

8 years agoMerge branch 'hotfix/1.1.5' v1.1.5
Ian Weller [Fri, 4 Nov 2016 14:25:33 +0000 (10:25 -0400)]
Merge branch 'hotfix/1.1.5'

8 years agoI believe I fixed the wrapping of products
Ian Weller [Fri, 4 Nov 2016 14:18:28 +0000 (10:18 -0400)]
I believe I fixed the wrapping of products

I added !important to the clear:none style in woocommerce.scss.  The
reason it was wrapping was a stylesheet inside the plugin called
woocommerce-smallscreen.css had clear:both style that overrided our
clear:none style.

8 years agoremoved absolute position
Ian Weller [Fri, 4 Nov 2016 13:40:38 +0000 (09:40 -0400)]
removed absolute position

I removed the absolute positon in the footer styles

8 years agoMerge tag 'v1.1.4' into develop
Laury GvR [Thu, 27 Oct 2016 20:36:45 +0000 (16:36 -0400)]
Merge tag 'v1.1.4' into develop

v1.1.4

8 years agoMerge branch 'hotfix/1.1.4' v1.1.4
Laury GvR [Thu, 27 Oct 2016 20:36:40 +0000 (16:36 -0400)]
Merge branch 'hotfix/1.1.4'

8 years agoFixed a potential 404 for shops excluding cats
Laury GvR [Thu, 27 Oct 2016 20:36:33 +0000 (16:36 -0400)]
Fixed a potential 404 for shops excluding cats

The Gilmore shop was producing 404 errors on the main shop page
under certain conditions. Traced this to an in_array() call where
the second parameter was not an array at the time. Added a test to
make sure the parameter was an array before that function call and
that cleared the problem.

8 years agoTheme version number bump
Laury GvR [Thu, 27 Oct 2016 20:36:25 +0000 (16:36 -0400)]
Theme version number bump

8 years agoMerge tag 'v1.1.3' into develop
Laury GvR [Fri, 8 Jul 2016 17:22:01 +0000 (13:22 -0400)]
Merge tag 'v1.1.3' into develop

v1.1.3

8 years agoMerge branch 'hotfix/1.1.3' v1.1.3
Laury GvR [Fri, 8 Jul 2016 17:21:54 +0000 (13:21 -0400)]
Merge branch 'hotfix/1.1.3'

8 years agoNew twitter social icon
Laury GvR [Fri, 8 Jul 2016 17:21:52 +0000 (13:21 -0400)]
New twitter social icon

8 years agoTheme version number bump
Laury GvR [Fri, 8 Jul 2016 17:21:41 +0000 (13:21 -0400)]
Theme version number bump

8 years agoMerge tag 'v1.1.2' into develop
Ian Weller [Thu, 19 May 2016 18:12:19 +0000 (14:12 -0400)]
Merge tag 'v1.1.2' into develop

version 1.1.2

8 years agoMerge branch 'hotfix/1.1.2' v1.1.2
Ian Weller [Thu, 19 May 2016 18:11:46 +0000 (14:11 -0400)]
Merge branch 'hotfix/1.1.2'

8 years agoadded favicons
Ian Weller [Thu, 19 May 2016 18:10:19 +0000 (14:10 -0400)]
added favicons

9 years agoMerge tag 'v1.1.1' into develop
Steve Sutton [Fri, 29 Apr 2016 15:49:33 +0000 (11:49 -0400)]
Merge tag 'v1.1.1' into develop

Version 1.1.1

9 years agoMerge branch 'hotfix/1.1.1' v1.1.1
Steve Sutton [Fri, 29 Apr 2016 15:49:26 +0000 (11:49 -0400)]
Merge branch 'hotfix/1.1.1'

9 years agoDon't replace the home text now
Steve Sutton [Fri, 29 Apr 2016 15:49:03 +0000 (11:49 -0400)]
Don't replace the home text now

9 years agoMerge tag 'v1.1.0' into develop
Steve Sutton [Fri, 29 Apr 2016 15:45:11 +0000 (11:45 -0400)]
Merge tag 'v1.1.0' into develop

Version 1.1.0

9 years agoMerge branch 'release/1.1.0' v1.1.0
Steve Sutton [Fri, 29 Apr 2016 15:45:05 +0000 (11:45 -0400)]
Merge branch 'release/1.1.0'

9 years agobump version number
Steve Sutton [Fri, 29 Apr 2016 15:44:20 +0000 (11:44 -0400)]
bump version number

9 years agoUpdate the categories to not be bold
Steve Sutton [Fri, 29 Apr 2016 15:42:56 +0000 (11:42 -0400)]
Update the categories to not be bold

9 years agoUpdating styles for the off canvas right menu
Steve Sutton [Fri, 29 Apr 2016 15:40:59 +0000 (11:40 -0400)]
Updating styles for the off canvas right menu

9 years agostyle updates for the right off canvas
Steve Sutton [Fri, 29 Apr 2016 15:27:26 +0000 (11:27 -0400)]
style updates for the right off canvas

9 years agomore work on moving things
Steve Sutton [Fri, 29 Apr 2016 15:18:34 +0000 (11:18 -0400)]
more work on moving things

9 years agomove shortcode into divs
Steve Sutton [Fri, 29 Apr 2016 15:17:20 +0000 (11:17 -0400)]
move shortcode into divs

9 years agoupdate for classes needed for hiding images
Steve Sutton [Fri, 29 Apr 2016 15:15:41 +0000 (11:15 -0400)]
update for classes needed for hiding images

9 years agoAdding shop side nav for mobile
Steve Sutton [Fri, 29 Apr 2016 15:07:27 +0000 (11:07 -0400)]
Adding shop side nav for mobile

9 years agoMerge tag 'v1.0.4' into develop
Steve Sutton [Fri, 29 Apr 2016 14:14:20 +0000 (10:14 -0400)]
Merge tag 'v1.0.4' into develop

Version 1.0.4

9 years agoMerge branch 'hotfix/1.0.4' v1.0.4
Steve Sutton [Fri, 29 Apr 2016 14:14:09 +0000 (10:14 -0400)]
Merge branch 'hotfix/1.0.4'

9 years agoUpdate off canvas nav to replace Home with Shop
Steve Sutton [Fri, 29 Apr 2016 14:13:38 +0000 (10:13 -0400)]
Update off canvas nav to replace Home with Shop

So they can get to shop

9 years agoMerge tag 'v1.0.3' into develop
Steve Sutton [Thu, 28 Apr 2016 14:00:28 +0000 (10:00 -0400)]
Merge tag 'v1.0.3' into develop

Version 1.0.3

9 years agoMerge branch 'hotfix/1.0.3' v1.0.3
Steve Sutton [Thu, 28 Apr 2016 14:00:16 +0000 (10:00 -0400)]
Merge branch 'hotfix/1.0.3'

9 years agoUpdate http calls to // for ssl
Steve Sutton [Thu, 28 Apr 2016 13:59:31 +0000 (09:59 -0400)]
Update http calls to // for ssl

9 years agoMerge tag 'v1.0.2' into develop
Laury GvR [Thu, 28 Apr 2016 13:46:40 +0000 (09:46 -0400)]
Merge tag 'v1.0.2' into develop

v1.0.2

9 years agoMerge branch 'hotfix/1.0.2' v1.0.2
Laury GvR [Thu, 28 Apr 2016 13:46:37 +0000 (09:46 -0400)]
Merge branch 'hotfix/1.0.2'

9 years agoStylesheet cachebusting
Laury GvR [Thu, 28 Apr 2016 13:46:32 +0000 (09:46 -0400)]
Stylesheet cachebusting

9 years agoTheme version number bump
Laury GvR [Thu, 28 Apr 2016 13:45:58 +0000 (09:45 -0400)]
Theme version number bump

9 years agoMerge tag 'v1.0.1' into develop
Laury GvR [Thu, 28 Apr 2016 13:35:42 +0000 (09:35 -0400)]
Merge tag 'v1.0.1' into develop

v1.0.1

9 years agoMerge branch 'hotfix/1.0.1' v1.0.1
Laury GvR [Thu, 28 Apr 2016 13:35:37 +0000 (09:35 -0400)]
Merge branch 'hotfix/1.0.1'

9 years agoCompressed gruntfile
Laury GvR [Thu, 28 Apr 2016 13:35:30 +0000 (09:35 -0400)]
Compressed gruntfile

9 years agoTheme version number bump
Laury GvR [Thu, 28 Apr 2016 13:35:14 +0000 (09:35 -0400)]
Theme version number bump

9 years agoMerge tag 'v1.0.0' into develop
Laury GvR [Thu, 28 Apr 2016 13:31:21 +0000 (09:31 -0400)]
Merge tag 'v1.0.0' into develop

v1.0.0

9 years agoMerge branch 'release/1.0.0' v1.0.0
Laury GvR [Thu, 28 Apr 2016 13:31:17 +0000 (09:31 -0400)]
Merge branch 'release/1.0.0'

9 years agoStylesheet version bump
Laury GvR [Thu, 28 Apr 2016 13:31:09 +0000 (09:31 -0400)]
Stylesheet version bump

9 years agoRevert "Adding woocommerce and grunt support"
Laury GvR [Thu, 28 Apr 2016 13:29:50 +0000 (09:29 -0400)]
Revert "Adding woocommerce and grunt support"

This reverts commit 983a9f71831686ee90390f4cb683e864b9f9cddf.

9 years agoCheckout page layout fix
Laury GvR [Tue, 26 Apr 2016 14:35:03 +0000 (10:35 -0400)]
Checkout page layout fix

9 years agoUpdate style for the new Authorize seal
Steve Sutton [Mon, 25 Apr 2016 20:11:37 +0000 (16:11 -0400)]
Update style for the new Authorize seal

9 years agoUpdate the code for the Authorize seal
Steve Sutton [Mon, 25 Apr 2016 20:03:10 +0000 (16:03 -0400)]
Update the code for the Authorize seal

9 years agoMargin on product listing, responsiveness, related products responsive
Laury GvR [Thu, 21 Apr 2016 21:01:55 +0000 (17:01 -0400)]
Margin on product listing, responsiveness, related products responsive

9 years agoRemoved clear: Both from qty box
Laury GvR [Thu, 21 Apr 2016 20:35:23 +0000 (16:35 -0400)]
Removed clear: Both from qty box

9 years agoGrunted last commit
Laury GvR [Thu, 21 Apr 2016 20:31:47 +0000 (16:31 -0400)]
Grunted last commit

9 years agoTitle 90% width rather than 80%
Laury GvR [Thu, 21 Apr 2016 20:31:22 +0000 (16:31 -0400)]
Title 90% width rather than 80%

9 years agoPadding added to tags (meta)
Laury GvR [Thu, 21 Apr 2016 20:30:22 +0000 (16:30 -0400)]
Padding added to tags (meta)

9 years agoNo longer autoselect submitted value variation selection:
Laury GvR [Thu, 21 Apr 2016 20:25:01 +0000 (16:25 -0400)]
No longer autoselect submitted value variation selection:

9 years agoAttempt to fix the variations all autofilling with last selection
Laury GvR [Thu, 21 Apr 2016 20:17:52 +0000 (16:17 -0400)]
Attempt to fix the variations all autofilling with last selection

9 years agoRelated products height ajudsted for small
Laury GvR [Thu, 21 Apr 2016 19:56:59 +0000 (15:56 -0400)]
Related products height ajudsted for small

9 years agoRelated product width/height adjusted
Laury GvR [Thu, 21 Apr 2016 19:55:41 +0000 (15:55 -0400)]
Related product width/height adjusted

9 years agoProduct title styling
Laury GvR [Thu, 21 Apr 2016 19:36:10 +0000 (15:36 -0400)]
Product title styling

9 years agoExpand image space on large view, product list
Laury GvR [Thu, 21 Apr 2016 19:06:31 +0000 (15:06 -0400)]
Expand image space on large view, product list

9 years agoQuick changes, no time to explain!
Laury GvR [Thu, 21 Apr 2016 18:58:17 +0000 (14:58 -0400)]
Quick changes, no time to explain!

9 years agoStyles applied to scl seal
Laury GvR [Thu, 21 Apr 2016 18:04:57 +0000 (14:04 -0400)]
Styles applied to scl seal

9 years agoSeal changed
Laury GvR [Thu, 21 Apr 2016 18:03:48 +0000 (14:03 -0400)]
Seal changed

9 years agoSCL Seal added
Laury GvR [Thu, 21 Apr 2016 18:01:44 +0000 (14:01 -0400)]
SCL Seal added

9 years agoTrying to add the SKU
Laury GvR [Tue, 19 Apr 2016 19:47:22 +0000 (15:47 -0400)]
Trying to add the SKU

9 years agoTrying to add the SKU
Laury GvR [Tue, 19 Apr 2016 19:45:07 +0000 (15:45 -0400)]
Trying to add the SKU

9 years agoTrying to add the SKU
Laury GvR [Tue, 19 Apr 2016 19:36:02 +0000 (15:36 -0400)]
Trying to add the SKU

9 years agoTrying to add the SKU
Laury GvR [Tue, 19 Apr 2016 19:32:36 +0000 (15:32 -0400)]
Trying to add the SKU

9 years agoTrying to add the SKU
Laury GvR [Tue, 19 Apr 2016 19:30:09 +0000 (15:30 -0400)]
Trying to add the SKU

9 years agoSwitching functions around
Laury GvR [Tue, 19 Apr 2016 19:25:55 +0000 (15:25 -0400)]
Switching functions around

9 years agoBroke the shortcode, fixed
Laury GvR [Tue, 19 Apr 2016 19:22:35 +0000 (15:22 -0400)]
Broke the shortcode, fixed

9 years agoAttempting field autofill through functions, not shortcode
Laury GvR [Tue, 19 Apr 2016 19:21:52 +0000 (15:21 -0400)]
Attempting field autofill through functions, not shortcode

9 years agoTrying the sku and name again for product form
Laury GvR [Tue, 19 Apr 2016 19:16:23 +0000 (15:16 -0400)]
Trying the sku and name again for product form

9 years agoProduct Inquiry hidden fields
Laury GvR [Tue, 19 Apr 2016 19:01:22 +0000 (15:01 -0400)]
Product Inquiry hidden fields

9 years agoImprove image sizes on product detail
Laury GvR [Tue, 19 Apr 2016 17:27:44 +0000 (13:27 -0400)]
Improve image sizes on product detail

9 years agoRemove hover effect from Home item
Laury GvR [Tue, 19 Apr 2016 16:55:33 +0000 (12:55 -0400)]
Remove hover effect from Home item

9 years agoRemove active from homepage
Laury GvR [Tue, 19 Apr 2016 16:43:57 +0000 (12:43 -0400)]
Remove active from homepage

9 years agoRemoving erroneous code
Laury GvR [Tue, 19 Apr 2016 16:37:36 +0000 (12:37 -0400)]
Removing erroneous code

9 years agoTitle and SKU added
Laury GvR [Tue, 12 Apr 2016 17:21:58 +0000 (13:21 -0400)]
Title and SKU added

9 years agoTitle made briefer
Laury GvR [Tue, 12 Apr 2016 17:05:35 +0000 (13:05 -0400)]
Title made briefer

9 years agoCustom product inquiry tab
Laury GvR [Tue, 12 Apr 2016 17:02:35 +0000 (13:02 -0400)]
Custom product inquiry tab

9 years agoProduct tabs inquiry form
Laury GvR [Tue, 12 Apr 2016 16:55:40 +0000 (12:55 -0400)]
Product tabs inquiry form

9 years agoSidebar links, email links
Laury GvR [Tue, 12 Apr 2016 15:24:16 +0000 (11:24 -0400)]
Sidebar links, email links

9 years agoAdded margin to wc-tabs
Laury GvR [Tue, 5 Apr 2016 20:36:45 +0000 (16:36 -0400)]
Added margin to wc-tabs

9 years agoCheckout button centered
Laury GvR [Tue, 5 Apr 2016 20:29:26 +0000 (16:29 -0400)]
Checkout button centered

9 years agoMargin added to separate footer from content
Laury GvR [Tue, 5 Apr 2016 20:24:53 +0000 (16:24 -0400)]
Margin added to separate footer from content

9 years agoColon after simple product qty on shop lsit
Laury GvR [Tue, 5 Apr 2016 20:18:26 +0000 (16:18 -0400)]
Colon after simple product qty on shop lsit

9 years agoQty label left aligned
Laury GvR [Tue, 5 Apr 2016 20:15:07 +0000 (16:15 -0400)]
Qty label left aligned

9 years agoDetail markup centered, space above items
Laury GvR [Tue, 5 Apr 2016 20:10:48 +0000 (16:10 -0400)]
Detail markup centered, space above items

9 years agoDon't show extra price for variation products
Laury GvR [Tue, 5 Apr 2016 18:33:16 +0000 (14:33 -0400)]
Don't show extra price for variation products

9 years agoNow will display price if all variations have the same price
Laury GvR [Tue, 5 Apr 2016 18:31:44 +0000 (14:31 -0400)]
Now will display price if all variations have the same price