web/TroutCreek.git
8 years agoupdating the call number for the app.css call to break any cached versions of the...
Ian Weller [Wed, 22 Mar 2017 17:50:46 +0000 (13:50 -0400)]
updating the call number for the app.css call to break any cached versions of the site.

8 years agoI have updated the footer.
Ian Weller [Wed, 22 Mar 2017 17:10:52 +0000 (13:10 -0400)]
I have updated the footer.

I updated some of the footer elements and styles to work better in
mobile.  I think I got it.

8 years agoMerge tag 'v1.2.8' into develop
Laury GvR [Tue, 7 Feb 2017 20:45:25 +0000 (15:45 -0500)]
Merge tag 'v1.2.8' into develop

v1.2.8

8 years agoMerge branch 'release/1.2.8' v1.2.8
Laury GvR [Tue, 7 Feb 2017 20:45:21 +0000 (15:45 -0500)]
Merge branch 'release/1.2.8'

8 years agoRepositioned the webcam button for Chrome
Laury GvR [Wed, 1 Feb 2017 14:08:20 +0000 (09:08 -0500)]
Repositioned the webcam button for Chrome

The webcam button was cut off a little on Chrome, and has been
moved a little to the left.

8 years agoAdded a link to the webcam image added to top
Laury GvR [Tue, 31 Jan 2017 17:16:08 +0000 (12:16 -0500)]
Added a link to the webcam image added to top

The webcam button at the top has a link added to it.

8 years agoAdded a webcam icon at the top of the page
Laury GvR [Tue, 31 Jan 2017 17:12:54 +0000 (12:12 -0500)]
Added a webcam icon at the top of the page

There is now a webcam image at the top of the page leading to the
webcam page.

8 years agoMerge tag 'v1.2.7' into develop
Steve Sutton [Fri, 16 Dec 2016 20:58:57 +0000 (15:58 -0500)]
Merge tag 'v1.2.7' into develop

Version 1.2.7

8 years agoMerge branch 'hotfix/1.2.7' v1.2.7
Steve Sutton [Fri, 16 Dec 2016 20:58:45 +0000 (15:58 -0500)]
Merge branch 'hotfix/1.2.7'

8 years agoUpdate urls
Steve Sutton [Fri, 16 Dec 2016 20:58:26 +0000 (15:58 -0500)]
Update urls

need https take out the auto http part

8 years agoMerge tag 'v1.2.6' into develop
Steve Sutton [Fri, 16 Dec 2016 14:54:34 +0000 (09:54 -0500)]
Merge tag 'v1.2.6' into develop

Version 1.2.6

8 years agoMerge branch 'hotfix/1.2.6' v1.2.6
Steve Sutton [Fri, 16 Dec 2016 14:54:28 +0000 (09:54 -0500)]
Merge branch 'hotfix/1.2.6'

8 years agobump style sheet version number
Steve Sutton [Fri, 16 Dec 2016 14:54:21 +0000 (09:54 -0500)]
bump style sheet version number

8 years agoMerge tag 'v1.2.5' into develop
Steve Sutton [Fri, 16 Dec 2016 14:51:55 +0000 (09:51 -0500)]
Merge tag 'v1.2.5' into develop

Version 1.2.5

8 years agoMerge branch 'release/1.2.5' v1.2.5
Steve Sutton [Fri, 16 Dec 2016 14:51:30 +0000 (09:51 -0500)]
Merge branch 'release/1.2.5'

8 years agoUpdates for Packages
Steve Sutton [Fri, 16 Dec 2016 14:12:03 +0000 (09:12 -0500)]
Updates for Packages

Adding new field for bookurl Book Now.
Updating the styles for the buttons under the image on the package
detail pages.

8 years agoMerge tag 'v1.2.4' into develop
Steve Sutton [Mon, 5 Dec 2016 16:30:27 +0000 (11:30 -0500)]
Merge tag 'v1.2.4' into develop

Version 1.2.4

8 years agoMerge branch 'release/1.2.4' v1.2.4
Steve Sutton [Mon, 5 Dec 2016 16:30:20 +0000 (11:30 -0500)]
Merge branch 'release/1.2.4'

8 years agoTurn on the packages
Steve Sutton [Mon, 5 Dec 2016 16:25:31 +0000 (11:25 -0500)]
Turn on the packages

remove check for preview in request

8 years agoTurn on the packages
Steve Sutton [Mon, 5 Dec 2016 16:25:31 +0000 (11:25 -0500)]
Turn on the packages

remove check for preview in request

8 years agoMerge tag 'v1.2.3' into develop
Anthony Talarico [Wed, 2 Nov 2016 17:28:05 +0000 (13:28 -0400)]
Merge tag 'v1.2.3' into develop

changing the fall activities button to winter activities and linking the button to the winter activities page

8 years agoMerge branch 'hotfix/1.2.3' v1.2.3
Anthony Talarico [Wed, 2 Nov 2016 17:27:47 +0000 (13:27 -0400)]
Merge branch 'hotfix/1.2.3'

8 years agochanging fall activities button to winter activities and relinking the button to...
Anthony Talarico [Wed, 2 Nov 2016 17:26:19 +0000 (13:26 -0400)]
changing fall activities button to winter activities and relinking the button to the winter activities page

8 years agoMerge tag 'v1.2.2' into develop
Steve Sutton [Mon, 24 Oct 2016 15:38:42 +0000 (11:38 -0400)]
Merge tag 'v1.2.2' into develop

Version 1.2.2

8 years agoMerge branch 'hotfix/1.2.2' v1.2.2
Steve Sutton [Mon, 24 Oct 2016 15:38:36 +0000 (11:38 -0400)]
Merge branch 'hotfix/1.2.2'

8 years agoUpdate preview link
Steve Sutton [Mon, 24 Oct 2016 15:38:23 +0000 (11:38 -0400)]
Update preview link

8 years agoMerge tag 'v1.2.1' into develop
Steve Sutton [Mon, 24 Oct 2016 15:26:55 +0000 (11:26 -0400)]
Merge tag 'v1.2.1' into develop

Version 1.2.1

8 years agoMerge branch 'hotfix/1.2.1' v1.2.1
Steve Sutton [Mon, 24 Oct 2016 15:26:49 +0000 (11:26 -0400)]
Merge branch 'hotfix/1.2.1'

8 years agoupdates for preview only
Steve Sutton [Mon, 24 Oct 2016 15:26:43 +0000 (11:26 -0400)]
updates for preview only

8 years agoMerge tag 'v1.2.0' into develop
Steve Sutton [Mon, 24 Oct 2016 15:21:28 +0000 (11:21 -0400)]
Merge tag 'v1.2.0' into develop

Version 1.2.0

8 years agoMerge branch 'release/1.2.0' v1.2.0
Steve Sutton [Mon, 24 Oct 2016 15:21:21 +0000 (11:21 -0400)]
Merge branch 'release/1.2.0'

8 years agoBump version number
Steve Sutton [Mon, 24 Oct 2016 15:20:52 +0000 (11:20 -0400)]
Bump version number

For the style sheet call. Use same as git version number.

8 years agoUpdates for packages
Steve Sutton [Mon, 24 Oct 2016 15:18:17 +0000 (11:18 -0400)]
Updates for packages

Updating the package detail breadcrumbs.
Update package app so they can put on any page.
Page will get full width.
Currently will only work if previewed from admin side.

8 years agoUpdate colors for packages
Steve Sutton [Wed, 19 Oct 2016 18:21:29 +0000 (14:21 -0400)]
Update colors for packages

Change text color for the saving and dates to white.

8 years agoUpdate colors
Steve Sutton [Wed, 19 Oct 2016 12:22:58 +0000 (08:22 -0400)]
Update colors

Updating the Colors for the packages.
New colors for the saving dates and the detail button.

8 years agoAdjust for medium and mobile on detail page.
Steve Sutton [Mon, 17 Oct 2016 19:18:50 +0000 (15:18 -0400)]
Adjust for medium and mobile on detail page.

Adjust the saving and dates banners for medium and small views.

8 years agoAdjust for detail page.
Steve Sutton [Mon, 17 Oct 2016 18:56:35 +0000 (14:56 -0400)]
Adjust for detail page.

8 years agoMove packages to lodging special page.
Steve Sutton [Mon, 17 Oct 2016 18:46:39 +0000 (14:46 -0400)]
Move packages to lodging special page.

Setting up the packages for a new page. not home.

8 years agoUpdate for not finding package.
Steve Sutton [Fri, 14 Oct 2016 17:02:02 +0000 (13:02 -0400)]
Update for not finding package.

If you don't find the package then don't try to call the object.

8 years agoUpdate on admin edit page.
Steve Sutton [Fri, 14 Oct 2016 16:55:03 +0000 (12:55 -0400)]
Update on admin edit page.

Fix for not hiding the hide show link.
Also fixing the confirm message for delete.

8 years agoUpdate for adding anchor
Steve Sutton [Thu, 13 Oct 2016 18:29:47 +0000 (14:29 -0400)]
Update for adding anchor

Adding anchor to the detail page to the image.

8 years agoCorrect url
Steve Sutton [Thu, 13 Oct 2016 18:22:47 +0000 (14:22 -0400)]
Correct url

extra slash in detail url.

8 years agoAdding packages into site.
Steve Sutton [Thu, 13 Oct 2016 18:20:05 +0000 (14:20 -0400)]
Adding packages into site.

Starting with the blocks. Creating packages that will work for home page
display and get a detail for each package.

8 years agoMerge tag 'v1.0.37' into develop
Steve Sutton [Thu, 6 Oct 2016 17:21:31 +0000 (13:21 -0400)]
Merge tag 'v1.0.37' into develop

Version 1.0.37

8 years agoMerge branch 'hotfix/1.0.37' v1.0.37
Steve Sutton [Thu, 6 Oct 2016 17:21:23 +0000 (13:21 -0400)]
Merge branch 'hotfix/1.0.37'

8 years agoextra div removal is now causing site footer to not work.
Steve Sutton [Thu, 6 Oct 2016 17:20:22 +0000 (13:20 -0400)]
extra div removal is now causing site footer to not work.

If there's no blocks on home page the footer is now not working
correctly.

8 years agoMerge tag 'v1.0.36' into develop
Steve Sutton [Thu, 6 Oct 2016 16:57:36 +0000 (12:57 -0400)]
Merge tag 'v1.0.36' into develop

Version 1.0.36

8 years agoMerge branch 'hotfix/1.0.36' v1.0.36
Steve Sutton [Thu, 6 Oct 2016 16:57:26 +0000 (12:57 -0400)]
Merge branch 'hotfix/1.0.36'

8 years agoFound extra div in the headlines output.
Steve Sutton [Thu, 6 Oct 2016 16:56:41 +0000 (12:56 -0400)]
Found extra div in the headlines output.

Extra div found which would mess up the footer if blocks were
outputting.

8 years agoUpdate sass and css for the reservation site
Steve Sutton [Wed, 5 Oct 2016 16:00:30 +0000 (12:00 -0400)]
Update sass and css for the reservation site

This is for resapp.css build.

8 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

8 years agoMerge tag 'v1.0.35' into develop
Steve Sutton [Wed, 5 Oct 2016 16:01:42 +0000 (12:01 -0400)]
Merge tag 'v1.0.35' into develop

Version 1.0.35

8 years agoMerge branch 'release/1.0.35' v1.0.35
Steve Sutton [Wed, 5 Oct 2016 16:01:35 +0000 (12:01 -0400)]
Merge branch 'release/1.0.35'

8 years agoUpdate sass and css for the reservation site
Steve Sutton [Wed, 5 Oct 2016 16:00:30 +0000 (12:00 -0400)]
Update sass and css for the reservation site

This is for resapp.css build.

8 years agoMerge tag 'v1.0.34' into develop
Steve Sutton [Thu, 29 Sep 2016 18:48:10 +0000 (14:48 -0400)]
Merge tag 'v1.0.34' into develop

Version 1.0.34

8 years agoMerge branch 'hotfix/1.0.34' v1.0.34
Steve Sutton [Thu, 29 Sep 2016 18:48:00 +0000 (14:48 -0400)]
Merge branch 'hotfix/1.0.34'

8 years agoUpdate on .htaccess file
Steve Sutton [Thu, 29 Sep 2016 18:47:42 +0000 (14:47 -0400)]
Update on .htaccess file

This is to prevent other domains from getting to site and getting their
site url into the nav cache.

8 years agoMerge tag 'v1.0.33' into develop
Steve Sutton [Sun, 11 Sep 2016 00:52:05 +0000 (20:52 -0400)]
Merge tag 'v1.0.33' into develop

Version 1.0.33

8 years agoMerge branch 'hotfix/1.0.33' v1.0.33
Steve Sutton [Sun, 11 Sep 2016 00:51:57 +0000 (20:51 -0400)]
Merge branch 'hotfix/1.0.33'

8 years agoUpdate the style for resapp.css
Steve Sutton [Sun, 11 Sep 2016 00:51:19 +0000 (20:51 -0400)]
Update the style for resapp.css

Hopefully to fix the owner page

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'