web/TroutCreek.git
8 years agoMerge tag 'v1.0.31' into develop
Ian Weller [Fri, 2 Sep 2016 17:31:10 +0000 (13:31 -0400)]
Merge tag 'v1.0.31' into develop

version 1.0.31

8 years agoMerge branch 'hotfix/1.0.31' v1.0.31 v1.0.32
Ian Weller [Fri, 2 Sep 2016 17:30:33 +0000 (13:30 -0400)]
Merge branch 'hotfix/1.0.31'

8 years agoupdated link and text in link
Ian Weller [Fri, 2 Sep 2016 17:25:41 +0000 (13:25 -0400)]
updated link and text in link

I changed the link to the right page and changed the word Summer to Fall

8 years agoMerge tag 'v1.0.30' into develop
Ian Weller [Tue, 26 Jul 2016 20:55:58 +0000 (16:55 -0400)]
Merge tag 'v1.0.30' into develop

version 1.0.30

8 years agoMerge branch 'hotfix/1.0.30' v1.0.30
Ian Weller [Tue, 26 Jul 2016 20:54:47 +0000 (16:54 -0400)]
Merge branch 'hotfix/1.0.30'

8 years agochanging winter to summer and updating the link
Ian Weller [Tue, 26 Jul 2016 20:53:33 +0000 (16:53 -0400)]
changing winter to summer and updating the link

9 years agoMerge tag 'v1.0.29' into develop
Steve Sutton [Tue, 10 May 2016 17:43:22 +0000 (13:43 -0400)]
Merge tag 'v1.0.29' into develop

Version 1.0.29

9 years agoMerge branch 'hotfix/1.0.29' v1.0.29
Steve Sutton [Tue, 10 May 2016 17:43:15 +0000 (13:43 -0400)]
Merge branch 'hotfix/1.0.29'

9 years agobump version number for css
Steve Sutton [Tue, 10 May 2016 17:43:10 +0000 (13:43 -0400)]
bump version number for css

9 years agoMerge tag 'v1.0.28' into develop
Anthony Talarico [Mon, 9 May 2016 19:30:34 +0000 (15:30 -0400)]
Merge tag 'v1.0.28' into develop

forgot period in pc view

9 years agoMerge branch 'hotfix/1.0.28' v1.0.28
Anthony Talarico [Mon, 9 May 2016 19:30:23 +0000 (15:30 -0400)]
Merge branch 'hotfix/1.0.28'

9 years agoadded period in pc view
Anthony Talarico [Mon, 9 May 2016 19:30:08 +0000 (15:30 -0400)]
added period in pc view

9 years agoMerge tag 'v1.0.27' into develop
Anthony Talarico [Mon, 9 May 2016 19:28:41 +0000 (15:28 -0400)]
Merge tag 'v1.0.27' into develop

added period at end of slogan

9 years agoMerge branch 'hotfix/1.0.27' v1.0.27
Anthony Talarico [Mon, 9 May 2016 19:28:33 +0000 (15:28 -0400)]
Merge branch 'hotfix/1.0.27'

9 years agoadded period at the end of slogan
Anthony Talarico [Mon, 9 May 2016 19:28:21 +0000 (15:28 -0400)]
added period at the end of slogan

9 years agoMerge tag 'v1.0.26' into develop
Anthony Talarico [Mon, 9 May 2016 19:04:01 +0000 (15:04 -0400)]
Merge tag 'v1.0.26' into develop

v1.0.26

9 years agoMerge branch 'hotfix/1.0.26' v1.0.26
Anthony Talarico [Mon, 9 May 2016 19:03:46 +0000 (15:03 -0400)]
Merge branch 'hotfix/1.0.26'

9 years agoreverting small change
Anthony Talarico [Mon, 9 May 2016 18:52:06 +0000 (14:52 -0400)]
reverting small change

9 years agoMerge branch 'hotfix/1.0.25' v1.0.25
Anthony Talarico [Mon, 9 May 2016 18:33:27 +0000 (14:33 -0400)]
Merge branch 'hotfix/1.0.25'

9 years agoattempting to fix a branch issue, small change made
Anthony Talarico [Mon, 9 May 2016 18:32:54 +0000 (14:32 -0400)]
attempting to fix a branch issue, small change made

9 years agoadded slogan to pc, mobile and tablet view
Anthony Talarico [Mon, 9 May 2016 18:26:41 +0000 (14:26 -0400)]
added slogan to pc, mobile and tablet view

9 years agoadded slogan to pc, mobile and tablet view
Anthony Talarico [Mon, 9 May 2016 18:26:41 +0000 (14:26 -0400)]
added slogan to pc, mobile and tablet view

9 years agoMerge tag 'v1.0.24' into develop
Steve Sutton [Thu, 7 Apr 2016 19:01:34 +0000 (15:01 -0400)]
Merge tag 'v1.0.24' into develop

Version 1.0.24

9 years agoMerge branch 'hotfix/1.0.24' v1.0.24
Steve Sutton [Thu, 7 Apr 2016 19:01:25 +0000 (15:01 -0400)]
Merge branch 'hotfix/1.0.24'

9 years agolist videos with titles
Steve Sutton [Thu, 7 Apr 2016 19:01:10 +0000 (15:01 -0400)]
list videos with titles

9 years agoUpdate videos
Steve Sutton [Thu, 7 Apr 2016 18:59:25 +0000 (14:59 -0400)]
Update videos

adding title
update so they can upload https for the url

9 years agoMerge tag 'v1.0.23' into develop
Anthony Talarico [Mon, 14 Mar 2016 12:56:11 +0000 (08:56 -0400)]
Merge tag 'v1.0.23' into develop

added border to instagram icon for all views

9 years agoMerge branch 'hotfix/1.0.23' v1.0.23
Anthony Talarico [Mon, 14 Mar 2016 12:56:00 +0000 (08:56 -0400)]
Merge branch 'hotfix/1.0.23'

9 years agoadded white borded to instagram icon for large, medium and off canvas
Anthony Talarico [Mon, 14 Mar 2016 12:55:33 +0000 (08:55 -0400)]
added white borded to instagram icon for large, medium and off canvas

9 years agoMerge tag 'v1.0.22' into develop
Anthony Talarico [Fri, 11 Mar 2016 16:33:12 +0000 (11:33 -0500)]
Merge tag 'v1.0.22' into develop

added logo and link for off canvas and bumped stylesheet

9 years agoMerge branch 'hotfix/1.0.22' v1.0.22
Anthony Talarico [Fri, 11 Mar 2016 16:32:41 +0000 (11:32 -0500)]
Merge branch 'hotfix/1.0.22'

9 years agoadded logo for off canvas and bumped stylesheet
Anthony Talarico [Fri, 11 Mar 2016 16:32:06 +0000 (11:32 -0500)]
added logo for off canvas and bumped stylesheet

9 years agoMerge tag 'v1.0.21' into develop
Anthony Talarico [Fri, 11 Mar 2016 16:21:37 +0000 (11:21 -0500)]
Merge tag 'v1.0.21' into develop

added logo for medium view

9 years agoMerge branch 'hotfix/1.0.21' v1.0.21
Anthony Talarico [Fri, 11 Mar 2016 16:21:28 +0000 (11:21 -0500)]
Merge branch 'hotfix/1.0.21'

9 years agoadded logo for medium and large view
Anthony Talarico [Fri, 11 Mar 2016 16:21:03 +0000 (11:21 -0500)]
added logo for medium and large view

9 years agoMerge tag 'v1.0.20' into develop
Anthony Talarico [Fri, 11 Mar 2016 16:18:36 +0000 (11:18 -0500)]
Merge tag 'v1.0.20' into develop

bumped stylesheet version to 1.0.17

9 years agoMerge branch 'hotfix/1.0.20' v1.0.20
Anthony Talarico [Fri, 11 Mar 2016 16:18:24 +0000 (11:18 -0500)]
Merge branch 'hotfix/1.0.20'

9 years agobumped stylesheet to 1.0.17
Anthony Talarico [Fri, 11 Mar 2016 16:18:04 +0000 (11:18 -0500)]
bumped stylesheet to 1.0.17

9 years agoMerge tag 'v1.0.19' into develop
Anthony Talarico [Fri, 11 Mar 2016 16:14:25 +0000 (11:14 -0500)]
Merge tag 'v1.0.19' into develop

added instagram icon and link to header

9 years agoMerge branch 'hotfix/1.0.19' v1.0.19
Anthony Talarico [Fri, 11 Mar 2016 16:14:15 +0000 (11:14 -0500)]
Merge branch 'hotfix/1.0.19'

9 years agoadded instagram icon with link to the header
Anthony Talarico [Fri, 11 Mar 2016 16:13:46 +0000 (11:13 -0500)]
added instagram icon with link to the header

9 years agoMerge tag 'v1.0.18' into develop
Steve Sutton [Wed, 17 Feb 2016 14:42:37 +0000 (09:42 -0500)]
Merge tag 'v1.0.18' into develop

Version 1.0.18

9 years agoMerge branch 'hotfix/1.0.18' v1.0.18
Steve Sutton [Wed, 17 Feb 2016 14:42:27 +0000 (09:42 -0500)]
Merge branch 'hotfix/1.0.18'

9 years agoUpdate the home page buttons
Steve Sutton [Wed, 17 Feb 2016 14:41:57 +0000 (09:41 -0500)]
Update the home page buttons

Reorder them and change the enews to Winter Activities

9 years agoMerge tag 'v1.0.17' into develop
Steve Sutton [Thu, 5 Nov 2015 21:39:31 +0000 (16:39 -0500)]
Merge tag 'v1.0.17' into develop

Version 1.0.17

9 years agoMerge branch 'hotfix/1.0.17' v1.0.17
Steve Sutton [Thu, 5 Nov 2015 21:39:21 +0000 (16:39 -0500)]
Merge branch 'hotfix/1.0.17'

9 years agoUpdate for res mobile form
Steve Sutton [Thu, 5 Nov 2015 21:38:47 +0000 (16:38 -0500)]
Update for res mobile form

update spacing on how it output
use small 12 and small 12

9 years agoMerge tag 'v1.0.16' into develop
Steve Sutton [Thu, 5 Nov 2015 21:33:52 +0000 (16:33 -0500)]
Merge tag 'v1.0.16' into develop

Version 1.0.16

9 years agoMerge branch 'hotfix/1.0.16' v1.0.16
Steve Sutton [Thu, 5 Nov 2015 21:33:44 +0000 (16:33 -0500)]
Merge branch 'hotfix/1.0.16'

9 years agobump version number for style sheet
Steve Sutton [Thu, 5 Nov 2015 21:33:38 +0000 (16:33 -0500)]
bump version number for style sheet

9 years agoMerge tag 'v1.0.15' into develop
Steve Sutton [Thu, 5 Nov 2015 21:32:06 +0000 (16:32 -0500)]
Merge tag 'v1.0.15' into develop

Version 1.0.15

9 years agoMerge branch 'hotfix/1.0.15' v1.0.15
Steve Sutton [Thu, 5 Nov 2015 21:31:58 +0000 (16:31 -0500)]
Merge branch 'hotfix/1.0.15'

9 years agoFix for mobile reservations
Steve Sutton [Thu, 5 Nov 2015 21:31:34 +0000 (16:31 -0500)]
Fix for mobile reservations

Remove the mobile form dates.

9 years agoMerge tag 'v1.0.14' into develop
Steve Sutton [Thu, 5 Nov 2015 18:12:03 +0000 (13:12 -0500)]
Merge tag 'v1.0.14' into develop

Version 1.0.14

9 years agoMerge branch 'hotfix/1.0.14' v1.0.14
Steve Sutton [Thu, 5 Nov 2015 18:11:55 +0000 (13:11 -0500)]
Merge branch 'hotfix/1.0.14'

9 years agoUpdate urls
Steve Sutton [Thu, 5 Nov 2015 18:11:23 +0000 (13:11 -0500)]
Update urls

one is for desktop reservations and the other is for mobile

9 years agoMerge tag 'v1.0.13' into develop
Steve Sutton [Mon, 2 Nov 2015 21:19:24 +0000 (16:19 -0500)]
Merge tag 'v1.0.13' into develop

Version 1.0.13

9 years agoMerge branch 'hotfix/1.0.13' v1.0.13
Steve Sutton [Mon, 2 Nov 2015 21:19:15 +0000 (16:19 -0500)]
Merge branch 'hotfix/1.0.13'

9 years agoPut the only in the header place
Steve Sutton [Mon, 2 Nov 2015 21:18:56 +0000 (16:18 -0500)]
Put the only in the header place

9 years agoMerge tag 'v1.0.12' into develop
Steve Sutton [Mon, 2 Nov 2015 21:15:58 +0000 (16:15 -0500)]
Merge tag 'v1.0.12' into develop

Version 1.0.12

9 years agoMerge branch 'hotfix/1.0.12' v1.0.12
Steve Sutton [Mon, 2 Nov 2015 21:15:51 +0000 (16:15 -0500)]
Merge branch 'hotfix/1.0.12'

9 years agoFix forms for reservations
Steve Sutton [Mon, 2 Nov 2015 21:15:09 +0000 (16:15 -0500)]
Fix forms for reservations

need two forms because the one before was overwriting the dates

9 years agoMerge tag 'v1.0.11' into develop
Steve Sutton [Mon, 2 Nov 2015 20:24:20 +0000 (15:24 -0500)]
Merge tag 'v1.0.11' into develop

Version 1.0.11

9 years agoMerge branch 'hotfix/1.0.11' v1.0.11
Steve Sutton [Mon, 2 Nov 2015 20:24:13 +0000 (15:24 -0500)]
Merge branch 'hotfix/1.0.11'

9 years agoUpdate the reservation js
Steve Sutton [Mon, 2 Nov 2015 20:24:01 +0000 (15:24 -0500)]
Update the reservation js

make first date be min +3

9 years agoupdate the reservation url
Steve Sutton [Mon, 2 Nov 2015 20:15:38 +0000 (15:15 -0500)]
update the reservation url

9 years agoMerge tag 'v1.0.10' into develop
Steve Sutton [Wed, 21 Oct 2015 20:06:44 +0000 (16:06 -0400)]
Merge tag 'v1.0.10' into develop

Version 1.0.10

9 years agoMerge branch 'hotfix/1.0.10' v1.0.10
Steve Sutton [Wed, 21 Oct 2015 20:06:35 +0000 (16:06 -0400)]
Merge branch 'hotfix/1.0.10'

9 years agoupdate reservation url
Steve Sutton [Wed, 21 Oct 2015 20:06:30 +0000 (16:06 -0400)]
update reservation url

9 years agoMerge tag 'v1.0.9' into develop
Steve Sutton [Wed, 21 Oct 2015 19:40:08 +0000 (15:40 -0400)]
Merge tag 'v1.0.9' into develop

Version 1.0.9

9 years agoMerge branch 'hotfix/1.0.9' v1.0.9
Steve Sutton [Wed, 21 Oct 2015 19:40:01 +0000 (15:40 -0400)]
Merge branch 'hotfix/1.0.9'

9 years agoUpdate the template to add google analytics code
Steve Sutton [Wed, 21 Oct 2015 19:39:14 +0000 (15:39 -0400)]
Update the template to add google analytics code

per client request

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

Version 1.0.8

10 years agoMerge branch 'hotfix/1.0.8' v1.0.8
Steve Sutton [Wed, 18 Mar 2015 17:31:55 +0000 (13:31 -0400)]
Merge branch 'hotfix/1.0.8'

10 years agoTurn off mobile
Steve Sutton [Wed, 18 Mar 2015 17:31:40 +0000 (13:31 -0400)]
Turn off mobile

10 years agoMerge tag 'v1.0.7' into develop
Steve Sutton [Tue, 10 Mar 2015 19:05:31 +0000 (15:05 -0400)]
Merge tag 'v1.0.7' into develop

Version 1.0.7

10 years agoMerge branch 'hotfix/1.0.7' v1.0.7
Steve Sutton [Tue, 10 Mar 2015 19:05:23 +0000 (15:05 -0400)]
Merge branch 'hotfix/1.0.7'

10 years agobump vrs # for css
Steve Sutton [Tue, 10 Mar 2015 19:05:14 +0000 (15:05 -0400)]
bump vrs # for css

10 years agoMerge tag 'v1.0.6' into develop
Steve Sutton [Tue, 10 Mar 2015 19:04:30 +0000 (15:04 -0400)]
Merge tag 'v1.0.6' into develop

Version 1.0.6

10 years agoMerge branch 'hotfix/1.0.6' v1.0.6
Steve Sutton [Tue, 10 Mar 2015 19:04:20 +0000 (15:04 -0400)]
Merge branch 'hotfix/1.0.6'

10 years agofix padding on top of bullet list
Steve Sutton [Tue, 10 Mar 2015 19:04:13 +0000 (15:04 -0400)]
fix padding on top of bullet list

10 years agoMerge tag 'v1.0.5' into develop
Steve Sutton [Fri, 20 Feb 2015 16:56:36 +0000 (11:56 -0500)]
Merge tag 'v1.0.5' into develop

Version 1.0.5

10 years agoMerge branch 'release/1.0.5' v1.0.5
Steve Sutton [Fri, 20 Feb 2015 16:56:28 +0000 (11:56 -0500)]
Merge branch 'release/1.0.5'

10 years agoOne more update on res form
Steve Sutton [Fri, 20 Feb 2015 16:55:09 +0000 (11:55 -0500)]
One more update on res form

Redo for small view the markup for the res fields

10 years agoMerge tag 'v1.0.4' into develop
Steve Sutton [Fri, 20 Feb 2015 16:39:28 +0000 (11:39 -0500)]
Merge tag 'v1.0.4' into develop

Version 1.0.4

10 years agoMerge branch 'hotfix/1.0.4' v1.0.4
Steve Sutton [Fri, 20 Feb 2015 16:39:19 +0000 (11:39 -0500)]
Merge branch 'hotfix/1.0.4'

10 years agoUpdate the reservation fields
Steve Sutton [Fri, 20 Feb 2015 16:37:44 +0000 (11:37 -0500)]
Update the reservation fields

Use the image as background instead of the extra field

10 years agoMerge tag 'v1.0.3' into develop
Steve Sutton [Fri, 20 Feb 2015 15:28:58 +0000 (10:28 -0500)]
Merge tag 'v1.0.3' into develop

Version 1.0.3

10 years agoMerge branch 'release/1.0.3' v1.0.3
Steve Sutton [Fri, 20 Feb 2015 15:28:47 +0000 (10:28 -0500)]
Merge branch 'release/1.0.3'

10 years agoMake sure res link doesn't open new window
Steve Sutton [Fri, 20 Feb 2015 15:28:04 +0000 (10:28 -0500)]
Make sure res link doesn't open new window

update the external.js file in js/custom

10 years agoMerge tag 'v1.0.2' into develop
Steve Sutton [Fri, 20 Feb 2015 15:21:17 +0000 (10:21 -0500)]
Merge tag 'v1.0.2' into develop

Version 1.0.2

10 years agoMerge branch 'release/1.0.2' v1.0.2
Steve Sutton [Fri, 20 Feb 2015 15:21:09 +0000 (10:21 -0500)]
Merge branch 'release/1.0.2'

10 years agoUpdates for changes to the reservation part
Steve Sutton [Fri, 20 Feb 2015 15:20:03 +0000 (10:20 -0500)]
Updates for changes to the reservation part

10 years agoMerge tag 'v1.0.1' into develop
Steve Sutton [Thu, 19 Feb 2015 15:59:49 +0000 (10:59 -0500)]
Merge tag 'v1.0.1' into develop

Version 1.0.1

10 years agoMerge branch 'release/1.0.1' v1.0.1
Steve Sutton [Thu, 19 Feb 2015 15:59:38 +0000 (10:59 -0500)]
Merge branch 'release/1.0.1'

10 years agoMay this will be the final one
Steve Sutton [Thu, 19 Feb 2015 15:55:23 +0000 (10:55 -0500)]
May this will be the final one

For the reservation inputs

10 years agoUpdate for small phones
Steve Sutton [Thu, 19 Feb 2015 15:46:54 +0000 (10:46 -0500)]
Update for small phones

10 years agoMerge tag 'v1.0.0' into develop
Steve Sutton [Thu, 19 Feb 2015 15:31:56 +0000 (10:31 -0500)]
Merge tag 'v1.0.0' into develop

Version 1.0.0

10 years agoMerge branch 'release/1.0.0' v1.0.0
Steve Sutton [Thu, 19 Feb 2015 15:31:44 +0000 (10:31 -0500)]
Merge branch 'release/1.0.0'

10 years agoupdate htaccess file
Steve Sutton [Thu, 19 Feb 2015 15:27:34 +0000 (10:27 -0500)]
update htaccess file