Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge github.com:openframeworks/ofSite
Conflicts:
	download/index.html.mako
  • Loading branch information
LeoColomb committed Jul 27, 2013
2 parents 4bcd3b6 + 773cda3 commit 6635694
Show file tree
Hide file tree
Showing 790 changed files with 202,451 additions and 1,970 deletions.
8 changes: 5 additions & 3 deletions _config.py
Expand Up @@ -14,6 +14,8 @@
# Basic Settings
# (almost all sites will want to configure these settings)
######################################################################
import inspect, os
sys.path.append( os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) ) # script directory
from _version import currentVersion

## site_url -- Your site's full URL
Expand All @@ -29,15 +31,15 @@

## blog_enabled -- Should the blog be enabled?
# (You don't _have_ to use blogofile to build blogs)
blog.enabled = True
blog.enabled = False

## blog_path -- Blog path.
# This is the path of the blog relative to the site_url.
# If your site_url is "http://www.yoursite.com/~ryan"
# and you set blog_path to "/blog" your full blog URL would be
# "http://www.yoursite.com/~ryan/blog"
# Leave blank "" to set to the root of site_url
blog.path = "/blog"
#blog.path = "/blog"

## blog_name -- Your Blog's name.
# This is used repeatedly in default blog templates
Expand All @@ -51,7 +53,7 @@
blog.timezone = "US/Eastern"

controllers.documentation.enabled = True
controllers.community.enabled = True
controllers.community.enabled = False
controllers.tutorials.enabled = True

documentation = controllers.documentation
Expand Down
43 changes: 0 additions & 43 deletions _controllers/blog/__init__.py

This file was deleted.

38 changes: 0 additions & 38 deletions _controllers/blog/archives.py

This file was deleted.

82 changes: 0 additions & 82 deletions _controllers/blog/categories.py

This file was deleted.

55 changes: 0 additions & 55 deletions _controllers/blog/chronological.py

This file was deleted.

16 changes: 0 additions & 16 deletions _controllers/blog/feed.py

This file was deleted.

38 changes: 0 additions & 38 deletions _controllers/blog/permapage.py

This file was deleted.

0 comments on commit 6635694

Please sign in to comment.