web/GaylordGolfMecca.git
10 years agoMerge tag 'v1.3.2' into develop
Steve Sutton [Wed, 8 Apr 2015 18:46:06 +0000 (14:46 -0400)]
Merge tag 'v1.3.2' into develop

Version 1.3.2

10 years agoMerge branch 'release/1.3.2' v1.3.2
Steve Sutton [Wed, 8 Apr 2015 18:45:56 +0000 (14:45 -0400)]
Merge branch 'release/1.3.2'

10 years agoFor working on dev sites also
Steve Sutton [Wed, 8 Apr 2015 18:45:15 +0000 (14:45 -0400)]
For working on dev sites also

this will be https if hte page is https

10 years agoTurn off ssl verification
Steve Sutton [Wed, 8 Apr 2015 18:44:34 +0000 (14:44 -0400)]
Turn off ssl verification

To work on ws6

10 years agoMerge tag 'v1.3.1' into develop
Steve Sutton [Wed, 8 Apr 2015 17:29:16 +0000 (13:29 -0400)]
Merge tag 'v1.3.1' into develop

Version 1.3.1

10 years agoMerge branch 'release/1.3.1' v1.3.1
Steve Sutton [Wed, 8 Apr 2015 17:29:04 +0000 (13:29 -0400)]
Merge branch 'release/1.3.1'

10 years agoUpdate action for form
Steve Sutton [Wed, 8 Apr 2015 17:26:16 +0000 (13:26 -0400)]
Update action for form

use https

10 years agoMerge tag 'v1.3.0' into develop
Steve Sutton [Mon, 23 Mar 2015 16:33:00 +0000 (12:33 -0400)]
Merge tag 'v1.3.0' into develop

Version 1.3.0

10 years agoMerge branch 'release/1.3.0' v1.3.0
Steve Sutton [Mon, 23 Mar 2015 16:32:52 +0000 (12:32 -0400)]
Merge branch 'release/1.3.0'

10 years agoUpdate GLMSearch code
Steve Sutton [Mon, 23 Mar 2015 16:25:21 +0000 (12:25 -0400)]
Update GLMSearch code

10 years agoSetup Search
Steve Sutton [Fri, 20 Mar 2015 12:49:14 +0000 (08:49 -0400)]
Setup Search

Remove display none on form.
Set glmsearch.site in config/application.ini

10 years agoMerge tag 'v1.2.5' into develop
Steve Sutton [Fri, 20 Mar 2015 18:50:23 +0000 (14:50 -0400)]
Merge tag 'v1.2.5' into develop

Version 1.2.5

10 years agoMerge branch 'release/1.2.5' v1.2.5
Steve Sutton [Fri, 20 Mar 2015 18:50:14 +0000 (14:50 -0400)]
Merge branch 'release/1.2.5'

10 years agoupdate for https
Steve Sutton [Fri, 20 Mar 2015 18:49:58 +0000 (14:49 -0400)]
update for https

10 years agoMerge tag 'v1.2.4' into develop
Steve Sutton [Fri, 20 Mar 2015 18:40:03 +0000 (14:40 -0400)]
Merge tag 'v1.2.4' into develop

Version 1.2.4

10 years agoMerge branch 'release/1.2.4' v1.2.4
Steve Sutton [Fri, 20 Mar 2015 18:39:53 +0000 (14:39 -0400)]
Merge branch 'release/1.2.4'

10 years agoUpdate Photo Gallery
Steve Sutton [Fri, 20 Mar 2015 18:32:56 +0000 (14:32 -0400)]
Update Photo Gallery

To get slideshow working.

10 years agoMerge tag 'v1.2.1' into develop
Steve Sutton [Fri, 20 Mar 2015 14:21:57 +0000 (10:21 -0400)]
Merge tag 'v1.2.1' into develop

Version 1.2.1

10 years agoMerge branch 'hotfix/1.2.1' v1.2.1 v1.2.3
Steve Sutton [Fri, 20 Mar 2015 14:21:47 +0000 (10:21 -0400)]
Merge branch 'hotfix/1.2.1'

10 years agoCorrection for select at 30%
Steve Sutton [Fri, 20 Mar 2015 14:21:19 +0000 (10:21 -0400)]
Correction for select at 30%

Only want the event time fields

10 years agoMerge tag 'v1.2.0' into develop
Steve Sutton [Fri, 20 Mar 2015 14:13:34 +0000 (10:13 -0400)]
Merge tag 'v1.2.0' into develop

Version 1.2.0

10 years agoMerge branch 'release/1.2.0' v1.2.0
Steve Sutton [Fri, 20 Mar 2015 14:13:26 +0000 (10:13 -0400)]
Merge branch 'release/1.2.0'

10 years agoMerge branch 'feature/MembersOnly' into develop
Steve Sutton [Fri, 20 Mar 2015 14:08:59 +0000 (10:08 -0400)]
Merge branch 'feature/MembersOnly' into develop

10 years agoSet file width to 35%
Steve Sutton [Fri, 20 Mar 2015 14:04:15 +0000 (10:04 -0400)]
Set file width to 35%

10 years agoUpdate styles for the front
Steve Sutton [Fri, 20 Mar 2015 14:01:47 +0000 (10:01 -0400)]
Update styles for the front

Make text smaller in the members only area

10 years agoHide search and create redirect for membersonly
Steve Sutton [Fri, 20 Mar 2015 13:52:17 +0000 (09:52 -0400)]
Hide search and create redirect for membersonly

10 years agoUpdate submit button class
Steve Sutton [Thu, 19 Mar 2015 18:33:22 +0000 (14:33 -0400)]
Update submit button class

10 years agoUpdate the members only section
Steve Sutton [Thu, 19 Mar 2015 17:29:35 +0000 (13:29 -0400)]
Update the members only section

has side nav that turns into top nav on medium

10 years agoMerge tag 'v1.0.26' into develop
Steve Sutton [Wed, 18 Mar 2015 13:26:15 +0000 (09:26 -0400)]
Merge tag 'v1.0.26' into develop

Version 1.0.26

10 years agoMerge branch 'hotfix/1.0.26' v1.0.26
Steve Sutton [Wed, 18 Mar 2015 13:26:03 +0000 (09:26 -0400)]
Merge branch 'hotfix/1.0.26'

10 years agoHide h3 h4 h5 h6 in the blog feed area
Steve Sutton [Wed, 18 Mar 2015 13:25:41 +0000 (09:25 -0400)]
Hide h3 h4 h5 h6 in the blog feed area

10 years agoMerge tag 'v1.0.25' into develop
Steve Sutton [Wed, 18 Mar 2015 13:10:13 +0000 (09:10 -0400)]
Merge tag 'v1.0.25' into develop

Version 1.0.25

10 years agoMerge branch 'release/1.0.25' v1.0.25
Steve Sutton [Wed, 18 Mar 2015 13:10:03 +0000 (09:10 -0400)]
Merge branch 'release/1.0.25'

10 years agoAdd course image to member profile pages
Steve Sutton [Wed, 18 Mar 2015 13:08:38 +0000 (09:08 -0400)]
Add course image to member profile pages

10 years agoMerge tag 'v1.0.24' into develop
Steve Sutton [Tue, 17 Mar 2015 16:59:25 +0000 (12:59 -0400)]
Merge tag 'v1.0.24' into develop

Version 1.0.24

10 years agoMerge branch 'release/1.0.24' v1.0.24
Steve Sutton [Tue, 17 Mar 2015 16:59:15 +0000 (12:59 -0400)]
Merge branch 'release/1.0.24'

10 years agoMove tracking pixel
Steve Sutton [Tue, 17 Mar 2015 16:58:11 +0000 (12:58 -0400)]
Move tracking pixel

To keep footer on bottom

10 years agoMerge tag 'v1.0.23' into develop
Steve Sutton [Tue, 17 Mar 2015 16:27:28 +0000 (12:27 -0400)]
Merge tag 'v1.0.23' into develop

Version 1.0.23

10 years agoMerge branch 'hotfix/1.0.23' v1.0.23
Steve Sutton [Tue, 17 Mar 2015 16:27:19 +0000 (12:27 -0400)]
Merge branch 'hotfix/1.0.23'

10 years agoUpdate footer address line
Steve Sutton [Tue, 17 Mar 2015 16:26:48 +0000 (12:26 -0400)]
Update footer address line

Make it two lines and second line one smaller font size

10 years agoMerge tag 'v1.0.22' into develop
Steve Sutton [Tue, 17 Mar 2015 15:21:15 +0000 (11:21 -0400)]
Merge tag 'v1.0.22' into develop

Version 1.0.22

10 years agoMerge branch 'hotfix/1.0.22' v1.0.22
Steve Sutton [Tue, 17 Mar 2015 15:21:06 +0000 (11:21 -0400)]
Merge branch 'hotfix/1.0.22'

10 years agoUpdate size of image and header on blog feed
Steve Sutton [Tue, 17 Mar 2015 15:20:30 +0000 (11:20 -0400)]
Update size of image and header on blog feed

10 years agoMerge tag 'v1.0.21' into develop
Steve Sutton [Tue, 17 Mar 2015 13:57:12 +0000 (09:57 -0400)]
Merge tag 'v1.0.21' into develop

Version 1.0.21

10 years agoMerge branch 'release/1.0.21' v1.0.21
Steve Sutton [Tue, 17 Mar 2015 13:57:02 +0000 (09:57 -0400)]
Merge branch 'release/1.0.21'

10 years agoAdd social and info to off-canvas
Steve Sutton [Tue, 17 Mar 2015 13:54:29 +0000 (09:54 -0400)]
Add social and info to off-canvas

10 years agoOutput blog feed on Home Page
Steve Sutton [Tue, 17 Mar 2015 13:38:00 +0000 (09:38 -0400)]
Output blog feed on Home Page

Limit feed to three.
Hide h3 in tho blog section and align image to the left.

10 years agoMerge tag 'v1.0.20' into develop
Steve Sutton [Fri, 13 Mar 2015 16:48:55 +0000 (12:48 -0400)]
Merge tag 'v1.0.20' into develop

Version 1.0.20

10 years agoMerge branch 'hotfix/1.0.20' v1.0.20
Steve Sutton [Fri, 13 Mar 2015 16:48:47 +0000 (12:48 -0400)]
Merge branch 'hotfix/1.0.20'

10 years agoAdding logo to top of event pdf
Steve Sutton [Fri, 13 Mar 2015 16:48:24 +0000 (12:48 -0400)]
Adding logo to top of event pdf

assets/logoPdf.png

10 years agoMerge tag 'v1.1.5' into develop
Laury GvR [Tue, 10 Mar 2015 20:40:53 +0000 (16:40 -0400)]
Merge tag 'v1.1.5' into develop

v1.1.5

10 years agoMerge branch 'hotfix/1.1.5' v1.0.19 v1.1.5
Laury GvR [Tue, 10 Mar 2015 20:40:49 +0000 (16:40 -0400)]
Merge branch 'hotfix/1.1.5'

10 years agoAdded fancybox. Video & Gallery styles and config set up
Laury GvR [Tue, 10 Mar 2015 20:40:36 +0000 (16:40 -0400)]
Added fancybox. Video & Gallery styles and config set up

10 years agoMerge tag 'v1.1.4' into develop
Laury GvR [Tue, 10 Mar 2015 19:23:53 +0000 (15:23 -0400)]
Merge tag 'v1.1.4' into develop

v1.1.4

10 years agoMerge branch 'hotfix/1.1.4' v1.1.4
Laury GvR [Tue, 10 Mar 2015 19:23:48 +0000 (15:23 -0400)]
Merge branch 'hotfix/1.1.4'

10 years agoSlideshow navigation was slightly covering top-nav clickable areas due to padding
Laury GvR [Tue, 10 Mar 2015 19:23:43 +0000 (15:23 -0400)]
Slideshow navigation was slightly covering top-nav clickable areas due to padding

10 years agoMerge tag 'v1.1.3' into develop
Laury GvR [Tue, 10 Mar 2015 19:18:07 +0000 (15:18 -0400)]
Merge tag 'v1.1.3' into develop

v1.1.3

10 years agoMerge branch 'hotfix/1.1.3' v1.1.3
Laury GvR [Tue, 10 Mar 2015 19:17:38 +0000 (15:17 -0400)]
Merge branch 'hotfix/1.1.3'

10 years agoTop nav was disappearing under slideshow nav. raised z-index.
Laury GvR [Tue, 10 Mar 2015 19:17:23 +0000 (15:17 -0400)]
Top nav was disappearing under slideshow nav. raised z-index.

10 years agoMerge tag 'v1.1.2' into develop
Laury GvR [Tue, 10 Mar 2015 19:04:12 +0000 (15:04 -0400)]
Merge tag 'v1.1.2' into develop

v1.1.2

10 years agoMerge branch 'hotfix/1.1.2' v1.1.2
Laury GvR [Tue, 10 Mar 2015 19:04:02 +0000 (15:04 -0400)]
Merge branch 'hotfix/1.1.2'

10 years agoNo more slideshow caption in mobile view
Laury GvR [Tue, 10 Mar 2015 19:03:55 +0000 (15:03 -0400)]
No more slideshow caption in mobile view

10 years agoMerge tag 'v1.1.1' into develop
Laury GvR [Tue, 10 Mar 2015 18:43:07 +0000 (14:43 -0400)]
Merge tag 'v1.1.1' into develop

v1.1.1

10 years agoMerge branch 'hotfix/1.1.1' v1.1.1
Laury GvR [Tue, 10 Mar 2015 18:43:01 +0000 (14:43 -0400)]
Merge branch 'hotfix/1.1.1'

10 years agoOff-canvas nav color issue fixed
Laury GvR [Tue, 10 Mar 2015 18:42:50 +0000 (14:42 -0400)]
Off-canvas nav color issue fixed

10 years agoMerge tag 'v1.1.0' into develop
Laury GvR [Tue, 10 Mar 2015 18:39:42 +0000 (14:39 -0400)]
Merge tag 'v1.1.0' into develop

v1.1.0

10 years agoMerge branch 'release/1.1.0' v1.1.0
Laury GvR [Tue, 10 Mar 2015 18:39:34 +0000 (14:39 -0400)]
Merge branch 'release/1.1.0'

10 years agoOff-canvas styling, off-canvas nav php.
Laury GvR [Tue, 10 Mar 2015 18:36:15 +0000 (14:36 -0400)]
Off-canvas styling, off-canvas nav php.

10 years agoMerge tag 'v1.0.18' into develop
Laury GvR [Tue, 10 Mar 2015 16:07:27 +0000 (12:07 -0400)]
Merge tag 'v1.0.18' into develop

v1.0.18

10 years agoMerge branch 'hotfix/1.0.18' v1.0.18
Laury GvR [Tue, 10 Mar 2015 16:07:20 +0000 (12:07 -0400)]
Merge branch 'hotfix/1.0.18'

10 years agorewrite from nav to blog in htaccess
Laury GvR [Tue, 10 Mar 2015 16:07:10 +0000 (12:07 -0400)]
rewrite from nav to blog in htaccess

10 years agoRewrite for navigating to blog from nav item
Laury GvR [Tue, 10 Mar 2015 15:59:58 +0000 (11:59 -0400)]
Rewrite for navigating to blog from nav item

10 years agoStart working on Member Only Navigation
Steve Sutton [Tue, 10 Mar 2015 14:36:56 +0000 (10:36 -0400)]
Start working on Member Only Navigation

10 years agoMerge tag 'v1.0.17' into develop
Steve Sutton [Tue, 10 Mar 2015 12:25:49 +0000 (08:25 -0400)]
Merge tag 'v1.0.17' into develop

Version 1.0.17

10 years agoMerge branch 'hotfix/1.0.17' v1.0.17
Steve Sutton [Tue, 10 Mar 2015 12:25:14 +0000 (08:25 -0400)]
Merge branch 'hotfix/1.0.17'

10 years agoFix map icon sizes
Steve Sutton [Tue, 10 Mar 2015 12:24:58 +0000 (08:24 -0400)]
Fix map icon sizes

10 years agoMerge tag 'v1.0.16' into develop
Laury GvR [Mon, 9 Mar 2015 21:08:11 +0000 (17:08 -0400)]
Merge tag 'v1.0.16' into develop

v1.0.16

10 years agoMerge branch 'hotfix/1.0.16' v1.0.16
Laury GvR [Mon, 9 Mar 2015 21:08:05 +0000 (17:08 -0400)]
Merge branch 'hotfix/1.0.16'

10 years agoFooter formatting on mobile, public nav functions, nav.php for blog menu
Laury GvR [Mon, 9 Mar 2015 21:07:52 +0000 (17:07 -0400)]
Footer formatting on mobile, public nav functions, nav.php for blog menu

10 years agoMerge tag 'v1.0.15' into develop
Laury GvR [Mon, 9 Mar 2015 15:01:07 +0000 (11:01 -0400)]
Merge tag 'v1.0.15' into develop

v1.0.15

10 years agoMerge branch 'hotfix/1.0.15' v1.0.15
Laury GvR [Mon, 9 Mar 2015 15:00:53 +0000 (11:00 -0400)]
Merge branch 'hotfix/1.0.15'

10 years agoSpacing fix for weather footer
Laury GvR [Mon, 9 Mar 2015 15:00:44 +0000 (11:00 -0400)]
Spacing fix for weather footer

10 years agoMerge tag 'v1.0.14' into develop
Laury GvR [Mon, 9 Mar 2015 14:57:55 +0000 (10:57 -0400)]
Merge tag 'v1.0.14' into develop

v1.0.14

10 years agoMerge branch 'hotfix/1.0.14'
Laury GvR [Mon, 9 Mar 2015 14:57:53 +0000 (10:57 -0400)]
Merge branch 'hotfix/1.0.14'

10 years agov1.0.14
Laury GvR [Mon, 9 Mar 2015 14:47:43 +0000 (10:47 -0400)]
v1.0.14

10 years agov1.0.14
Laury GvR [Mon, 9 Mar 2015 14:47:43 +0000 (10:47 -0400)]
v1.0.14

10 years agoMerge branch 'hotfix/1.0.14' v1.0.14
Laury GvR [Mon, 9 Mar 2015 14:48:03 +0000 (10:48 -0400)]
Merge branch 'hotfix/1.0.14'

10 years agov1.0.14
Laury GvR [Mon, 9 Mar 2015 14:47:43 +0000 (10:47 -0400)]
v1.0.14

10 years agoParagraphs padding
Laury GvR [Mon, 9 Mar 2015 14:24:07 +0000 (10:24 -0400)]
Paragraphs padding

10 years agoParagraphs padding
Laury GvR [Mon, 9 Mar 2015 14:24:07 +0000 (10:24 -0400)]
Paragraphs padding

10 years agoMerge tag 'v1.0.13' into develop
Steve Sutton [Mon, 9 Mar 2015 14:19:20 +0000 (10:19 -0400)]
Merge tag 'v1.0.13' into develop

Version 1.0.13

10 years agoMerge branch 'hotfix/1.0.13' v1.0.13
Steve Sutton [Mon, 9 Mar 2015 14:19:11 +0000 (10:19 -0400)]
Merge branch 'hotfix/1.0.13'

10 years agoRemove uneeded files for thickbox
Steve Sutton [Mon, 9 Mar 2015 14:18:46 +0000 (10:18 -0400)]
Remove uneeded files for thickbox

10 years agoMerge tag 'v1.0.11' into develop
Steve Sutton [Mon, 9 Mar 2015 14:06:41 +0000 (10:06 -0400)]
Merge tag 'v1.0.11' into develop

Version 1.0.11

10 years agoMerge branch 'release/1.0.11' v1.0.11
Steve Sutton [Mon, 9 Mar 2015 14:06:33 +0000 (10:06 -0400)]
Merge branch 'release/1.0.11'

10 years agoUpdate member profile pages
Steve Sutton [Mon, 9 Mar 2015 14:02:44 +0000 (10:02 -0400)]
Update member profile pages

Adding tho photoswipe for photo gallery

10 years agoMerge tag 'v1.0.10' into develop
Steve Sutton [Fri, 6 Mar 2015 21:55:30 +0000 (16:55 -0500)]
Merge tag 'v1.0.10' into develop

Version 1.0.10

10 years agoMerge branch 'release/1.0.10' v1.0.10
Steve Sutton [Fri, 6 Mar 2015 21:55:22 +0000 (16:55 -0500)]
Merge branch 'release/1.0.10'

10 years agoContact updates
Steve Sutton [Fri, 6 Mar 2015 21:54:33 +0000 (16:54 -0500)]
Contact updates

for search in admin

10 years agoMerge tag 'v1.0.9' into develop
Steve Sutton [Fri, 6 Mar 2015 20:44:26 +0000 (15:44 -0500)]
Merge tag 'v1.0.9' into develop

Version 1.0.9