Steve Sutton [Wed, 22 Apr 2015 19:51:51 +0000 (15:51 -0400)]
Merge tag 'v1.4.0' into develop
Version 1.4.0
Steve Sutton [Wed, 22 Apr 2015 19:51:40 +0000 (15:51 -0400)]
Merge branch 'release/1.4.0'
Steve Sutton [Wed, 22 Apr 2015 19:50:25 +0000 (15:50 -0400)]
Merge branch 'feature/GlmBlocks' into develop
Steve Sutton [Wed, 22 Apr 2015 15:50:27 +0000 (11:50 -0400)]
Move the block content below the images
Center the text
Steve Sutton [Tue, 14 Apr 2015 17:33:19 +0000 (13:33 -0400)]
Merge tag 'v1.3.5' into develop
Version 1.3.5
Steve Sutton [Tue, 14 Apr 2015 17:33:10 +0000 (13:33 -0400)]
Merge branch 'release/1.3.5'
Steve Sutton [Tue, 14 Apr 2015 17:32:41 +0000 (13:32 -0400)]
Fix date fields
for label placement
Steve Sutton [Tue, 14 Apr 2015 17:25:55 +0000 (13:25 -0400)]
Merge tag 'v1.3.4' into develop
Version 1.3.4
Steve Sutton [Tue, 14 Apr 2015 17:25:45 +0000 (13:25 -0400)]
Merge branch 'release/1.3.4'
Steve Sutton [Tue, 14 Apr 2015 17:24:41 +0000 (13:24 -0400)]
Update form styles
This is so the radio buttons will not be orphaned
Steve Sutton [Tue, 14 Apr 2015 16:14:04 +0000 (12:14 -0400)]
Merge tag 'v1.3.3' into develop
Version 1.3.3
Steve Sutton [Tue, 14 Apr 2015 16:13:54 +0000 (12:13 -0400)]
Merge branch 'release/1.3.3'
Steve Sutton [Tue, 14 Apr 2015 16:10:11 +0000 (12:10 -0400)]
Update subject
Steve Sutton [Tue, 14 Apr 2015 16:00:11 +0000 (12:00 -0400)]
More updates with email template
Make the table have small border
Steve Sutton [Tue, 14 Apr 2015 15:51:29 +0000 (11:51 -0400)]
Update email template
adding borders
Steve Sutton [Tue, 14 Apr 2015 15:41:40 +0000 (11:41 -0400)]
Remove testing email
test on dev53
Steve Sutton [Tue, 14 Apr 2015 15:39:33 +0000 (11:39 -0400)]
Update success message
add p tags
Steve Sutton [Tue, 14 Apr 2015 15:36:45 +0000 (11:36 -0400)]
Update the email message for the passport form
CHANGE TEXT IN BEGINNING OF EMAIL:
Thank you for ordering the Gaylord Golf Mecca Passport.
This is a confirmation receipt for:
Customer information (name, address, etc) [spelling correction ss]
Line break the quantity and price and type (individual line items)
Shipping fee
Total of order
Steve Sutton [Wed, 8 Apr 2015 18:46:06 +0000 (14:46 -0400)]
Merge tag 'v1.3.2' into develop
Version 1.3.2
Steve Sutton [Wed, 8 Apr 2015 18:45:56 +0000 (14:45 -0400)]
Merge branch 'release/1.3.2'
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
Steve Sutton [Wed, 8 Apr 2015 18:44:34 +0000 (14:44 -0400)]
Turn off ssl verification
To work on ws6
Steve Sutton [Wed, 8 Apr 2015 17:29:16 +0000 (13:29 -0400)]
Merge tag 'v1.3.1' into develop
Version 1.3.1
Steve Sutton [Wed, 8 Apr 2015 17:29:04 +0000 (13:29 -0400)]
Merge branch 'release/1.3.1'
Steve Sutton [Wed, 8 Apr 2015 17:26:16 +0000 (13:26 -0400)]
Update action for form
use https
Steve Sutton [Fri, 27 Mar 2015 12:22:07 +0000 (08:22 -0400)]
Update for glm-block content area
Update on font-sizes in medium
Steve Sutton [Mon, 23 Mar 2015 16:33:00 +0000 (12:33 -0400)]
Merge tag 'v1.3.0' into develop
Version 1.3.0
Steve Sutton [Mon, 23 Mar 2015 16:32:52 +0000 (12:32 -0400)]
Merge branch 'release/1.3.0'
Steve Sutton [Mon, 23 Mar 2015 16:25:21 +0000 (12:25 -0400)]
Update GLMSearch code
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
Steve Sutton [Fri, 20 Mar 2015 18:50:23 +0000 (14:50 -0400)]
Merge tag 'v1.2.5' into develop
Version 1.2.5
Steve Sutton [Fri, 20 Mar 2015 18:50:14 +0000 (14:50 -0400)]
Merge branch 'release/1.2.5'
Steve Sutton [Fri, 20 Mar 2015 18:49:58 +0000 (14:49 -0400)]
update for https
Steve Sutton [Fri, 20 Mar 2015 18:40:03 +0000 (14:40 -0400)]
Merge tag 'v1.2.4' into develop
Version 1.2.4
Steve Sutton [Fri, 20 Mar 2015 18:39:53 +0000 (14:39 -0400)]
Merge branch 'release/1.2.4'
Steve Sutton [Fri, 20 Mar 2015 18:32:56 +0000 (14:32 -0400)]
Update Photo Gallery
To get slideshow working.
Steve Sutton [Fri, 20 Mar 2015 14:21:57 +0000 (10:21 -0400)]
Merge tag 'v1.2.1' into develop
Version 1.2.1
Steve Sutton [Fri, 20 Mar 2015 14:21:47 +0000 (10:21 -0400)]
Merge branch 'hotfix/1.2.1'
Steve Sutton [Fri, 20 Mar 2015 14:21:19 +0000 (10:21 -0400)]
Correction for select at 30%
Only want the event time fields
Steve Sutton [Fri, 20 Mar 2015 14:13:34 +0000 (10:13 -0400)]
Merge tag 'v1.2.0' into develop
Version 1.2.0
Steve Sutton [Fri, 20 Mar 2015 14:13:26 +0000 (10:13 -0400)]
Merge branch 'release/1.2.0'
Steve Sutton [Fri, 20 Mar 2015 14:08:59 +0000 (10:08 -0400)]
Merge branch 'feature/MembersOnly' into develop
Steve Sutton [Fri, 20 Mar 2015 14:04:15 +0000 (10:04 -0400)]
Set file width to 35%
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
Steve Sutton [Fri, 20 Mar 2015 13:52:17 +0000 (09:52 -0400)]
Hide search and create redirect for membersonly
Steve Sutton [Thu, 19 Mar 2015 18:33:22 +0000 (14:33 -0400)]
Update submit button class
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
Steve Sutton [Wed, 18 Mar 2015 13:26:15 +0000 (09:26 -0400)]
Merge tag 'v1.0.26' into develop
Version 1.0.26
Steve Sutton [Wed, 18 Mar 2015 13:26:03 +0000 (09:26 -0400)]
Merge branch 'hotfix/1.0.26'
Steve Sutton [Wed, 18 Mar 2015 13:25:41 +0000 (09:25 -0400)]
Hide h3 h4 h5 h6 in the blog feed area
Steve Sutton [Wed, 18 Mar 2015 13:10:13 +0000 (09:10 -0400)]
Merge tag 'v1.0.25' into develop
Version 1.0.25
Steve Sutton [Wed, 18 Mar 2015 13:10:03 +0000 (09:10 -0400)]
Merge branch 'release/1.0.25'
Steve Sutton [Wed, 18 Mar 2015 13:08:38 +0000 (09:08 -0400)]
Add course image to member profile pages
Steve Sutton [Tue, 17 Mar 2015 16:59:25 +0000 (12:59 -0400)]
Merge tag 'v1.0.24' into develop
Version 1.0.24
Steve Sutton [Tue, 17 Mar 2015 16:59:15 +0000 (12:59 -0400)]
Merge branch 'release/1.0.24'
Steve Sutton [Tue, 17 Mar 2015 16:58:11 +0000 (12:58 -0400)]
Move tracking pixel
To keep footer on bottom
Steve Sutton [Tue, 17 Mar 2015 16:27:28 +0000 (12:27 -0400)]
Merge tag 'v1.0.23' into develop
Version 1.0.23
Steve Sutton [Tue, 17 Mar 2015 16:27:19 +0000 (12:27 -0400)]
Merge branch 'hotfix/1.0.23'
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
Steve Sutton [Tue, 17 Mar 2015 15:21:15 +0000 (11:21 -0400)]
Merge tag 'v1.0.22' into develop
Version 1.0.22
Steve Sutton [Tue, 17 Mar 2015 15:21:06 +0000 (11:21 -0400)]
Merge branch 'hotfix/1.0.22'
Steve Sutton [Tue, 17 Mar 2015 15:20:30 +0000 (11:20 -0400)]
Update size of image and header on blog feed
Steve Sutton [Tue, 17 Mar 2015 13:57:12 +0000 (09:57 -0400)]
Merge tag 'v1.0.21' into develop
Version 1.0.21
Steve Sutton [Tue, 17 Mar 2015 13:57:02 +0000 (09:57 -0400)]
Merge branch 'release/1.0.21'
Steve Sutton [Tue, 17 Mar 2015 13:54:29 +0000 (09:54 -0400)]
Add social and info to off-canvas
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.
Steve Sutton [Fri, 13 Mar 2015 16:48:55 +0000 (12:48 -0400)]
Merge tag 'v1.0.20' into develop
Version 1.0.20
Steve Sutton [Fri, 13 Mar 2015 16:48:47 +0000 (12:48 -0400)]
Merge branch 'hotfix/1.0.20'
Steve Sutton [Fri, 13 Mar 2015 16:48:24 +0000 (12:48 -0400)]
Adding logo to top of event pdf
assets/logoPdf.png
Laury GvR [Tue, 10 Mar 2015 20:40:53 +0000 (16:40 -0400)]
Merge tag 'v1.1.5' into develop
v1.1.5
Laury GvR [Tue, 10 Mar 2015 20:40:49 +0000 (16:40 -0400)]
Merge branch 'hotfix/1.1.5'
Laury GvR [Tue, 10 Mar 2015 20:40:36 +0000 (16:40 -0400)]
Added fancybox. Video & Gallery styles and config set up
Laury GvR [Tue, 10 Mar 2015 19:23:53 +0000 (15:23 -0400)]
Merge tag 'v1.1.4' into develop
v1.1.4
Laury GvR [Tue, 10 Mar 2015 19:23:48 +0000 (15:23 -0400)]
Merge branch 'hotfix/1.1.4'
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
Laury GvR [Tue, 10 Mar 2015 19:18:07 +0000 (15:18 -0400)]
Merge tag 'v1.1.3' into develop
v1.1.3
Laury GvR [Tue, 10 Mar 2015 19:17:38 +0000 (15:17 -0400)]
Merge branch 'hotfix/1.1.3'
Laury GvR [Tue, 10 Mar 2015 19:17:23 +0000 (15:17 -0400)]
Top nav was disappearing under slideshow nav. raised z-index.
Laury GvR [Tue, 10 Mar 2015 19:04:12 +0000 (15:04 -0400)]
Merge tag 'v1.1.2' into develop
v1.1.2
Laury GvR [Tue, 10 Mar 2015 19:04:02 +0000 (15:04 -0400)]
Merge branch 'hotfix/1.1.2'
Laury GvR [Tue, 10 Mar 2015 19:03:55 +0000 (15:03 -0400)]
No more slideshow caption in mobile view
Laury GvR [Tue, 10 Mar 2015 18:43:07 +0000 (14:43 -0400)]
Merge tag 'v1.1.1' into develop
v1.1.1
Laury GvR [Tue, 10 Mar 2015 18:43:01 +0000 (14:43 -0400)]
Merge branch 'hotfix/1.1.1'
Laury GvR [Tue, 10 Mar 2015 18:42:50 +0000 (14:42 -0400)]
Off-canvas nav color issue fixed
Laury GvR [Tue, 10 Mar 2015 18:39:42 +0000 (14:39 -0400)]
Merge tag 'v1.1.0' into develop
v1.1.0
Laury GvR [Tue, 10 Mar 2015 18:39:34 +0000 (14:39 -0400)]
Merge branch 'release/1.1.0'
Laury GvR [Tue, 10 Mar 2015 18:36:15 +0000 (14:36 -0400)]
Off-canvas styling, off-canvas nav php.
Laury GvR [Tue, 10 Mar 2015 16:07:27 +0000 (12:07 -0400)]
Merge tag 'v1.0.18' into develop
v1.0.18
Laury GvR [Tue, 10 Mar 2015 16:07:20 +0000 (12:07 -0400)]
Merge branch 'hotfix/1.0.18'
Laury GvR [Tue, 10 Mar 2015 16:07:10 +0000 (12:07 -0400)]
rewrite from nav to blog in htaccess
Laury GvR [Tue, 10 Mar 2015 15:59:58 +0000 (11:59 -0400)]
Rewrite for navigating to blog from nav item
Steve Sutton [Tue, 10 Mar 2015 14:36:56 +0000 (10:36 -0400)]
Start working on Member Only Navigation
Steve Sutton [Tue, 10 Mar 2015 12:25:49 +0000 (08:25 -0400)]
Merge tag 'v1.0.17' into develop
Version 1.0.17
Steve Sutton [Tue, 10 Mar 2015 12:25:14 +0000 (08:25 -0400)]
Merge branch 'hotfix/1.0.17'
Steve Sutton [Tue, 10 Mar 2015 12:24:58 +0000 (08:24 -0400)]
Fix map icon sizes
Laury GvR [Mon, 9 Mar 2015 21:08:11 +0000 (17:08 -0400)]
Merge tag 'v1.0.16' into develop
v1.0.16
Laury GvR [Mon, 9 Mar 2015 21:08:05 +0000 (17:08 -0400)]
Merge branch 'hotfix/1.0.16'
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
Laury GvR [Mon, 9 Mar 2015 15:01:07 +0000 (11:01 -0400)]
Merge tag 'v1.0.15' into develop
v1.0.15
Laury GvR [Mon, 9 Mar 2015 15:00:53 +0000 (11:00 -0400)]
Merge branch 'hotfix/1.0.15'