Steve Sutton [Wed, 14 Jun 2017 16:43:55 +0000 (12:43 -0400)]
Merge tag 'v1.2.14' into develop
Version 1.2.14
Steve Sutton [Wed, 14 Jun 2017 16:43:46 +0000 (12:43 -0400)]
Merge branch 'hotfix/1.2.14'
Steve Sutton [Wed, 14 Jun 2017 16:43:23 +0000 (12:43 -0400)]
Remove async
jquery is getting errors with this in.
Steve Sutton [Thu, 25 May 2017 18:06:40 +0000 (14:06 -0400)]
Merge tag 'v1.2.13' into develop
Version 1.2.13
Steve Sutton [Thu, 25 May 2017 18:06:35 +0000 (14:06 -0400)]
Merge branch 'release/1.2.13'
Steve Sutton [Thu, 25 May 2017 18:06:09 +0000 (14:06 -0400)]
optimize images
Steve Sutton [Thu, 25 May 2017 17:37:25 +0000 (13:37 -0400)]
Merge tag 'v1.2.12' into develop
Version 1.2.12
Steve Sutton [Thu, 25 May 2017 17:37:16 +0000 (13:37 -0400)]
Merge branch 'hotfix/1.2.12'
Steve Sutton [Thu, 25 May 2017 17:36:47 +0000 (13:36 -0400)]
Update script calls
Use async attribute for scripts
Steve Sutton [Thu, 25 May 2017 17:29:09 +0000 (13:29 -0400)]
Merge tag 'v1.2.11' into develop
Version 1.2.11
Steve Sutton [Thu, 25 May 2017 17:29:00 +0000 (13:29 -0400)]
Merge branch 'hotfix/1.2.11'
Steve Sutton [Thu, 25 May 2017 17:27:59 +0000 (13:27 -0400)]
Optimizing images
Images in assets folder
Anthony Talarico [Thu, 18 May 2017 17:15:03 +0000 (13:15 -0400)]
Merge tag 'v1.2.10' into develop
changing live cam link, adding new summer web cam logo, changing winter activies to summer fun
Anthony Talarico [Thu, 18 May 2017 17:14:43 +0000 (13:14 -0400)]
Merge branch 'hotfix/1.2.10'
Anthony Talarico [Thu, 18 May 2017 17:11:34 +0000 (13:11 -0400)]
changing winter link, new live cam url, new summer logo
changing winter activities to summer fun, linking it to the summer page, adding new live cam
link to the web cam sun logo
Anthony Talarico [Thu, 18 May 2017 17:06:59 +0000 (13:06 -0400)]
Merge branch 'master' into develop
Ian Weller [Wed, 22 Mar 2017 17:53:50 +0000 (13:53 -0400)]
Merge branch 'release/1.2.9' into develop
Ian Weller [Wed, 22 Mar 2017 17:53:24 +0000 (13:53 -0400)]
Merge branch 'release/1.2.9'
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.
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.
Laury GvR [Tue, 7 Feb 2017 20:45:25 +0000 (15:45 -0500)]
Merge tag 'v1.2.8' into develop
v1.2.8
Laury GvR [Tue, 7 Feb 2017 20:45:21 +0000 (15:45 -0500)]
Merge branch 'release/1.2.8'
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.
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.
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.
Steve Sutton [Fri, 16 Dec 2016 20:58:57 +0000 (15:58 -0500)]
Merge tag 'v1.2.7' into develop
Version 1.2.7
Steve Sutton [Fri, 16 Dec 2016 20:58:45 +0000 (15:58 -0500)]
Merge branch 'hotfix/1.2.7'
Steve Sutton [Fri, 16 Dec 2016 20:58:26 +0000 (15:58 -0500)]
Update urls
need https take out the auto http part
Steve Sutton [Fri, 16 Dec 2016 14:54:34 +0000 (09:54 -0500)]
Merge tag 'v1.2.6' into develop
Version 1.2.6
Steve Sutton [Fri, 16 Dec 2016 14:54:28 +0000 (09:54 -0500)]
Merge branch 'hotfix/1.2.6'
Steve Sutton [Fri, 16 Dec 2016 14:54:21 +0000 (09:54 -0500)]
bump style sheet version number
Steve Sutton [Fri, 16 Dec 2016 14:51:55 +0000 (09:51 -0500)]
Merge tag 'v1.2.5' into develop
Version 1.2.5
Steve Sutton [Fri, 16 Dec 2016 14:51:30 +0000 (09:51 -0500)]
Merge branch 'release/1.2.5'
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.
Steve Sutton [Mon, 5 Dec 2016 16:30:27 +0000 (11:30 -0500)]
Merge tag 'v1.2.4' into develop
Version 1.2.4
Steve Sutton [Mon, 5 Dec 2016 16:30:20 +0000 (11:30 -0500)]
Merge branch 'release/1.2.4'
Steve Sutton [Mon, 5 Dec 2016 16:25:31 +0000 (11:25 -0500)]
Turn on the packages
remove check for preview in request
Steve Sutton [Mon, 5 Dec 2016 16:25:31 +0000 (11:25 -0500)]
Turn on the packages
remove check for preview in request
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
Anthony Talarico [Wed, 2 Nov 2016 17:27:47 +0000 (13:27 -0400)]
Merge branch 'hotfix/1.2.3'
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
Steve Sutton [Mon, 24 Oct 2016 15:38:42 +0000 (11:38 -0400)]
Merge tag 'v1.2.2' into develop
Version 1.2.2
Steve Sutton [Mon, 24 Oct 2016 15:38:36 +0000 (11:38 -0400)]
Merge branch 'hotfix/1.2.2'
Steve Sutton [Mon, 24 Oct 2016 15:38:23 +0000 (11:38 -0400)]
Update preview link
Steve Sutton [Mon, 24 Oct 2016 15:26:55 +0000 (11:26 -0400)]
Merge tag 'v1.2.1' into develop
Version 1.2.1
Steve Sutton [Mon, 24 Oct 2016 15:26:49 +0000 (11:26 -0400)]
Merge branch 'hotfix/1.2.1'
Steve Sutton [Mon, 24 Oct 2016 15:26:43 +0000 (11:26 -0400)]
updates for preview only
Steve Sutton [Mon, 24 Oct 2016 15:21:28 +0000 (11:21 -0400)]
Merge tag 'v1.2.0' into develop
Version 1.2.0
Steve Sutton [Mon, 24 Oct 2016 15:21:21 +0000 (11:21 -0400)]
Merge branch 'release/1.2.0'
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.
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.
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.
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.
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.
Steve Sutton [Mon, 17 Oct 2016 18:56:35 +0000 (14:56 -0400)]
Adjust for detail 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.
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.
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.
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.
Steve Sutton [Thu, 13 Oct 2016 18:22:47 +0000 (14:22 -0400)]
Correct url
extra slash in detail url.
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.
Steve Sutton [Thu, 6 Oct 2016 17:21:31 +0000 (13:21 -0400)]
Merge tag 'v1.0.37' into develop
Version 1.0.37
Steve Sutton [Thu, 6 Oct 2016 17:21:23 +0000 (13:21 -0400)]
Merge branch 'hotfix/1.0.37'
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.
Steve Sutton [Thu, 6 Oct 2016 16:57:36 +0000 (12:57 -0400)]
Merge tag 'v1.0.36' into develop
Version 1.0.36
Steve Sutton [Thu, 6 Oct 2016 16:57:26 +0000 (12:57 -0400)]
Merge branch 'hotfix/1.0.36'
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.
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.
Anthony Talarico [Mon, 9 May 2016 18:26:41 +0000 (14:26 -0400)]
added slogan to pc, mobile and tablet view
Steve Sutton [Wed, 5 Oct 2016 16:01:42 +0000 (12:01 -0400)]
Merge tag 'v1.0.35' into develop
Version 1.0.35
Steve Sutton [Wed, 5 Oct 2016 16:01:35 +0000 (12:01 -0400)]
Merge branch 'release/1.0.35'
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.
Steve Sutton [Thu, 29 Sep 2016 18:48:10 +0000 (14:48 -0400)]
Merge tag 'v1.0.34' into develop
Version 1.0.34
Steve Sutton [Thu, 29 Sep 2016 18:48:00 +0000 (14:48 -0400)]
Merge branch 'hotfix/1.0.34'
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.
Steve Sutton [Sun, 11 Sep 2016 00:52:05 +0000 (20:52 -0400)]
Merge tag 'v1.0.33' into develop
Version 1.0.33
Steve Sutton [Sun, 11 Sep 2016 00:51:57 +0000 (20:51 -0400)]
Merge branch 'hotfix/1.0.33'
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
Ian Weller [Fri, 2 Sep 2016 17:31:10 +0000 (13:31 -0400)]
Merge tag 'v1.0.31' into develop
version 1.0.31
Ian Weller [Fri, 2 Sep 2016 17:30:33 +0000 (13:30 -0400)]
Merge branch 'hotfix/1.0.31'
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
Ian Weller [Tue, 26 Jul 2016 20:55:58 +0000 (16:55 -0400)]
Merge tag 'v1.0.30' into develop
version 1.0.30
Ian Weller [Tue, 26 Jul 2016 20:54:47 +0000 (16:54 -0400)]
Merge branch 'hotfix/1.0.30'
Ian Weller [Tue, 26 Jul 2016 20:53:33 +0000 (16:53 -0400)]
changing winter to summer and updating the link
Steve Sutton [Tue, 10 May 2016 17:43:22 +0000 (13:43 -0400)]
Merge tag 'v1.0.29' into develop
Version 1.0.29
Steve Sutton [Tue, 10 May 2016 17:43:15 +0000 (13:43 -0400)]
Merge branch 'hotfix/1.0.29'
Steve Sutton [Tue, 10 May 2016 17:43:10 +0000 (13:43 -0400)]
bump version number for css
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
Anthony Talarico [Mon, 9 May 2016 19:30:23 +0000 (15:30 -0400)]
Merge branch 'hotfix/1.0.28'
Anthony Talarico [Mon, 9 May 2016 19:30:08 +0000 (15:30 -0400)]
added period in pc view
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
Anthony Talarico [Mon, 9 May 2016 19:28:33 +0000 (15:28 -0400)]
Merge branch 'hotfix/1.0.27'
Anthony Talarico [Mon, 9 May 2016 19:28:21 +0000 (15:28 -0400)]
added period at the end of slogan
Anthony Talarico [Mon, 9 May 2016 19:04:01 +0000 (15:04 -0400)]
Merge tag 'v1.0.26' into develop
v1.0.26
Anthony Talarico [Mon, 9 May 2016 19:03:46 +0000 (15:03 -0400)]
Merge branch 'hotfix/1.0.26'
Anthony Talarico [Mon, 9 May 2016 18:52:06 +0000 (14:52 -0400)]
reverting small change
Anthony Talarico [Mon, 9 May 2016 18:33:27 +0000 (14:33 -0400)]
Merge branch 'hotfix/1.0.25'
Anthony Talarico [Mon, 9 May 2016 18:32:54 +0000 (14:32 -0400)]
attempting to fix a branch issue, small change made
Anthony Talarico [Mon, 9 May 2016 18:26:41 +0000 (14:26 -0400)]
added 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