web/Keweenaw.git
8 years agoMerge tag 'v1.5.8' into develop
Steve Sutton [Wed, 5 Apr 2017 17:50:17 +0000 (13:50 -0400)]
Merge tag 'v1.5.8' into develop

Version 1.5.8

8 years agoMerge branch 'hotfix/1.5.8' v1.5.8
Steve Sutton [Wed, 5 Apr 2017 17:50:10 +0000 (13:50 -0400)]
Merge branch 'hotfix/1.5.8'

8 years agoturn off impressions for members
Steve Sutton [Wed, 5 Apr 2017 17:49:49 +0000 (13:49 -0400)]
turn off impressions for members

return true if type is list

8 years agoMerge tag 'v1.5.7' into develop
Steve Sutton [Tue, 17 Jan 2017 15:11:00 +0000 (10:11 -0500)]
Merge tag 'v1.5.7' into develop

Version 1.5.7

8 years agoMerge branch 'hotfix/1.5.7' v1.5.7
Steve Sutton [Tue, 17 Jan 2017 15:10:50 +0000 (10:10 -0500)]
Merge branch 'hotfix/1.5.7'

8 years agoUpdate style sheet for correct background image.
Steve Sutton [Tue, 17 Jan 2017 15:10:27 +0000 (10:10 -0500)]
Update style sheet for correct background image.

8 years agoUpdate dist assets images
Steve Sutton [Tue, 17 Jan 2017 14:54:36 +0000 (09:54 -0500)]
Update dist assets images

From the newly optimized ones.

8 years agoUpdate background images
Steve Sutton [Tue, 17 Jan 2017 14:50:03 +0000 (09:50 -0500)]
Update background images

Collins optimized the background images for us.

8 years agoMerge tag 'v1.5.6' into develop
Steve Sutton [Thu, 12 Jan 2017 17:27:31 +0000 (12:27 -0500)]
Merge tag 'v1.5.6' into develop

Version 1.5.6

8 years agoMerge branch 'hotfix/1.5.6' v1.5.6
Steve Sutton [Thu, 12 Jan 2017 17:27:26 +0000 (12:27 -0500)]
Merge branch 'hotfix/1.5.6'

8 years agoReorder js files
Steve Sutton [Thu, 12 Jan 2017 17:27:04 +0000 (12:27 -0500)]
Reorder js files

For the gulp js all file.

8 years agoMerge tag 'v1.5.5' into develop
Steve Sutton [Thu, 12 Jan 2017 17:21:49 +0000 (12:21 -0500)]
Merge tag 'v1.5.5' into develop

Version 1.5.5

8 years agoMerge branch 'hotfix/1.5.5' v1.5.5
Steve Sutton [Thu, 12 Jan 2017 17:21:43 +0000 (12:21 -0500)]
Merge branch 'hotfix/1.5.5'

8 years agoRemove async for js scripts.
Steve Sutton [Thu, 12 Jan 2017 17:19:20 +0000 (12:19 -0500)]
Remove async for js scripts.

To get google map working again.

8 years agoMerge tag 'v1.5.4' into develop
Steve Sutton [Tue, 10 Jan 2017 19:24:38 +0000 (14:24 -0500)]
Merge tag 'v1.5.4' into develop

Version 1.5.4

8 years agoMerge branch 'release/1.5.4' v1.5.4
Steve Sutton [Tue, 10 Jan 2017 19:24:30 +0000 (14:24 -0500)]
Merge branch 'release/1.5.4'

8 years agoUsing gulp to compress images,javascripts, and css files.
Steve Sutton [Sun, 8 Jan 2017 15:50:51 +0000 (10:50 -0500)]
Using gulp to compress images,javascripts, and css files.

Gulp to setup compressing and combining file like css javascript files.
Gulp to compress images in assets.

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

Version 1.5.3

8 years agoMerge branch 'hotfix/1.5.3' v1.5.3
Steve Sutton [Thu, 29 Sep 2016 18:32:19 +0000 (14:32 -0400)]
Merge branch 'hotfix/1.5.3'

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

This is to keep other domains from getting into cache files for the
navigation.

8 years agoMerge tag 'v1.5.2' into develop
Anthony Talarico [Wed, 31 Aug 2016 13:28:31 +0000 (09:28 -0400)]
Merge tag 'v1.5.2' into develop

replaced old instagram icon with new one in the header social icons

8 years agoMerge branch 'hotfix/1.5.2' v1.5.2
Anthony Talarico [Wed, 31 Aug 2016 13:28:18 +0000 (09:28 -0400)]
Merge branch 'hotfix/1.5.2'

8 years agoreplaced old instagram icon with new one in the header social icons
Anthony Talarico [Wed, 31 Aug 2016 13:27:53 +0000 (09:27 -0400)]
replaced old instagram icon with new one in the header social icons

9 years agoMerge tag 'v1.5.1' into develop
Ian Weller [Wed, 1 Jun 2016 18:34:55 +0000 (14:34 -0400)]
Merge tag 'v1.5.1' into develop

version 1.5.1

9 years agoMerge branch 'hotfix/1.5.1' v1.5.1
Ian Weller [Wed, 1 Jun 2016 18:34:24 +0000 (14:34 -0400)]
Merge branch 'hotfix/1.5.1'

9 years agoadded and implemented updated graphic
Ian Weller [Wed, 1 Jun 2016 18:27:38 +0000 (14:27 -0400)]
added and implemented updated graphic

9 years agoMerge tag 'v1.5.0' into develop
Steve Sutton [Fri, 20 May 2016 12:43:44 +0000 (08:43 -0400)]
Merge tag 'v1.5.0' into develop

Version 1.5.0

9 years agoMerge branch 'release/1.5.0' v1.5.0
Steve Sutton [Fri, 20 May 2016 12:43:38 +0000 (08:43 -0400)]
Merge branch 'release/1.5.0'

9 years agoMerge branch 'feature/gpsCoords' into develop
Steve Sutton [Fri, 20 May 2016 12:43:09 +0000 (08:43 -0400)]
Merge branch 'feature/gpsCoords' into develop

9 years agoUpdate process data so it doesn't override lat lon if given.
Steve Sutton [Fri, 20 May 2016 12:42:35 +0000 (08:42 -0400)]
Update process data so it doesn't override lat lon if given.

9 years agoSetup lat lon fields on add your event form
Steve Sutton [Fri, 20 May 2016 12:29:40 +0000 (08:29 -0400)]
Setup lat lon fields on add your event form

Need to test that the form is not redoing lat lon from the address if
there's a lat lon already set.

9 years agoMerge tag 'v1.4.3' into develop
Anthony Talarico [Tue, 17 May 2016 15:02:39 +0000 (11:02 -0400)]
Merge tag 'v1.4.3' into develop

added facebook pixl code to head tag of main template file

9 years agoMerge branch 'hotfix/1.4.3' v1.4.3
Anthony Talarico [Tue, 17 May 2016 15:02:25 +0000 (11:02 -0400)]
Merge branch 'hotfix/1.4.3'

9 years agoadded facebook pixl code to the header of main template
Anthony Talarico [Tue, 17 May 2016 15:02:06 +0000 (11:02 -0400)]
added facebook pixl code to the header of main template

9 years agoMerge tag 'v1.4.2' into develop
Steve Sutton [Mon, 1 Feb 2016 19:42:03 +0000 (14:42 -0500)]
Merge tag 'v1.4.2' into develop

Version 1.4.2

9 years agoMerge branch 'hotfix/1.4.2' v1.4.2
Steve Sutton [Mon, 1 Feb 2016 19:41:55 +0000 (14:41 -0500)]
Merge branch 'hotfix/1.4.2'

9 years agofix for external js and blog url
Steve Sutton [Mon, 1 Feb 2016 19:41:51 +0000 (14:41 -0500)]
fix for external js and blog url

9 years agoMerge tag 'v1.4.1' into develop
Steve Sutton [Mon, 1 Feb 2016 19:35:30 +0000 (14:35 -0500)]
Merge tag 'v1.4.1' into develop

Version 1.4.1

9 years agoMerge branch 'release/1.4.1' v1.4.1
Steve Sutton [Mon, 1 Feb 2016 19:35:20 +0000 (14:35 -0500)]
Merge branch 'release/1.4.1'

9 years agoMerge tag 'v1.2' into develop
Steve Sutton [Mon, 1 Feb 2016 19:00:17 +0000 (14:00 -0500)]
Merge tag 'v1.2' into develop

Version 1.2

9 years agoMerge branch 'hotfix/1.2' v1.2
Steve Sutton [Mon, 1 Feb 2016 18:59:59 +0000 (13:59 -0500)]
Merge branch 'hotfix/1.2'

9 years agoSetting up the blog icon
Steve Sutton [Mon, 1 Feb 2016 18:59:26 +0000 (13:59 -0500)]
Setting up the blog icon

uncomment blog icon

9 years agoMerge tag 'v1.1.14' into develop
Steve Sutton [Fri, 15 Jan 2016 16:03:15 +0000 (11:03 -0500)]
Merge tag 'v1.1.14' into develop

Version 1.1.14

9 years agoMerge branch 'release/1.1.14' v1.1.14
Steve Sutton [Fri, 15 Jan 2016 16:03:03 +0000 (11:03 -0500)]
Merge branch 'release/1.1.14'

9 years agoReadd code removed by Ian
Steve Sutton [Fri, 15 Jan 2016 16:02:05 +0000 (11:02 -0500)]
Readd code removed by Ian

9 years agostyle version number bumped up and commented out blog icon line
Ian Weller [Fri, 15 Jan 2016 15:54:17 +0000 (10:54 -0500)]
style version number bumped up and commented out blog icon line

9 years agosprite added for blog icon
Ian Weller [Wed, 13 Jan 2016 22:01:50 +0000 (17:01 -0500)]
sprite added for blog icon

9 years agoremoved header min-height rule
Ian Weller [Wed, 13 Jan 2016 21:24:43 +0000 (16:24 -0500)]
removed header min-height rule

9 years agoadded blog icon to social list
Ian Weller [Wed, 13 Jan 2016 21:01:47 +0000 (16:01 -0500)]
added blog icon to social list

9 years agoMerge tag 'v1.3.13' into develop
Steve Sutton [Fri, 8 Jan 2016 19:34:00 +0000 (14:34 -0500)]
Merge tag 'v1.3.13' into develop

Version 1.3.13

9 years agoMerge branch 'hotfix/1.3.13' v1.3.13
Steve Sutton [Fri, 8 Jan 2016 19:33:52 +0000 (14:33 -0500)]
Merge branch 'hotfix/1.3.13'

9 years agofix for interior footer
Steve Sutton [Fri, 8 Jan 2016 19:33:43 +0000 (14:33 -0500)]
fix for interior footer

9 years agoMerge tag 'v1.3.12' into develop
Steve Sutton [Thu, 7 Jan 2016 21:15:43 +0000 (16:15 -0500)]
Merge tag 'v1.3.12' into develop

Version 1.3.12

9 years agoMerge branch 'hotfix/1.3.12' v1.3.12
Steve Sutton [Thu, 7 Jan 2016 21:15:32 +0000 (16:15 -0500)]
Merge branch 'hotfix/1.3.12'

9 years agoAdd season proxy
Steve Sutton [Thu, 7 Jan 2016 21:15:17 +0000 (16:15 -0500)]
Add season proxy

9 years agoMerge tag 'v1.3.11' into develop
Steve Sutton [Thu, 7 Jan 2016 20:43:08 +0000 (15:43 -0500)]
Merge tag 'v1.3.11' into develop

Version 1.3.11

9 years agoMerge branch 'hotfix/1.3.11' v1.3.11
Steve Sutton [Thu, 7 Jan 2016 20:42:58 +0000 (15:42 -0500)]
Merge branch 'hotfix/1.3.11'

9 years agoTo cache the nav proxy pages
Steve Sutton [Thu, 7 Jan 2016 20:42:40 +0000 (15:42 -0500)]
To cache the nav proxy pages

9 years agoMerge tag 'v1.3.10' into develop
Steve Sutton [Thu, 7 Jan 2016 19:54:38 +0000 (14:54 -0500)]
Merge tag 'v1.3.10' into develop

Version 1.3.10

9 years agoMerge branch 'hotfix/1.3.10' v1.3.10
Steve Sutton [Thu, 7 Jan 2016 19:54:23 +0000 (14:54 -0500)]
Merge branch 'hotfix/1.3.10'

9 years agoUpdates for their new blog site
Steve Sutton [Thu, 7 Jan 2016 19:53:41 +0000 (14:53 -0500)]
Updates for their new blog site

Make some functions public so can be accessed from the proxy files.

9 years agoMerge tag 'v1.3.9' into develop
Steve Sutton [Tue, 17 Nov 2015 18:45:36 +0000 (13:45 -0500)]
Merge tag 'v1.3.9' into develop

Version 1.3.9

9 years agoMerge branch 'release/1.3.9' v1.3.9
Steve Sutton [Tue, 17 Nov 2015 18:45:21 +0000 (13:45 -0500)]
Merge branch 'release/1.3.9'

9 years agoadd confirmation for pinterest
Steve Sutton [Tue, 17 Nov 2015 18:40:52 +0000 (13:40 -0500)]
add confirmation for pinterest

9 years agoadd confirmation for pinterest
Steve Sutton [Tue, 17 Nov 2015 18:40:52 +0000 (13:40 -0500)]
add confirmation for pinterest

9 years agoMerge tag 'V1.3.6' into develop
Laury GvR [Thu, 29 Oct 2015 13:08:50 +0000 (09:08 -0400)]
Merge tag 'V1.3.6' into develop

v1.3.6

9 years agoMerge branch 'hotfix/1.3.6' V1.3.6
Laury GvR [Thu, 29 Oct 2015 13:08:41 +0000 (09:08 -0400)]
Merge branch 'hotfix/1.3.6'

9 years agoAdded curlopt php5 useragent for weather xml feed
Laury GvR [Thu, 29 Oct 2015 13:08:30 +0000 (09:08 -0400)]
Added curlopt php5 useragent for weather xml feed

9 years agoMerge tag 'V1.3.8' into develop
Laury GvR [Fri, 23 Oct 2015 18:21:52 +0000 (14:21 -0400)]
Merge tag 'V1.3.8' into develop

v1.3.8

9 years agoMerge branch 'hotfix/1.3.8' V1.3.8
Laury GvR [Fri, 23 Oct 2015 18:21:47 +0000 (14:21 -0400)]
Merge branch 'hotfix/1.3.8'

9 years agoFooter, align weather/TA vertically in small.
Laury GvR [Fri, 23 Oct 2015 18:21:41 +0000 (14:21 -0400)]
Footer, align weather/TA vertically in small.

9 years agoMerge tag 'V1.3.7' into develop
Laury GvR [Mon, 19 Oct 2015 20:36:32 +0000 (16:36 -0400)]
Merge tag 'V1.3.7' into develop

v1.3.7

9 years agoMerge branch 'hotfix/1.3.7' V1.3.7
Laury GvR [Mon, 19 Oct 2015 20:36:22 +0000 (16:36 -0400)]
Merge branch 'hotfix/1.3.7'

9 years agoAdd new tripadvisor. Repositioning everything in the footer to make it fit..
Laury GvR [Mon, 19 Oct 2015 20:36:16 +0000 (16:36 -0400)]
Add new tripadvisor. Repositioning everything in the footer to make it fit..

9 years agoMerge branch 'hotfix/1.3.6' into develop
Steve Sutton [Mon, 3 Aug 2015 16:38:18 +0000 (12:38 -0400)]
Merge branch 'hotfix/1.3.6' into develop

9 years agoMerge branch 'hotfix/1.3.6'
Steve Sutton [Mon, 3 Aug 2015 16:38:04 +0000 (12:38 -0400)]
Merge branch 'hotfix/1.3.6'

9 years agoAdd title field v1.3.6
Steve Sutton [Mon, 3 Aug 2015 16:37:19 +0000 (12:37 -0400)]
Add title field

Update for the youtube API changes

9 years agoMerge branch 'hotfix/1.3.5' into develop
Steve Sutton [Tue, 14 Jul 2015 13:56:54 +0000 (09:56 -0400)]
Merge branch 'hotfix/1.3.5' into develop

9 years agoMerge branch 'hotfix/1.3.5'
Steve Sutton [Tue, 14 Jul 2015 13:56:44 +0000 (09:56 -0400)]
Merge branch 'hotfix/1.3.5'

9 years agoUpdate ical feed v1.3.5
Steve Sutton [Tue, 14 Jul 2015 13:55:48 +0000 (09:55 -0400)]
Update ical feed

Now has the full address for the events.
Also fixes ongoing events (non repeating)

10 years agoMerge tag 'v1.3.4' into develop
Steve Sutton [Thu, 11 Jun 2015 15:38:07 +0000 (11:38 -0400)]
Merge tag 'v1.3.4' into develop

Version 1.3.4

10 years agoMerge branch 'release/1.3.4' v1.3.4
Steve Sutton [Thu, 11 Jun 2015 15:37:49 +0000 (11:37 -0400)]
Merge branch 'release/1.3.4'

10 years agoMerge branch 'feature/ical' into develop
Steve Sutton [Thu, 11 Jun 2015 15:36:05 +0000 (11:36 -0400)]
Merge branch 'feature/ical' into develop

10 years agoAdd rewrite and headers for the ical file
Steve Sutton [Thu, 11 Jun 2015 15:35:03 +0000 (11:35 -0400)]
Add rewrite and headers for the ical file

update .htaccess file for the rewrite rule
update ical file for the headers.

10 years agoUpdate to use localhost and updates on recurring events
Steve Sutton [Wed, 10 Jun 2015 21:45:35 +0000 (17:45 -0400)]
Update to use localhost and updates on recurring events

10 years agoUpdates for ical feed
Steve Sutton [Wed, 10 Jun 2015 21:08:47 +0000 (17:08 -0400)]
Updates for ical feed

working on recur events

10 years agoworking on feed
Steve Sutton [Tue, 9 Jun 2015 21:47:33 +0000 (17:47 -0400)]
working on feed

10 years agoMerge tag 'v1.3.3' into develop
Steve Sutton [Tue, 9 Jun 2015 15:13:42 +0000 (11:13 -0400)]
Merge tag 'v1.3.3' into develop

Version 1.3.3

10 years agoMerge branch 'hotfix/1.3.3' v1.3.3
Steve Sutton [Tue, 9 Jun 2015 15:13:34 +0000 (11:13 -0400)]
Merge branch 'hotfix/1.3.3'

10 years agoUpdate text with background color
Steve Sutton [Tue, 9 Jun 2015 15:07:01 +0000 (11:07 -0400)]
Update text with background color

Also padding and margin to text blocks

10 years agoadding ical Folder
Steve Sutton [Tue, 9 Jun 2015 14:51:20 +0000 (10:51 -0400)]
adding ical Folder

10 years agoMerge tag 'V1.3.2' into develop
Laury GvR [Fri, 5 Jun 2015 16:01:32 +0000 (12:01 -0400)]
Merge tag 'V1.3.2' into develop

v1.3.2

10 years agoMerge branch 'hotfix/1.3.2' V1.3.2
Laury GvR [Fri, 5 Jun 2015 16:01:14 +0000 (12:01 -0400)]
Merge branch 'hotfix/1.3.2'

10 years agoFixed colour issues on vimeo instructions
Laury GvR [Fri, 5 Jun 2015 16:01:07 +0000 (12:01 -0400)]
Fixed colour issues on vimeo instructions

10 years agoMerge tag 'V1.3.1' into develop
Laury GvR [Fri, 5 Jun 2015 15:57:25 +0000 (11:57 -0400)]
Merge tag 'V1.3.1' into develop

v1.3.1

10 years agoMerge branch 'hotfix/1.3.1' V1.3.1
Laury GvR [Fri, 5 Jun 2015 15:57:20 +0000 (11:57 -0400)]
Merge branch 'hotfix/1.3.1'

10 years agoAdded vimeo link instructions for admin side.
Laury GvR [Fri, 5 Jun 2015 15:19:19 +0000 (11:19 -0400)]
Added vimeo link instructions for admin side.

10 years agoMerge tag 'v1.3.0' into develop
Steve Sutton [Wed, 20 May 2015 20:30:31 +0000 (16:30 -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 [Wed, 20 May 2015 20:30:22 +0000 (16:30 -0400)]
Merge branch 'release/1.3.0'

10 years agoUpdate the home page video url
Steve Sutton [Wed, 20 May 2015 20:29:04 +0000 (16:29 -0400)]
Update the home page video url

For update to vimeo videos