summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
Ove Klykken [Tue, 10 Jun 2014 18:26:45 +0000 (14:26 -0400)]
Merge branch 'feature/template' into develop
Ove Klykken [Tue, 10 Jun 2014 18:24:10 +0000 (14:24 -0400)]
Merge branch 'develop' of cvs2.gaslightmedia.com:web/SooLocks into feature/template
Ove Klykken [Tue, 10 Jun 2014 18:11:47 +0000 (14:11 -0400)]
column in small view
Made sure the column items are side by side in small view
Steve Sutton [Tue, 10 Jun 2014 18:00:49 +0000 (14:00 -0400)]
add blocks and side nav
Adding sideNavigation to the template
Adding GLM_Blocks to the template
Ove Klykken [Tue, 10 Jun 2014 17:56:29 +0000 (13:56 -0400)]
Footer
headers colored red
tagline uppercase and times font
Steve Sutton [Tue, 10 Jun 2014 17:26:39 +0000 (13:26 -0400)]
Merge branch 'feature/videos' into develop
Steve Sutton [Tue, 10 Jun 2014 17:16:02 +0000 (13:16 -0400)]
update line ending
unix form for file
Steve Sutton [Tue, 10 Jun 2014 17:11:47 +0000 (13:11 -0400)]
Adding the libraries for videos
working on grid for videos output
Ove Klykken [Tue, 10 Jun 2014 17:10:12 +0000 (13:10 -0400)]
Misc changes
Hiding logo on smaller screens.
Removed redundant CSS rule
custom style for h2 toolbox headers
Ove Klykken [Tue, 10 Jun 2014 16:19:21 +0000 (12:19 -0400)]
Footer and exit-off-canvas
Separated tagline from footer element.
Added element to exit off-canvas mode
Steve Sutton [Tue, 10 Jun 2014 16:19:08 +0000 (12:19 -0400)]
Start work on videos
work on templates
Ove Klykken [Tue, 10 Jun 2014 16:14:04 +0000 (12:14 -0400)]
Bottom tagline
bottom tagline separated from the footer element
Steve Sutton [Tue, 10 Jun 2014 15:50:41 +0000 (11:50 -0400)]
Add photoswipe
needed for demo version of photo gallery
Steve Sutton [Tue, 10 Jun 2014 15:49:28 +0000 (11:49 -0400)]
Update ref for js
use libjs instead
Steve Sutton [Tue, 10 Jun 2014 15:44:18 +0000 (11:44 -0400)]
template updates
setup photo template
small 2
medium 3
large 4
remove ending spaces in templates/template.html
Steve Sutton [Tue, 10 Jun 2014 15:33:32 +0000 (11:33 -0400)]
Add toolbox content
Add toolbox content to template
Steve Sutton [Tue, 10 Jun 2014 15:29:30 +0000 (11:29 -0400)]
Update dev mode
use devdb for database host
Steve Sutton [Tue, 10 Jun 2014 15:26:34 +0000 (11:26 -0400)]
Update template
Add correct path url for all resources
Ove Klykken [Tue, 10 Jun 2014 15:21:45 +0000 (11:21 -0400)]
Changing default template to the one I had been working on
Steve Sutton [Mon, 9 Jun 2014 20:50:43 +0000 (16:50 -0400)]
Updates for schedule app
also updates for php5.3
Steve Sutton [Mon, 9 Jun 2014 19:53:59 +0000 (15:53 -0400)]
Merge branch 'develop' of cvs2:web/SooLocks into develop
Steve Sutton [Mon, 9 Jun 2014 19:53:43 +0000 (15:53 -0400)]
Merge branch 'feature/steve/cruiseSchedule' into develop
Steve Sutton [Mon, 9 Jun 2014 19:51:30 +0000 (15:51 -0400)]
Update .htaccess file for schedule redirect
Needed for the schedule application
Steve Sutton [Mon, 9 Jun 2014 19:27:52 +0000 (15:27 -0400)]
Merge branch 'feature/steve/headerImages' into develop
Steve Sutton [Mon, 9 Jun 2014 19:25:16 +0000 (15:25 -0400)]
update for work on vserver and add header images
add output in template object for header images
comment out for use in vserver php5.3
Steve Sutton [Fri, 6 Jun 2014 15:29:23 +0000 (11:29 -0400)]
Add source for headerImage Application
Bring in the discoverkalamazoo code for headerimages.
Steve Sutton [Fri, 6 Jun 2014 15:20:16 +0000 (11:20 -0400)]
Setting up the boat schedule application from beaverisland
Taking the beaverislandboatcompany schedule application.
This is a start of it as it will need some work.
Steve Sutton [Fri, 6 Jun 2014 14:20:46 +0000 (10:20 -0400)]
Update for working on site locally
add for php 5.5 to work
Steve Sutton [Fri, 6 Jun 2014 14:09:45 +0000 (10:09 -0400)]
Installing Apps to website
Installing:
Contacts
Photos
Blocks
Videos
Coupons
Steve Sutton [Fri, 6 Jun 2014 14:01:09 +0000 (10:01 -0400)]
initial setup of soolocks
projects / web / SooLocks.git / log