web/Keweenaw.git
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)

9 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

9 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'

9 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

9 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.

9 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

9 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

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

9 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

9 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'

9 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

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

9 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

9 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'

9 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

9 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

9 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'

9 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.

9 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

9 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'

9 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

9 years agoAdd Vimeo to the video application
Steve Sutton [Wed, 20 May 2015 20:12:40 +0000 (16:12 -0400)]
Add Vimeo to the video application

Can now setup the correct url for the color box to open the vimeo
videos.

9 years agoRetab file
Steve Sutton [Wed, 20 May 2015 13:09:41 +0000 (09:09 -0400)]
Retab file

no tabs only spaces

10 years agoMerge tag 'v1.2.40' into develop
Steve Sutton [Wed, 29 Apr 2015 13:44:22 +0000 (09:44 -0400)]
Merge tag 'v1.2.40' into develop

Version 1.2.40

10 years agoMerge branch 'hotfix/1.2.40' v1.2.40
Steve Sutton [Wed, 29 Apr 2015 13:44:12 +0000 (09:44 -0400)]
Merge branch 'hotfix/1.2.40'

10 years agoUpdate the order for the groups
Steve Sutton [Wed, 29 Apr 2015 13:43:59 +0000 (09:43 -0400)]
Update the order for the groups

Use id that way the guides are before the how did you hear ones.

10 years agoMerge tag 'v1.2.39' into develop
Steve Sutton [Wed, 22 Apr 2015 12:49:11 +0000 (08:49 -0400)]
Merge tag 'v1.2.39' into develop

Version 1.2.39

10 years agoMerge branch 'hotfix/1.2.39' v1.2.39
Steve Sutton [Wed, 22 Apr 2015 12:48:55 +0000 (08:48 -0400)]
Merge branch 'hotfix/1.2.39'

10 years agoUpdate gPlus link
Steve Sutton [Wed, 22 Apr 2015 12:48:41 +0000 (08:48 -0400)]
Update gPlus link

use https://plus.google.com/u/0/102633747928473540911/about

10 years agoMerge tag 'v1.2.38' into develop
Steve Sutton [Wed, 22 Apr 2015 12:35:22 +0000 (08:35 -0400)]
Merge tag 'v1.2.38' into develop

Version 1.2.38

10 years agoMerge branch 'release/1.2.38' v1.2.38
Steve Sutton [Wed, 22 Apr 2015 12:35:07 +0000 (08:35 -0400)]
Merge branch 'release/1.2.38'

10 years agoimages finished
ian [Tue, 21 Apr 2015 17:53:44 +0000 (13:53 -0400)]
images finished

10 years agoadded social icons
ian [Tue, 21 Apr 2015 14:11:10 +0000 (10:11 -0400)]
added social icons

10 years agoMerge tag 'v1.2.37' into develop
Steve Sutton [Fri, 17 Apr 2015 12:53:18 +0000 (08:53 -0400)]
Merge tag 'v1.2.37' into develop

Version 1.2.37

10 years agoMerge branch 'hotfix/1.2.37' v1.2.37
Steve Sutton [Fri, 17 Apr 2015 12:53:06 +0000 (08:53 -0400)]
Merge branch 'hotfix/1.2.37'

10 years agoMore update for the contact form
Steve Sutton [Fri, 17 Apr 2015 12:52:38 +0000 (08:52 -0400)]
More update for the contact form

update grid for the interest groups

10 years agoMerge tag 'v1.2.36' into develop
Steve Sutton [Fri, 17 Apr 2015 12:46:50 +0000 (08:46 -0400)]
Merge tag 'v1.2.36' into develop

Version 1.2.36

10 years agoMerge branch 'hotfix/1.2.36' v1.2.36
Steve Sutton [Fri, 17 Apr 2015 12:46:30 +0000 (08:46 -0400)]
Merge branch 'hotfix/1.2.36'

10 years agoUpdate the template and stylesheet for the forms
Steve Sutton [Fri, 17 Apr 2015 12:45:39 +0000 (08:45 -0400)]
Update the template and stylesheet for the forms

Update the form template (from troutcreek) which has only one columns.
Update the stylesheet so form has max width of 600px and is centered.

10 years agoMerge tag 'v1.2.35' into develop
Steve Sutton [Fri, 6 Mar 2015 20:06:15 +0000 (15:06 -0500)]
Merge tag 'v1.2.35' into develop

Version 1.2.35

10 years agoMerge branch 'hotfix/1.2.35' v1.2.35
Steve Sutton [Fri, 6 Mar 2015 20:06:03 +0000 (15:06 -0500)]
Merge branch 'hotfix/1.2.35'

10 years agoAdd Comment field to admin side of contact edit
Steve Sutton [Fri, 6 Mar 2015 20:05:41 +0000 (15:05 -0500)]
Add Comment field to admin side of contact edit

10 years agoMerge tag 'v1.2.34' into develop
Steve Sutton [Fri, 16 Jan 2015 16:51:30 +0000 (11:51 -0500)]
Merge tag 'v1.2.34' into develop

Version 1.2.34

10 years agoMerge branch 'hotfix/1.2.34' v1.2.34
Steve Sutton [Fri, 16 Jan 2015 16:51:18 +0000 (11:51 -0500)]
Merge branch 'hotfix/1.2.34'

10 years agoAdding new contact types
Steve Sutton [Fri, 16 Jan 2015 16:50:48 +0000 (11:50 -0500)]
Adding new contact types

Outside Source
Phone

10 years agoMerge branch 'hotfix/1.2.33' into develop
Ian Weller [Fri, 16 Jan 2015 16:42:20 +0000 (11:42 -0500)]
Merge branch 'hotfix/1.2.33' into develop

10 years agoMerge branch 'hotfix/1.2.33' v1.2.33
Ian Weller [Fri, 16 Jan 2015 16:41:56 +0000 (11:41 -0500)]
Merge branch 'hotfix/1.2.33'

10 years agochanged phone#
Ian Weller [Fri, 16 Jan 2015 16:39:08 +0000 (11:39 -0500)]
changed phone#

10 years agoMerge tag 'v1.2.33' into develop
Steve Sutton [Mon, 8 Dec 2014 17:41:40 +0000 (12:41 -0500)]
Merge tag 'v1.2.33' into develop

Version 1.2.33

10 years agoMerge branch 'hotfix/1.2.33'
Steve Sutton [Mon, 8 Dec 2014 17:41:20 +0000 (12:41 -0500)]
Merge branch 'hotfix/1.2.33'

10 years agoFix event form for label around the select boxes
Steve Sutton [Mon, 8 Dec 2014 17:40:39 +0000 (12:40 -0500)]
Fix event form for label around the select boxes

10 years agoMerge tag 'v1.2.32' into develop
Steve Sutton [Tue, 14 Oct 2014 15:18:02 +0000 (11:18 -0400)]
Merge tag 'v1.2.32' into develop

Version 1.2.32

10 years agoMerge branch 'release/1.2.32' v1.2.32
Steve Sutton [Tue, 14 Oct 2014 15:17:42 +0000 (11:17 -0400)]
Merge branch 'release/1.2.32'

10 years agoFixing htmlspecialchars issues with the title text
Steve Sutton [Wed, 1 Oct 2014 12:40:36 +0000 (08:40 -0400)]
Fixing htmlspecialchars issues with the title text

Using htmlspecialchars with ENT_COMPAT and double encode false.

10 years agofinishing up with the new layout for the home page glm blocks
Steve Sutton [Fri, 26 Sep 2014 19:25:54 +0000 (15:25 -0400)]
finishing up with the new layout for the home page glm blocks

Showing three blocks across on the bottom of the home page.

10 years agoMerge tag 'v1.1.32' into develop
Steve Sutton [Wed, 1 Oct 2014 13:14:59 +0000 (09:14 -0400)]
Merge tag 'v1.1.32' into develop

Version 1.1.31

10 years agoMerge branch 'hotfix/1.1.32' v1.1.32
Steve Sutton [Wed, 1 Oct 2014 13:14:48 +0000 (09:14 -0400)]
Merge branch 'hotfix/1.1.32'

10 years agoAdding new redirect for qrcodes
Steve Sutton [Wed, 1 Oct 2014 13:14:20 +0000 (09:14 -0400)]
Adding new redirect for qrcodes

for the snow shoe map

10 years agoMerge tag 'v1.1.31' into develop
Steve Sutton [Thu, 25 Sep 2014 18:53:40 +0000 (14:53 -0400)]
Merge tag 'v1.1.31' into develop

Version 1.1.31

10 years agoMerge branch 'hotfix/1.1.31' v1.1.31
Steve Sutton [Thu, 25 Sep 2014 18:53:32 +0000 (14:53 -0400)]
Merge branch 'hotfix/1.1.31'

10 years agoChange the page 81 to be page 16
Steve Sutton [Thu, 25 Sep 2014 18:53:02 +0000 (14:53 -0400)]
Change the page 81 to be page 16

10 years agoRedirects atv/bike/hike map pdfs
Laury GvR [Wed, 17 Sep 2014 14:20:54 +0000 (10:20 -0400)]
Redirects atv/bike/hike map pdfs

10 years agoRedirects atv/bike/hike map pdfs
Laury GvR [Wed, 17 Sep 2014 14:18:13 +0000 (10:18 -0400)]
Redirects atv/bike/hike map pdfs

10 years agoMerge tag 'v1.1.30' into develop
Steve Sutton [Wed, 3 Sep 2014 16:03:16 +0000 (12:03 -0400)]
Merge tag 'v1.1.30' into develop

Version 1.1.30