Steve Sutton [Mon, 18 Aug 2014 12:31:36 +0000 (08:31 -0400)]
Working in members-only-area
add side nav
Rework for output of members only pages
Conflicts:
templates/toolbox.html
Steve Sutton [Fri, 22 Aug 2014 16:57:17 +0000 (12:57 -0400)]
Merge tag 'v1.0.27' into develop
Version 1.0.27
Steve Sutton [Fri, 22 Aug 2014 16:56:51 +0000 (12:56 -0400)]
Merge branch 'hotfix/1.0.27'
Steve Sutton [Fri, 22 Aug 2014 16:56:24 +0000 (12:56 -0400)]
adding canonical urls
This will give all pages their canonical url
Steve Sutton [Fri, 22 Aug 2014 13:52:09 +0000 (09:52 -0400)]
Merge tag 'v1.0.26' into develop
Version 1.0.26
Steve Sutton [Fri, 22 Aug 2014 13:51:58 +0000 (09:51 -0400)]
Merge branch 'hotfix/1.0.26'
Steve Sutton [Fri, 22 Aug 2014 13:51:02 +0000 (09:51 -0400)]
Update on the link for pastys
Add quotes around the href.
Add target _blank to anchor
Steve Sutton [Fri, 22 Aug 2014 13:50:14 +0000 (09:50 -0400)]
Update the background image for winter
new image to make the navigation look better.
Steve Sutton [Fri, 22 Aug 2014 12:53:35 +0000 (08:53 -0400)]
Merge tag 'v1.0.25' into develop
Version 1.0.25
Steve Sutton [Fri, 22 Aug 2014 12:53:25 +0000 (08:53 -0400)]
Merge branch 'hotfix/1.0.25'
Steve Sutton [Fri, 22 Aug 2014 12:52:50 +0000 (08:52 -0400)]
Change email back in dev section
change back to dev
Steve Sutton [Fri, 22 Aug 2014 12:47:23 +0000 (08:47 -0400)]
Merge tag 'v1.0.22' into develop
Version 1.0.22
Steve Sutton [Fri, 22 Aug 2014 12:46:54 +0000 (08:46 -0400)]
Merge branch 'hotfix/1.0.22'
Steve Sutton [Fri, 22 Aug 2014 12:46:34 +0000 (08:46 -0400)]
update code
for interest
Steve Sutton [Fri, 22 Aug 2014 12:29:11 +0000 (08:29 -0400)]
Set config file
Does not have trip planner so removing from config
Steve Sutton [Fri, 22 Aug 2014 12:28:21 +0000 (08:28 -0400)]
Setting up StreamSend
Add the credentials for streamsend.
Setup email for vagrant
Ian Weller [Thu, 21 Aug 2014 19:23:23 +0000 (15:23 -0400)]
Merge branch 'hotfix/1.0.24' into develop
Ian Weller [Thu, 21 Aug 2014 19:22:54 +0000 (15:22 -0400)]
Merge branch 'hotfix/1.0.24'
Ian Weller [Thu, 21 Aug 2014 19:18:36 +0000 (15:18 -0400)]
Added Pasty Central link and text
Added a new ul and an li a for the photo source.
Laury GvR [Thu, 21 Aug 2014 18:22:21 +0000 (14:22 -0400)]
Merge tag 'V1.0.23' into develop
version 1.0.23
Laury GvR [Thu, 21 Aug 2014 18:22:14 +0000 (14:22 -0400)]
Merge branch 'hotfix/1.0.23'
Laury GvR [Thu, 21 Aug 2014 18:21:53 +0000 (14:21 -0400)]
More style hotfixing.
Laury GvR [Thu, 21 Aug 2014 18:06:07 +0000 (14:06 -0400)]
Merge tag 'V1.0.21' into develop
version 1.0.21
Laury GvR [Thu, 21 Aug 2014 18:05:55 +0000 (14:05 -0400)]
Merge branch 'hotfix/1.0.21'
Laury GvR [Thu, 21 Aug 2014 18:04:26 +0000 (14:04 -0400)]
Image caption toolbox pages resizing.
It was at 100% so would be significantly wider than the image.
Laury GvR [Thu, 21 Aug 2014 14:41:10 +0000 (10:41 -0400)]
Merge tag 'V1.0.20' into develop
version 1.0.20
Conflicts:
Toolkit/Members/css/member.css
Laury GvR [Thu, 21 Aug 2014 14:39:33 +0000 (10:39 -0400)]
Merge branch 'hotfix/1.0.20'
Laury GvR [Thu, 21 Aug 2014 14:38:51 +0000 (10:38 -0400)]
Fix to fix the previous fix' weird GIT issues
Member search results formatting.. more.
Laury GvR [Thu, 21 Aug 2014 14:17:26 +0000 (10:17 -0400)]
Fixing search results styling, map resizing.
Laury GvR [Thu, 21 Aug 2014 14:17:26 +0000 (10:17 -0400)]
Fixing search results styling, map resizing.
Laury GvR [Wed, 20 Aug 2014 21:02:37 +0000 (17:02 -0400)]
More member search results formatting
Laury GvR [Wed, 20 Aug 2014 21:02:37 +0000 (17:02 -0400)]
More member search results formatting
Steve Sutton [Wed, 20 Aug 2014 20:42:07 +0000 (16:42 -0400)]
Merge tag 'v1.0.18' into develop
Version 1.0.18
Steve Sutton [Wed, 20 Aug 2014 20:41:58 +0000 (16:41 -0400)]
Merge branch 'hotfix/1.0.18'
Steve Sutton [Wed, 20 Aug 2014 20:41:28 +0000 (16:41 -0400)]
Remove extra p tag in template
Block description already has p tags in them.
Steve Sutton [Wed, 20 Aug 2014 20:10:52 +0000 (16:10 -0400)]
Merge tag 'v1.0.17' into develop
Version 1.0.17
Steve Sutton [Wed, 20 Aug 2014 20:10:40 +0000 (16:10 -0400)]
Merge branch 'hotfix/1.0.17'
Steve Sutton [Wed, 20 Aug 2014 20:10:11 +0000 (16:10 -0400)]
Event detail update
Add title and meta for event detail pages
Steve Sutton [Wed, 20 Aug 2014 19:31:17 +0000 (15:31 -0400)]
Update member profile layout
use larger area for the image
larger for description if no attributes
Steve Sutton [Wed, 20 Aug 2014 19:31:17 +0000 (15:31 -0400)]
Update member profile layout
use larger area for the image
larger for description if no attributes
Laury GvR [Wed, 20 Aug 2014 18:44:42 +0000 (14:44 -0400)]
Merge tag 'V1.0.14' into develop
version 1.0.14
Laury GvR [Wed, 20 Aug 2014 18:44:26 +0000 (14:44 -0400)]
Merge branch 'hotfix/1.0.14'
Laury GvR [Wed, 20 Aug 2014 18:43:24 +0000 (14:43 -0400)]
Member search results image resizing update
Now won't force them to be 100% width or 120px in height.
Laury GvR [Wed, 20 Aug 2014 18:34:35 +0000 (14:34 -0400)]
Map resizing finally complete.
Apparently Firefox mobile viewer is off by ~60 pixels.
Had to change media queries.
Laury GvR [Wed, 20 Aug 2014 18:34:35 +0000 (14:34 -0400)]
Map resizing finally complete.
Apparently Firefox mobile viewer is off by ~60 pixels.
Had to change media queries.
Steve Sutton [Wed, 20 Aug 2014 18:21:06 +0000 (14:21 -0400)]
Merge tag 'v1.0.13' into develop
Version 1.0.13
Steve Sutton [Wed, 20 Aug 2014 18:20:58 +0000 (14:20 -0400)]
Merge branch 'hotfix/1.0.13'
Steve Sutton [Wed, 20 Aug 2014 18:20:38 +0000 (14:20 -0400)]
Redirects
From Anthony
Steve Sutton [Wed, 20 Aug 2014 18:14:02 +0000 (14:14 -0400)]
Merge tag 'v1.0.12' into develop
Version 1.0.12
Steve Sutton [Wed, 20 Aug 2014 18:13:52 +0000 (14:13 -0400)]
Merge branch 'hotfix/1.0.12'
Steve Sutton [Wed, 20 Aug 2014 18:12:45 +0000 (14:12 -0400)]
Fix bug with extra end div tag
remove extra tag
Steve Sutton [Wed, 20 Aug 2014 18:06:22 +0000 (14:06 -0400)]
Merge tag 'v1.0.11' into develop
Version 1.0.11
Steve Sutton [Wed, 20 Aug 2014 18:06:12 +0000 (14:06 -0400)]
Merge branch 'hotfix/1.0.11'
Steve Sutton [Wed, 20 Aug 2014 18:05:51 +0000 (14:05 -0400)]
Add google code
analytics
Steve Sutton [Wed, 20 Aug 2014 17:38:39 +0000 (13:38 -0400)]
Merge branch 'master' of cvs2:web/Keweenaw
Steve Sutton [Wed, 20 Aug 2014 17:37:52 +0000 (13:37 -0400)]
Fix for image right
close figure before the div
Steve Sutton [Wed, 20 Aug 2014 17:38:15 +0000 (13:38 -0400)]
Merge branch 'hotfix/1.0.10'
Steve Sutton [Wed, 20 Aug 2014 17:37:52 +0000 (13:37 -0400)]
Fix for image right
close figure before the div
Laury GvR [Wed, 20 Aug 2014 16:46:12 +0000 (12:46 -0400)]
Change offset on members search when on medium
Laury GvR [Wed, 20 Aug 2014 16:46:12 +0000 (12:46 -0400)]
Change offset on members search when on medium
Steve Sutton [Wed, 20 Aug 2014 16:46:07 +0000 (12:46 -0400)]
Merge tag 'v1.0.7' into develop
Version 1.0.7
Steve Sutton [Wed, 20 Aug 2014 16:45:58 +0000 (12:45 -0400)]
Merge branch 'hotfix/1.0.7'
Steve Sutton [Wed, 20 Aug 2014 16:45:02 +0000 (12:45 -0400)]
Fixes for events
Fix for url's on the event detail page
Fix for the name search if nothing is put in than default to first page
of event list.
Steve Sutton [Wed, 20 Aug 2014 16:39:18 +0000 (12:39 -0400)]
breadcrumbs for members
fix for breadcrumbs
Laury GvR [Wed, 20 Aug 2014 16:30:18 +0000 (12:30 -0400)]
Spacing beneath Get Directions button event pages
Laury Garcia van Rooijen [Wed, 20 Aug 2014 16:19:15 +0000 (12:19 -0400)]
.htaccess update since site has gone live
Steve Sutton [Wed, 20 Aug 2014 16:04:00 +0000 (12:04 -0400)]
Merge tag 'v1.0.6' into develop
Version 1.0.6
Steve Sutton [Wed, 20 Aug 2014 16:03:52 +0000 (12:03 -0400)]
Merge branch 'hotfix/1.0.6'
Steve Sutton [Wed, 20 Aug 2014 16:03:20 +0000 (12:03 -0400)]
Console log in js
remove console log calls.
Steve Sutton [Wed, 20 Aug 2014 15:46:37 +0000 (11:46 -0400)]
Merge tag 'v1.0.5' into develop
Version 1.0.5
Steve Sutton [Wed, 20 Aug 2014 15:46:27 +0000 (11:46 -0400)]
Merge branch 'hotfix/1.0.5'
Steve Sutton [Wed, 20 Aug 2014 15:46:14 +0000 (11:46 -0400)]
search engine
add opensearchserver.ignore to navs footer
Steve Sutton [Wed, 20 Aug 2014 15:29:23 +0000 (11:29 -0400)]
fix conflicts
Steve Sutton [Wed, 20 Aug 2014 15:28:51 +0000 (11:28 -0400)]
Merge branch 'hotfix/1.0.4'
Steve Sutton [Wed, 20 Aug 2014 15:28:28 +0000 (11:28 -0400)]
Refix profile page links
for https
Steve Sutton [Wed, 20 Aug 2014 15:22:56 +0000 (11:22 -0400)]
Fixing Member website links
Remove the external js file if they are on a member page.
Fix member urls so they can use https.
Steve Sutton [Wed, 20 Aug 2014 15:22:56 +0000 (11:22 -0400)]
Fixing Member website links
Remove the external js file if they are on a member page.
Fix member urls so they can use https.
Laury GvR [Wed, 20 Aug 2014 14:59:31 +0000 (10:59 -0400)]
Map marker search results.
It had been disabled due to our changes in getMemberSearchResults.
$memberMap = true in Member.php fixed it. Also formatting.
Laury GvR [Wed, 20 Aug 2014 14:59:31 +0000 (10:59 -0400)]
Map marker search results.
It had been disabled due to our changes in getMemberSearchResults.
$memberMap = true in Member.php fixed it. Also formatting.
Steve Sutton [Wed, 20 Aug 2014 14:45:22 +0000 (10:45 -0400)]
Update bread crumb
For search result pages need to
pick out catid= from referer
Steve Sutton [Wed, 20 Aug 2014 14:45:45 +0000 (10:45 -0400)]
Merge branch 'hotfix/1.0.1'
Steve Sutton [Wed, 20 Aug 2014 14:45:22 +0000 (10:45 -0400)]
Update bread crumb
For search result pages need to
pick out catid= from referer
Laury GvR [Wed, 20 Aug 2014 14:16:23 +0000 (10:16 -0400)]
Merge tag 'V1.0' into develop
Going live. V1.0
Laury GvR [Wed, 20 Aug 2014 14:15:32 +0000 (10:15 -0400)]
Merge branch 'release/1.0'
Steve Sutton [Wed, 20 Aug 2014 14:10:05 +0000 (10:10 -0400)]
confg server.ini
use ds4
Steve Sutton [Wed, 20 Aug 2014 13:13:32 +0000 (09:13 -0400)]
update member breadcrumbs
clean up remove code comments.
Steve Sutton [Wed, 20 Aug 2014 13:12:17 +0000 (09:12 -0400)]
update member breadcrumbs
add site-map if they come from the site map page.
Laury GvR [Wed, 20 Aug 2014 14:00:07 +0000 (10:00 -0400)]
Minor style fix. Margin bottom of events h3.
Laury GvR [Wed, 20 Aug 2014 13:49:24 +0000 (09:49 -0400)]
Minor style corrections.
Laury GvR [Wed, 20 Aug 2014 13:48:28 +0000 (09:48 -0400)]
More little edits, mostly styles
Laury GvR [Wed, 20 Aug 2014 13:05:15 +0000 (09:05 -0400)]
Imageless member search result minor hotfix.
Empty images would show up with a border in Chrome. Replaced with <p>
Steve Sutton [Wed, 20 Aug 2014 13:01:41 +0000 (09:01 -0400)]
Update font size for breadcrumbs
Change to 12px size and bold
Laury GvR [Wed, 20 Aug 2014 12:59:03 +0000 (08:59 -0400)]
Centering searchform map. Search result thumbs.
The searchform was being forced to float right. It will now center.
The member search results had odd formatting when no image. No longer!
Steve Sutton [Wed, 20 Aug 2014 12:47:53 +0000 (08:47 -0400)]
update member breadcrumbs
Update the member breadcrumbs if the have a referer page
then we can add the page links into the breaodcrumbs.
if no referer page then use the default breadcrumbs for the
member profile page.
Laury GvR [Tue, 19 Aug 2014 21:08:30 +0000 (17:08 -0400)]
Search results formatting.
Steve Sutton [Tue, 19 Aug 2014 20:36:02 +0000 (16:36 -0400)]
remove fixed for the background
no fixed images
Steve Sutton [Tue, 19 Aug 2014 20:28:34 +0000 (16:28 -0400)]
style change
for h3 in #main section
remove top margin and add the margin to the listing class.
Steve Sutton [Tue, 19 Aug 2014 20:19:32 +0000 (16:19 -0400)]
Update emails
use info@keweenaw.info for all email to
Steve Sutton [Tue, 19 Aug 2014 20:08:32 +0000 (16:08 -0400)]
Make background images fixed
adding no-repeat center center fixed to the background url line in css
for seasons.
Steve Sutton [Tue, 19 Aug 2014 19:54:09 +0000 (15:54 -0400)]
template toolbox update
move the sections just below the category output