WP-Themes/glmthemes/saultstemarie-theme.git
9 years agoMerge tag 'v1.0.36' into develop
Ian Weller [Tue, 12 Apr 2016 19:06:28 +0000 (15:06 -0400)]
Merge tag 'v1.0.36' into develop

version 1.0.36

9 years agoMerge branch 'hotfix/1.0.36'
Ian Weller [Tue, 12 Apr 2016 19:05:56 +0000 (15:05 -0400)]
Merge branch 'hotfix/1.0.36'

9 years agofixed a link problem in the action items
Ian Weller [Tue, 12 Apr 2016 19:04:54 +0000 (15:04 -0400)]
fixed a link problem in the action items

9 years agoMerge tag 'v1.0.35' into develop
Ian Weller [Tue, 5 Apr 2016 14:11:41 +0000 (10:11 -0400)]
Merge tag 'v1.0.35' into develop

version 1.0.35

9 years agoMerge branch 'hotfix/1.0.35'
Ian Weller [Tue, 5 Apr 2016 14:10:50 +0000 (10:10 -0400)]
Merge branch 'hotfix/1.0.35'

9 years agoupdating blog feature image output
Ian Weller [Tue, 5 Apr 2016 14:08:59 +0000 (10:08 -0400)]
updating blog feature image output

9 years agoMerge tag 'v1.0.34' into develop
Steve Sutton [Mon, 4 Apr 2016 18:25:11 +0000 (14:25 -0400)]
Merge tag 'v1.0.34' into develop

Version 1.0.34

9 years agoMerge branch 'hotfix/1.0.34'
Steve Sutton [Mon, 4 Apr 2016 18:25:00 +0000 (14:25 -0400)]
Merge branch 'hotfix/1.0.34'

9 years agoadd min height
Steve Sutton [Mon, 4 Apr 2016 18:24:43 +0000 (14:24 -0400)]
add min height

9 years agoMerge tag 'v1.0.33' into develop
Laury GvR [Mon, 4 Apr 2016 18:16:12 +0000 (14:16 -0400)]
Merge tag 'v1.0.33' into develop

v1.0.33

9 years agoMerge branch 'hotfix/1.0.33'
Laury GvR [Mon, 4 Apr 2016 18:16:08 +0000 (14:16 -0400)]
Merge branch 'hotfix/1.0.33'

9 years agoStylesheet cachebusting
Laury GvR [Mon, 4 Apr 2016 18:16:05 +0000 (14:16 -0400)]
Stylesheet cachebusting

9 years agoMerge tag 'v1.0.32' into develop
Laury GvR [Mon, 4 Apr 2016 17:15:29 +0000 (13:15 -0400)]
Merge tag 'v1.0.32' into develop

v1.0.32

9 years agoMerge branch 'hotfix/1.0.32'
Laury GvR [Mon, 4 Apr 2016 17:15:25 +0000 (13:15 -0400)]
Merge branch 'hotfix/1.0.32'

9 years agoAdding more media queries for blocks responsive spacing
Laury GvR [Mon, 4 Apr 2016 17:15:21 +0000 (13:15 -0400)]
Adding more media queries for blocks responsive spacing

9 years agoMerge tag 'v1.0.31' into develop
Laury GvR [Mon, 4 Apr 2016 17:11:32 +0000 (13:11 -0400)]
Merge tag 'v1.0.31' into develop

v1.0.31

9 years agoMerge branch 'hotfix/1.0.31'
Laury GvR [Mon, 4 Apr 2016 17:11:27 +0000 (13:11 -0400)]
Merge branch 'hotfix/1.0.31'

9 years agoP tag spacing, block padding & spacing responsive
Laury GvR [Mon, 4 Apr 2016 17:11:23 +0000 (13:11 -0400)]
P tag spacing, block padding & spacing responsive

9 years agoMerge tag 'v1.0.30' into develop
Laury GvR [Mon, 4 Apr 2016 16:24:03 +0000 (12:24 -0400)]
Merge tag 'v1.0.30' into develop

v1.0.30

9 years agoMerge branch 'hotfix/1.0.30'
Laury GvR [Mon, 4 Apr 2016 16:23:59 +0000 (12:23 -0400)]
Merge branch 'hotfix/1.0.30'

9 years agoChanged image sizes, reduced padding
Laury GvR [Mon, 4 Apr 2016 16:23:55 +0000 (12:23 -0400)]
Changed image sizes, reduced padding

9 years agoMerge tag 'v1.0.29' into develop
Laury GvR [Mon, 4 Apr 2016 15:30:04 +0000 (11:30 -0400)]
Merge tag 'v1.0.29' into develop

v1.0.29

9 years agoMerge branch 'hotfix/1.0.29'
Laury GvR [Mon, 4 Apr 2016 15:29:59 +0000 (11:29 -0400)]
Merge branch 'hotfix/1.0.29'

9 years agoBlocks now use img tags, no more background image.
Laury GvR [Mon, 4 Apr 2016 15:29:54 +0000 (11:29 -0400)]
Blocks now use img tags, no more background image.

9 years agoMerge tag 'v1.0.27' into develop
Anthony Talarico [Thu, 31 Mar 2016 18:39:50 +0000 (14:39 -0400)]
Merge tag 'v1.0.27' into develop

fixed syntax error with &&

9 years agoMerge branch 'hotfix/1.0.27'
Anthony Talarico [Thu, 31 Mar 2016 18:39:34 +0000 (14:39 -0400)]
Merge branch 'hotfix/1.0.27'

9 years agofixing syntax error
Anthony Talarico [Thu, 31 Mar 2016 18:38:33 +0000 (14:38 -0400)]
fixing syntax error

9 years agoMerge tag 'v1.0.26' into develop
Anthony Talarico [Thu, 31 Mar 2016 18:27:35 +0000 (14:27 -0400)]
Merge tag 'v1.0.26' into develop

adding conditional to functions file to show event featured image

9 years agoMerge branch 'hotfix/1.0.26'
Anthony Talarico [Thu, 31 Mar 2016 18:27:00 +0000 (14:27 -0400)]
Merge branch 'hotfix/1.0.26'

9 years agoadding conditional to add featured image to events from event page
Anthony Talarico [Thu, 31 Mar 2016 18:26:24 +0000 (14:26 -0400)]
adding conditional to add featured image to events from event page

9 years agoMerge tag 'v1.0.25' into develop
Anthony Talarico [Fri, 18 Mar 2016 20:13:47 +0000 (16:13 -0400)]
Merge tag 'v1.0.25' into develop

adding post_status to blog side bar recent posts args

9 years agoMerge branch 'hotfix/1.0.25'
Anthony Talarico [Fri, 18 Mar 2016 20:13:34 +0000 (16:13 -0400)]
Merge branch 'hotfix/1.0.25'

9 years agoadding post_status to blog side bar
Anthony Talarico [Fri, 18 Mar 2016 20:13:14 +0000 (16:13 -0400)]
adding post_status to blog side bar

9 years agoMerge tag 'v1.0.24' into develop
Steve Sutton [Mon, 7 Mar 2016 20:51:19 +0000 (15:51 -0500)]
Merge tag 'v1.0.24' into develop

Version 1.0.24

9 years agoMerge branch 'release/1.0.24'
Steve Sutton [Mon, 7 Mar 2016 20:51:11 +0000 (15:51 -0500)]
Merge branch 'release/1.0.24'

9 years agofixed the footer logo mistake
Ian Weller [Mon, 7 Mar 2016 20:39:22 +0000 (15:39 -0500)]
fixed the footer logo mistake

9 years agoadded the right logo to all the areas where the logo appears
Ian Weller [Mon, 7 Mar 2016 20:33:09 +0000 (15:33 -0500)]
added the right logo to all the areas where the logo appears

9 years agoadded the new logo to theme in the footer area
Ian Weller [Mon, 7 Mar 2016 20:20:08 +0000 (15:20 -0500)]
added the new logo to theme in the footer area

9 years agoMerge tag 'v1.0.23' into develop
Steve Sutton [Thu, 25 Feb 2016 20:25:05 +0000 (15:25 -0500)]
Merge tag 'v1.0.23' into develop

Version 1.0.23

9 years agoMerge branch 'hotfix/1.0.23'
Steve Sutton [Thu, 25 Feb 2016 20:24:56 +0000 (15:24 -0500)]
Merge branch 'hotfix/1.0.23'

9 years agobump version number
Steve Sutton [Thu, 25 Feb 2016 20:24:51 +0000 (15:24 -0500)]
bump version number

9 years agomore update on the cookie for protected pages
Steve Sutton [Thu, 25 Feb 2016 20:18:01 +0000 (15:18 -0500)]
more update on the cookie for protected pages

9 years agoupdates
Steve Sutton [Thu, 25 Feb 2016 19:49:49 +0000 (14:49 -0500)]
updates

9 years agoupdate the BOD ID
Steve Sutton [Thu, 25 Feb 2016 19:36:56 +0000 (14:36 -0500)]
update the BOD ID

9 years agoWorking on some ways to remove the page login cookie
Steve Sutton [Thu, 25 Feb 2016 19:29:42 +0000 (14:29 -0500)]
Working on some ways to remove the page login cookie

This does delete the cookie but have to click the BOD page a couple of
times.

9 years agoMerge tag 'v1.0.22' into develop
Ian Weller [Fri, 19 Feb 2016 19:40:54 +0000 (14:40 -0500)]
Merge tag 'v1.0.22' into develop

version 1.0.22
s

9 years agoMerge branch 'release/1.0.22'
Ian Weller [Fri, 19 Feb 2016 19:38:59 +0000 (14:38 -0500)]
Merge branch 'release/1.0.22'

9 years agoMerge branch 'master' of cvs2:WP-Themes/saultstemarie
Ian Weller [Fri, 19 Feb 2016 19:36:04 +0000 (14:36 -0500)]
Merge branch 'master' of cvs2:WP-Themes/saultstemarie

9 years agoswitched back to compressed stylesheet
Ian Weller [Fri, 19 Feb 2016 19:30:06 +0000 (14:30 -0500)]
switched back to compressed stylesheet

updated grunt file, redid grunt

9 years agoMerge tag 'v1.0.20' into develop
Ian Weller [Fri, 19 Feb 2016 19:22:02 +0000 (14:22 -0500)]
Merge tag 'v1.0.20' into develop

version 1.0.20

9 years agoMerge branch 'hotfix/1.0.20'
Ian Weller [Fri, 19 Feb 2016 19:20:01 +0000 (14:20 -0500)]
Merge branch 'hotfix/1.0.20'

9 years agogradient fixed and works on all browsers
Ian Weller [Fri, 19 Feb 2016 19:14:30 +0000 (14:14 -0500)]
gradient fixed and works on all browsers

9 years agoStruggles figuring out the gradient for ie9
Ian Weller [Fri, 19 Feb 2016 18:39:21 +0000 (13:39 -0500)]
Struggles figuring out the gradient for ie9

9 years agoMerge tag 'v1.0.21' into develop
Anthony Talarico [Fri, 19 Feb 2016 17:13:02 +0000 (12:13 -0500)]
Merge tag 'v1.0.21' into develop

hiding admin only fields in gravity forms

9 years agoMerge branch 'hotfix/1.0.21'
Anthony Talarico [Fri, 19 Feb 2016 17:12:27 +0000 (12:12 -0500)]
Merge branch 'hotfix/1.0.21'

9 years agohiding admin only box from front end in gravity forms
Anthony Talarico [Fri, 19 Feb 2016 17:11:16 +0000 (12:11 -0500)]
hiding admin only box from front end in gravity forms

9 years agoMerge tag 'v1.0.19' into develop
Steve Sutton [Fri, 19 Feb 2016 15:45:09 +0000 (10:45 -0500)]
Merge tag 'v1.0.19' into develop

Version 1.0.19

9 years agoMerge branch 'hotfix/1.0.19'
Steve Sutton [Fri, 19 Feb 2016 15:45:02 +0000 (10:45 -0500)]
Merge branch 'hotfix/1.0.19'

9 years agoUpdate the header file
Steve Sutton [Fri, 19 Feb 2016 15:44:30 +0000 (10:44 -0500)]
Update the header file

adding meta tag to break IE9 compatability mode from turning on

9 years agoMerge tag 'v1.0.18' into develop
Laury GvR [Thu, 18 Feb 2016 20:59:14 +0000 (15:59 -0500)]
Merge tag 'v1.0.18' into develop

v1.0.18

9 years agoMerge branch 'hotfix/1.0.18'
Laury GvR [Thu, 18 Feb 2016 20:59:02 +0000 (15:59 -0500)]
Merge branch 'hotfix/1.0.18'

9 years agoIframe bound to 100% width max
Laury GvR [Thu, 18 Feb 2016 20:58:54 +0000 (15:58 -0500)]
Iframe bound to 100% width max

9 years agoMerge tag 'v1.0.17' into develop
Anthony Talarico [Wed, 17 Feb 2016 21:18:19 +0000 (16:18 -0500)]
Merge tag 'v1.0.17' into develop

fixing syntax error with selector

9 years agoMerge branch 'hotfix/1.0.17'
Anthony Talarico [Wed, 17 Feb 2016 21:18:05 +0000 (16:18 -0500)]
Merge branch 'hotfix/1.0.17'

9 years agofixing syntax error
Anthony Talarico [Wed, 17 Feb 2016 21:17:48 +0000 (16:17 -0500)]
fixing syntax error

9 years agoMerge tag 'v1.0.16' into develop
Anthony Talarico [Wed, 17 Feb 2016 21:12:23 +0000 (16:12 -0500)]
Merge tag 'v1.0.16' into develop

fixing sticky header covering div on scroll issue

9 years agoMerge branch 'hotfix/1.0.16'
Anthony Talarico [Wed, 17 Feb 2016 21:11:47 +0000 (16:11 -0500)]
Merge branch 'hotfix/1.0.16'

9 years agofixing scroll issue with anchor tags and sticky header
Anthony Talarico [Wed, 17 Feb 2016 21:10:56 +0000 (16:10 -0500)]
fixing scroll issue with anchor tags and sticky header

9 years agoMerge tag 'v1.0.15' into develop
Ian Weller [Mon, 15 Feb 2016 20:52:29 +0000 (15:52 -0500)]
Merge tag 'v1.0.15' into develop

version 1.0.15

9 years agoMerge branch 'hotfix/1.0.15'
Ian Weller [Mon, 15 Feb 2016 20:51:47 +0000 (15:51 -0500)]
Merge branch 'hotfix/1.0.15'

9 years agoupdate visitor guide image to 2016
Ian Weller [Mon, 15 Feb 2016 20:51:01 +0000 (15:51 -0500)]
update visitor guide image to 2016

9 years agoMerge tag 'v1.0.14' into develop
Steve Sutton [Fri, 12 Feb 2016 14:42:52 +0000 (09:42 -0500)]
Merge tag 'v1.0.14' into develop

Version 1.0.14

9 years agoMerge branch 'hotfix/1.0.14'
Steve Sutton [Fri, 12 Feb 2016 14:42:45 +0000 (09:42 -0500)]
Merge branch 'hotfix/1.0.14'

9 years agoUpdate styles for reservation form
Steve Sutton [Fri, 12 Feb 2016 14:42:01 +0000 (09:42 -0500)]
Update styles for reservation form

update markup so the kids ages are below kids field and change color to
white.

9 years agoMerge tag 'v1.0.13' into develop
Laury GvR [Thu, 11 Feb 2016 16:03:34 +0000 (11:03 -0500)]
Merge tag 'v1.0.13' into develop

v1.0.13

9 years agoMerge branch 'hotfix/1.0.13'
Laury GvR [Thu, 11 Feb 2016 16:03:28 +0000 (11:03 -0500)]
Merge branch 'hotfix/1.0.13'

9 years agoAdded favicon
Laury GvR [Thu, 11 Feb 2016 16:03:25 +0000 (11:03 -0500)]
Added favicon

9 years agoMerge tag 'v1.0.12' into develop
Laury GvR [Wed, 10 Feb 2016 15:57:49 +0000 (10:57 -0500)]
Merge tag 'v1.0.12' into develop

v1.0.12

9 years agoMerge branch 'hotfix/1.0.12'
Laury GvR [Wed, 10 Feb 2016 15:57:44 +0000 (10:57 -0500)]
Merge branch 'hotfix/1.0.12'

9 years agoPlace back the get_thumbnail_id function
Laury GvR [Wed, 10 Feb 2016 15:57:40 +0000 (10:57 -0500)]
Place back the get_thumbnail_id function

9 years agoMerge tag 'v1.0.11' into develop
Laury GvR [Wed, 10 Feb 2016 15:46:52 +0000 (10:46 -0500)]
Merge tag 'v1.0.11' into develop

v1.0.11

9 years agoMerge branch 'hotfix/1.0.11'
Laury GvR [Wed, 10 Feb 2016 15:46:40 +0000 (10:46 -0500)]
Merge branch 'hotfix/1.0.11'

9 years agoFixed featured function grabbing ID, moved container div into function
Laury GvR [Wed, 10 Feb 2016 15:46:34 +0000 (10:46 -0500)]
Fixed featured function grabbing ID, moved container div into function

9 years agoMerge tag 'v1.0.10' into develop
Laury GvR [Tue, 9 Feb 2016 20:46:51 +0000 (15:46 -0500)]
Merge tag 'v1.0.10' into develop

v1.0.10

9 years agoMerge branch 'hotfix/1.0.10'
Laury GvR [Tue, 9 Feb 2016 20:46:47 +0000 (15:46 -0500)]
Merge branch 'hotfix/1.0.10'

9 years agoRe-implemented parent post featured inheritance
Laury GvR [Tue, 9 Feb 2016 20:46:43 +0000 (15:46 -0500)]
Re-implemented parent post featured inheritance

9 years agoMerge tag 'v1.0.9' into develop
Laury GvR [Tue, 9 Feb 2016 20:44:41 +0000 (15:44 -0500)]
Merge tag 'v1.0.9' into develop

v1.0.9

9 years agoMerge branch 'hotfix/1.0.9'
Laury GvR [Tue, 9 Feb 2016 20:44:30 +0000 (15:44 -0500)]
Merge branch 'hotfix/1.0.9'

9 years agoForgot to Grunt last commit!
Laury GvR [Tue, 9 Feb 2016 20:44:26 +0000 (15:44 -0500)]
Forgot to Grunt last commit!

9 years agoMerge tag 'v1.0.8' into develop
Laury GvR [Tue, 9 Feb 2016 20:43:11 +0000 (15:43 -0500)]
Merge tag 'v1.0.8' into develop

v1.0.8

9 years agoMerge branch 'hotfix/1.0.8'
Laury GvR [Tue, 9 Feb 2016 20:43:07 +0000 (15:43 -0500)]
Merge branch 'hotfix/1.0.8'

9 years agoFaulty CSS specificity, content-wrapper changed to page-wrapper for featured styles
Laury GvR [Tue, 9 Feb 2016 20:43:03 +0000 (15:43 -0500)]
Faulty CSS specificity, content-wrapper changed to page-wrapper for featured styles

9 years agoMerge tag 'v1.0.7' into develop
Laury GvR [Tue, 9 Feb 2016 20:38:36 +0000 (15:38 -0500)]
Merge tag 'v1.0.7' into develop

v1.0.7

9 years agoMerge branch 'hotfix/1.0.7'
Laury GvR [Tue, 9 Feb 2016 20:38:31 +0000 (15:38 -0500)]
Merge branch 'hotfix/1.0.7'

9 years agoRemoved old featured function grabbing on all pages.
Laury GvR [Tue, 9 Feb 2016 20:38:28 +0000 (15:38 -0500)]
Removed old featured function grabbing on all pages.

9 years agoMerge tag 'v1.0.6' into develop
Laury GvR [Tue, 9 Feb 2016 20:34:27 +0000 (15:34 -0500)]
Merge tag 'v1.0.6' into develop

v1.0.6

9 years agoMerge branch 'hotfix/1.0.6'
Laury GvR [Tue, 9 Feb 2016 20:34:24 +0000 (15:34 -0500)]
Merge branch 'hotfix/1.0.6'

9 years agoFeatured Fix now also active for Blog page, non-default inside pages
Laury GvR [Tue, 9 Feb 2016 20:34:20 +0000 (15:34 -0500)]
Featured Fix now also active for Blog page, non-default inside pages

9 years agoMerge tag 'v1.0.5' into develop
Laury GvR [Tue, 9 Feb 2016 20:30:06 +0000 (15:30 -0500)]
Merge tag 'v1.0.5' into develop

v1.0.5

9 years agoMerge branch 'hotfix/1.0.5'
Laury GvR [Tue, 9 Feb 2016 20:30:01 +0000 (15:30 -0500)]
Merge branch 'hotfix/1.0.5'