web/CedarvilleMarine.git
6 years agoMerge tag 'v1.0.15' into develop
Steve Sutton [Thu, 14 Mar 2019 16:48:22 +0000 (12:48 -0400)]
Merge tag 'v1.0.15' into develop

Version 1.0.15

6 years agoMerge branch 'hotfix/1.0.15' v1.0.15
Steve Sutton [Thu, 14 Mar 2019 16:48:16 +0000 (12:48 -0400)]
Merge branch 'hotfix/1.0.15'

6 years agoUpdate Service form
Steve Sutton [Thu, 14 Mar 2019 16:47:31 +0000 (12:47 -0400)]
Update Service form

Adding email

6 years agoMerge tag 'v1.0.14' into develop
Steve Sutton [Mon, 20 Aug 2018 12:22:51 +0000 (08:22 -0400)]
Merge tag 'v1.0.14' into develop

Version 1.0.14

6 years agoMerge branch 'hotfix/1.0.14' v1.0.14
Steve Sutton [Mon, 20 Aug 2018 12:22:44 +0000 (08:22 -0400)]
Merge branch 'hotfix/1.0.14'

6 years agofor htacess update
Steve Sutton [Mon, 20 Aug 2018 12:22:38 +0000 (08:22 -0400)]
for htacess update

7 years agoMerge tag 'v1.0.13' into develop
Steve Sutton [Fri, 20 Apr 2018 15:04:04 +0000 (11:04 -0400)]
Merge tag 'v1.0.13' into develop

Version 1.0.13

7 years agoMerge branch 'hotfix/1.0.13' v1.0.13
Steve Sutton [Fri, 20 Apr 2018 15:03:57 +0000 (11:03 -0400)]
Merge branch 'hotfix/1.0.13'

7 years agoMake text on form smaller. and remove underlines
Steve Sutton [Fri, 20 Apr 2018 15:02:57 +0000 (11:02 -0400)]
Make text on form smaller. and remove underlines

Removing underlines and adjust the text size.
Moving css for the form into contactform.css
adding cache busting to both styles.css and contactform.css

7 years agoMerge tag 'v1.0.12' into develop
Steve Sutton [Fri, 20 Apr 2018 14:41:16 +0000 (10:41 -0400)]
Merge tag 'v1.0.12' into develop

Version 1.0.12

7 years agoMerge branch 'hotfix/1.0.12' v1.0.12
Steve Sutton [Fri, 20 Apr 2018 14:41:10 +0000 (10:41 -0400)]
Merge branch 'hotfix/1.0.12'

7 years agoUpdate link for the Great lakes lake levels
Steve Sutton [Fri, 20 Apr 2018 14:40:44 +0000 (10:40 -0400)]
Update link for the Great lakes lake levels

Update per client request

7 years agoMerge tag 'v1.0.11' into develop
Steve Sutton [Fri, 20 Apr 2018 12:30:41 +0000 (08:30 -0400)]
Merge tag 'v1.0.11' into develop

Version 1.0.11

7 years agoMerge branch 'release/1.0.11' v1.0.11
Steve Sutton [Fri, 20 Apr 2018 12:30:34 +0000 (08:30 -0400)]
Merge branch 'release/1.0.11'

7 years agobump version number
Steve Sutton [Fri, 20 Apr 2018 12:30:30 +0000 (08:30 -0400)]
bump version number

7 years agoFinal changes to the form
Steve Sutton [Fri, 20 Apr 2018 12:29:09 +0000 (08:29 -0400)]
Final changes to the form

Adding Boat(s) and remove the service question and use both completion
date and expected arrival date.

7 years agoUpdating form
Steve Sutton [Thu, 19 Apr 2018 15:30:36 +0000 (11:30 -0400)]
Updating form

Add text for checkbox description.

7 years agoUpdating the service request form
Steve Sutton [Thu, 19 Apr 2018 15:17:34 +0000 (11:17 -0400)]
Updating the service request form

Updates from client request.

7 years agoMerge tag 'v1.0.10' into develop
Steve Sutton [Fri, 13 Apr 2018 15:27:15 +0000 (11:27 -0400)]
Merge tag 'v1.0.10' into develop

Version 1.0.10

7 years agoMerge branch 'hotfix/1.0.10' v1.0.10
Steve Sutton [Fri, 13 Apr 2018 15:27:09 +0000 (11:27 -0400)]
Merge branch 'hotfix/1.0.10'

7 years agoRemove the js for checking file ext.
Steve Sutton [Fri, 13 Apr 2018 15:26:33 +0000 (11:26 -0400)]
Remove the js for checking file ext.

Not working for some photos.

8 years agoMerge tag 'v1.0.9' into develop
Steve Sutton [Wed, 18 Jan 2017 14:32:30 +0000 (09:32 -0500)]
Merge tag 'v1.0.9' into develop

Version 1.0.9

8 years agoMerge branch 'hotfix/1.0.9' v1.0.9
Steve Sutton [Wed, 18 Jan 2017 14:32:24 +0000 (09:32 -0500)]
Merge branch 'hotfix/1.0.9'

8 years agoBump version number on css for cache busting
Steve Sutton [Wed, 18 Jan 2017 14:13:12 +0000 (09:13 -0500)]
Bump version number on css for cache busting

Setting version number on end of call to css.

8 years agoMerge tag 'v1.0.8' into develop
Ian Weller [Tue, 17 Jan 2017 21:08:23 +0000 (16:08 -0500)]
Merge tag 'v1.0.8' into develop

version 1.0.8

8 years agoMerge branch 'hotfix/1.0.8' v1.0.8
Ian Weller [Tue, 17 Jan 2017 21:01:09 +0000 (16:01 -0500)]
Merge branch 'hotfix/1.0.8'

8 years agoI added the new social media
Ian Weller [Tue, 17 Jan 2017 20:34:24 +0000 (15:34 -0500)]
I added the new social media

I removed the old Facebook graphic and added the new socail media icons.
Links are included and they are centered.

8 years agoupdate .htaccess for site
Steve Sutton [Thu, 29 Sep 2016 18:07:08 +0000 (14:07 -0400)]
update .htaccess for site

8 years agoMerge tag 'v1.0.7' into develop
Steve Sutton [Thu, 30 Jun 2016 13:27:31 +0000 (09:27 -0400)]
Merge tag 'v1.0.7' into develop

Version 1.0.7

8 years agoMerge branch 'hotfix/1.0.7' v1.0.7
Steve Sutton [Thu, 30 Jun 2016 13:27:19 +0000 (09:27 -0400)]
Merge branch 'hotfix/1.0.7'

8 years agoUpdate the weather station
Steve Sutton [Thu, 30 Jun 2016 13:26:45 +0000 (09:26 -0400)]
Update the weather station

Switching from sault ste marie to mackinac island airport

8 years agoMerge tag 'v1.0.6' into develop
Steve Sutton [Tue, 24 May 2016 15:51:06 +0000 (11:51 -0400)]
Merge tag 'v1.0.6' into develop

Version 1.0.6

8 years agoMerge branch 'hotfix/1.0.6' v1.0.6
Steve Sutton [Tue, 24 May 2016 15:50:56 +0000 (11:50 -0400)]
Merge branch 'hotfix/1.0.6'

8 years agoAdding title field to videos
Steve Sutton [Tue, 24 May 2016 15:49:46 +0000 (11:49 -0400)]
Adding title field to videos

9 years agoMerge tag 'v1.0.5' into develop
Laury GvR [Thu, 29 Oct 2015 13:35:54 +0000 (09:35 -0400)]
Merge tag 'v1.0.5' into develop

v1.0.5

9 years agoMerge branch 'hotfix/1.0.5' v1.0.5
Laury GvR [Thu, 29 Oct 2015 13:35:50 +0000 (09:35 -0400)]
Merge branch 'hotfix/1.0.5'

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

10 years agoMerge tag 'v1.0.4' into develop
Steve Sutton [Tue, 14 Apr 2015 14:55:57 +0000 (10:55 -0400)]
Merge tag 'v1.0.4' into develop

Version 1.0.4

10 years agoMerge branch 'hotfix/1.0.4' v1.0.4
Steve Sutton [Tue, 14 Apr 2015 14:55:48 +0000 (10:55 -0400)]
Merge branch 'hotfix/1.0.4'

10 years agoTurn off clue tip
Steve Sutton [Tue, 14 Apr 2015 14:55:17 +0000 (10:55 -0400)]
Turn off clue tip

Clue tip is not allowing the drop down to work

10 years agoMerge tag 'v1.0.3' into develop
Steve Sutton [Tue, 14 Apr 2015 13:36:39 +0000 (09:36 -0400)]
Merge tag 'v1.0.3' into develop

Version 1.0.3

10 years agoMerge branch 'hotfix/1.0.3' v1.0.3
Steve Sutton [Tue, 14 Apr 2015 13:36:30 +0000 (09:36 -0400)]
Merge branch 'hotfix/1.0.3'

10 years agoAdding checkbox
Steve Sutton [Tue, 14 Apr 2015 13:36:01 +0000 (09:36 -0400)]
Adding checkbox

for Fuel injection cleaning

10 years agoMerge tag 'v1.0.2' into develop
Steve Sutton [Mon, 30 Jun 2014 18:24:45 +0000 (14:24 -0400)]
Merge tag 'v1.0.2' into develop

Version 1.0.2

10 years agoMerge branch 'hotfix/1.0.2' v1.0.2
Steve Sutton [Mon, 30 Jun 2014 18:24:31 +0000 (14:24 -0400)]
Merge branch 'hotfix/1.0.2'

10 years agoremove old dir name
Steve Sutton [Mon, 30 Jun 2014 18:24:13 +0000 (14:24 -0400)]
remove old dir name

10 years agoUpdate tmp dir
Steve Sutton [Mon, 30 Jun 2014 18:23:05 +0000 (14:23 -0400)]
Update tmp dir

put these into libjs directory instead

10 years agoMerge tag 'v1.0.1' into develop
Steve Sutton [Mon, 30 Jun 2014 18:17:31 +0000 (14:17 -0400)]
Merge tag 'v1.0.1' into develop

bug fix for service form js

correct was needed to work in radio option of
Yes or No

10 years agoMerge branch 'hotfix/1.0.1' v1.0.1
Steve Sutton [Mon, 30 Jun 2014 18:16:35 +0000 (14:16 -0400)]
Merge branch 'hotfix/1.0.1'

10 years agohotfix for service form
Steve Sutton [Mon, 30 Jun 2014 18:15:56 +0000 (14:15 -0400)]
hotfix for service form

fixing the markup for the radio buttons
fix javascript

10 years agoMerge tag 'v1.0' into develop
Steve Sutton [Mon, 30 Jun 2014 15:38:28 +0000 (11:38 -0400)]
Merge tag 'v1.0' into develop

New site

10 years agoMerge branch 'release/1.0' v1.0
Steve Sutton [Mon, 30 Jun 2014 15:38:06 +0000 (11:38 -0400)]
Merge branch 'release/1.0'

10 years agoupdate for go live
Steve Sutton [Mon, 30 Jun 2014 15:37:42 +0000 (11:37 -0400)]
update for go live

update host for go live
update template for meta data
update sitename

10 years agoready to goto prod server
Steve Sutton [Mon, 30 Jun 2014 15:06:11 +0000 (11:06 -0400)]
ready to goto prod server

10 years agoready to goto prod server
Steve Sutton [Mon, 30 Jun 2014 15:05:38 +0000 (11:05 -0400)]
ready to goto prod server

10 years agoupdate the superfish
Steve Sutton [Mon, 30 Jun 2014 14:57:47 +0000 (10:57 -0400)]
update the superfish

fixing the padding in menu
update default time for menu to hide

10 years agoupdate the for the form
Steve Sutton [Mon, 30 Jun 2014 14:50:33 +0000 (10:50 -0400)]
update the for the form

js error

10 years agoupdate the for the form
Steve Sutton [Mon, 30 Jun 2014 14:50:17 +0000 (10:50 -0400)]
update the for the form

make radio button for the service_request
add in js to disable undeeded options for this
part.

10 years agoupdate MediaMapper
Steve Sutton [Tue, 24 Jun 2014 17:55:42 +0000 (17:55 +0000)]
update MediaMapper

10 years agothird level nav smaller and indented
Ove Klykken [Tue, 20 May 2014 15:26:28 +0000 (15:26 +0000)]
third level nav smaller and indented

10 years agoRemoved flyout, added 3rd level in dropdown
Ove Klykken [Tue, 20 May 2014 13:16:50 +0000 (13:16 +0000)]
Removed flyout, added 3rd level in dropdown

11 years agoadded rules for videos and images app
Ove Klykken [Fri, 16 May 2014 20:58:09 +0000 (20:58 +0000)]
added rules for videos and images app

11 years agowork to make the third level flyoutnav styled correct
Ove Klykken [Fri, 16 May 2014 20:56:56 +0000 (20:56 +0000)]
work to make the third level flyoutnav styled correct

11 years agobetter logo
Ove Klykken [Fri, 16 May 2014 20:56:03 +0000 (20:56 +0000)]
better logo

11 years agoadded extra class to slideshow div
Ove Klykken [Fri, 16 May 2014 20:55:34 +0000 (20:55 +0000)]
added extra class to slideshow div

11 years agoCOntrolNav now on bottom
Ove Klykken [Fri, 16 May 2014 20:54:13 +0000 (20:54 +0000)]
COntrolNav now on bottom

11 years agoModified the sized to the correct ones
Ove Klykken [Fri, 16 May 2014 20:53:39 +0000 (20:53 +0000)]
Modified the sized to the correct ones

11 years agoRemoved all inpage styles. commented it out rather
Ove Klykken [Fri, 16 May 2014 20:52:46 +0000 (20:52 +0000)]
Removed all inpage styles. commented it out rather

11 years agonew file
Ove Klykken [Fri, 16 May 2014 20:51:25 +0000 (20:51 +0000)]
new file

11 years agonew file
Ove Klykken [Thu, 15 May 2014 21:04:01 +0000 (21:04 +0000)]
new file

11 years agolink to google maps
Ove Klykken [Thu, 15 May 2014 21:03:25 +0000 (21:03 +0000)]
link to google maps

11 years agoLots of changes . redesign of structure per client
Ove Klykken [Thu, 15 May 2014 21:03:02 +0000 (21:03 +0000)]
Lots of changes . redesign of structure per client

11 years agonew file
Ove Klykken [Thu, 15 May 2014 20:15:03 +0000 (20:15 +0000)]
new file

11 years agonew text 'Location'
Ove Klykken [Thu, 15 May 2014 20:14:48 +0000 (20:14 +0000)]
new text 'Location'

11 years agoadded external js to open links in new window
Ove Klykken [Thu, 15 May 2014 20:14:22 +0000 (20:14 +0000)]
added external js to open links in new window

11 years agoadded link to pdf
Ove Klykken [Wed, 7 May 2014 16:54:05 +0000 (16:54 +0000)]
added link to pdf

11 years agoadded file upload styles and pdf icon for link to Water Level PDF
Ove Klykken [Wed, 7 May 2014 16:13:11 +0000 (16:13 +0000)]
added file upload styles and pdf icon for link to Water Level PDF

11 years agoUpdate form emails
Steve Sutton [Wed, 7 May 2014 14:38:16 +0000 (14:38 +0000)]
Update form emails

Use kristi@cedarvillemarine.com for forms
Use enews@cedarvillemarine.com for From

11 years agomargin above tollb ox category ehader
Ove Klykken [Tue, 6 May 2014 20:21:39 +0000 (20:21 +0000)]
margin above tollb ox category ehader

11 years agomargins on toolbox images
Ove Klykken [Tue, 6 May 2014 20:12:33 +0000 (20:12 +0000)]
margins on toolbox images

11 years agoUpdate form fields
Steve Sutton [Tue, 6 May 2014 19:54:22 +0000 (19:54 +0000)]
Update form fields

for temp storage fields

11 years agoadding checkboxes and subjects to forms
Steve Sutton [Tue, 6 May 2014 18:58:13 +0000 (18:58 +0000)]
adding checkboxes and subjects to forms

add to temp storage form new checkboxes
make them yes or no in emails
update subject for emails

11 years agoborder and margin on weathe info. less padding and default text color on Blocks
Ove Klykken [Tue, 6 May 2014 18:55:32 +0000 (18:55 +0000)]
border and margin on weathe info. less padding and default text color on Blocks

11 years agochanged z-index of slide links to ont interfere with dropdowns
Ove Klykken [Tue, 6 May 2014 18:54:18 +0000 (18:54 +0000)]
changed z-index of slide links to ont interfere with dropdowns

11 years agowater level link added without link
Ove Klykken [Tue, 6 May 2014 18:53:42 +0000 (18:53 +0000)]
water level link added without link

11 years agoremove code comments
Steve Sutton [Mon, 5 May 2014 19:41:51 +0000 (19:41 +0000)]
remove code comments

this will turn of the reset of captcha

11 years agoForm work for site
Steve Sutton [Mon, 5 May 2014 19:37:14 +0000 (19:37 +0000)]
Form work for site

Two Forms created
Temp storage form
Service form

11 years agofinished template afaik
Ove Klykken [Mon, 5 May 2014 19:32:57 +0000 (19:32 +0000)]
finished template afaik

11 years agobg for blocks
Ove Klykken [Fri, 2 May 2014 19:33:06 +0000 (19:33 +0000)]
bg for blocks

11 years agoAdd blocks
Steve Sutton [Fri, 2 May 2014 19:32:44 +0000 (19:32 +0000)]
Add blocks

Adding glm-blocks from the demo template

11 years agoUpdate slideshow output for no titles
Steve Sutton [Fri, 2 May 2014 19:29:19 +0000 (19:29 +0000)]
Update slideshow output for no titles

If the titles are turned off then keep nivo from outputting them.
Markup changes

11 years agoloading google font rokkit for main nav links
Ove Klykken [Fri, 2 May 2014 18:49:45 +0000 (18:49 +0000)]
loading google font rokkit for main nav links

11 years agochanged z-index on logo so it is above slideshow. Added Rokkit font for main nav
Ove Klykken [Fri, 2 May 2014 18:49:16 +0000 (18:49 +0000)]
changed z-index on logo so it is above slideshow. Added Rokkit font for main nav

11 years agoAdd streamsend settings and enews form
Steve Sutton [Fri, 2 May 2014 18:48:23 +0000 (18:48 +0000)]
Add streamsend settings and enews form

add enews form
setup streamsend account info
setup admin contact app link in nav file

11 years agochanged padding on main nav links
Ove Klykken [Fri, 2 May 2014 18:47:55 +0000 (18:47 +0000)]
changed padding on main nav links

11 years agocorrect size and removed description field and custom time fade options
Ove Klykken [Fri, 2 May 2014 18:46:40 +0000 (18:46 +0000)]
correct size and removed description field and custom time fade options

11 years agoUpdate forms
Steve Sutton [Fri, 2 May 2014 17:57:12 +0000 (17:57 +0000)]
Update forms

create new form for Temp storage

11 years agoSetup the database on DEVELOPMENT
Steve Sutton [Fri, 2 May 2014 16:32:28 +0000 (16:32 +0000)]
Setup the database on DEVELOPMENT

when on dev servers use devdb

11 years agoUpdate Service Form
Steve Sutton [Fri, 2 May 2014 15:47:01 +0000 (15:47 +0000)]
Update Service Form

Add the work requested select

11 years agoSetup the weather on website
Steve Sutton [Fri, 2 May 2014 12:59:38 +0000 (12:59 +0000)]
Setup the weather on website

station id is Sault Ste Marie - KANJ