Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
Commits on Jan 11, 2012
@plusjade plusjade version 0.0.1 4c18e3c
Commits on Jan 12, 2012
@studiomohawk studiomohawk add .rbenv-version 486d099
@studiomohawk studiomohawk add rake preview for development 223a9ca
@studiomohawk studiomohawk add feedbuner url dc6bc0d
@studiomohawk studiomohawk the_minimum theme is ready 66a3d56
@plusjade plusjade sample content updates ab03c6d
@plusjade plusjade specify page group 'navigation'
Also clean out pages.html and just list all pages
3b239b9
@plusjade plusjade add little arrow to collated list 2e16fad
@plusjade plusjade assign active class to li 46c738c
@plusjade plusjade add twitter bootstrap theme 3a6ba2d
@plusjade plusjade use twitter theme as default 72f5694
@studiomohawk studiomohawk title should not have changed 4021a8c
Commits on Jan 13, 2012
@studiomohawk studiomohawk remove linear class 7758988
@studiomohawk studiomohawk remove linear class 320470d
@studiomohawk studiomohawk missing ul tags 0ec3a40
@studiomohawk studiomohawk Fixed minor issues 4da313a
@studiomohawk studiomohawk add more detail 4bcfd7a
@plusjade plusjade sample content updates 5abba31
@plusjade plusjade specify page group 'navigation'
Also clean out pages.html and just list all pages
ef17645
@plusjade plusjade add little arrow to collated list 2383611
@plusjade plusjade assign active class to li eca5de0
@plusjade plusjade add twitter bootstrap theme 4aadec2
@plusjade plusjade use twitter theme as default e34311d
@plusjade plusjade fix merge conflict a760814
Commits on Jan 15, 2012
@swanson swanson Add Atom rss feeds 812e27b
@plusjade plusjade Merge pull request #8 from swanson/master
Add Atom rss feeds
f3f08f9
Commits on Jan 16, 2012
@pradeep1288 pradeep1288 adding the new_post task, with bugs fixed which were pointed out by @… 6ee3125
Commits on Jan 17, 2012
@jcn jcn Change directory tests in switch_theme task to use FileTest.directory…
…? instead of Dir.exists? for ruby 1.8.7 compatibility.
6e70fdd
Commits on Jan 18, 2012
@plusjade plusjade Merge pull request #12 from jcn/patch-1
Change directory tests in switch_theme task for ruby 1.8.7 compatibility
e26b5f7
@plusjade plusjade Merge pull request #11 from pradeep1288/master
Created a new rake task : new_post
246e91a
@plusjade plusjade reorganize rakefile
Namely standardized some logic and put config variables in hash
9d7d4eb
Commits on Jan 19, 2012
@plusjade plusjade Hello world 2a5c275
@plusjade plusjade Add atom title and inline tag list bbf4212
@plusjade plusjade remove samples
I guess only one sample post file will do. Also if users leave this content up, Google may not like the duplicate content =/
e70aa41
@plusjade plusjade don't process rakefile, readme 07eb4d1
@jogjayr jogjayr fixed incorrect link to jekyll bootstrap homepage 80595af
@plusjade plusjade Merge pull request #13 from jogjayr/master
Broken link in index.md
df13158
Commits on Jan 20, 2012
@xtine xtine Fixed typo: title should be "Jekyll Bootstrap" bb8ec4c
@plusjade plusjade Merge pull request #16 from xtine/patch-1
Fixed typo: title should be "Jekyll Bootstrap"
dad96fb
Commits on Jan 21, 2012
@jogjayr jogjayr fixed broken link for jekyll quick start on index.md. checked and mad…
…e sure there are no more broken links on that page
5efb722
@plusjade plusjade Merge pull request #18 from jogjayr/master
Another broken link in index.md
b7a353c
@plusjade plusjade Merge remote-tracking branch 'origin/master' 3802b6c
@plusjade plusjade fix typo 241a512
@plusjade plusjade Add new Integration points for themes
The new system will try to namespace all framework integrations with 'JB'. Integration points added in this comment are 'analytics', 'comments', and 'sharing'.
7a0b1ed
@plusjade plusjade Add JB configuration hash to site config df5bedb
@plusjade plusjade Update themes to use new integration methods 45b894f
@plusjade plusjade Themes can define configuration data
Themes can define a 'settings.yml' file which will get injected into the root default.html layout YAML Front Matter which can be accessed through the 'page' variable.
61cdb7a
Commits on Jan 22, 2012
@plusjade plusjade Add ability to dynamically set url paths
This makes GitHub Pages for projects support possible as all urls will need to call on the project's subfolder. The other important piece is that urls should resolve to root locally but be able to change when in production. LLastly this gives themes clear integration points for working with paths. (the jbcache hack just makes it so there is not unnecessary whitespace output in the source.
75fa188
@plusjade plusjade Provide set_paths to all layouts fe33e51
@plusjade plusjade Provide path configuration in _config.yml 3f7fd7b
@plusjade plusjade Need to provide theme name via settings.yml 71278b8
@plusjade plusjade Update themes and pages to new paths api b01624b
@plusjade plusjade Regenerate 'twitter' theme 779afdd
Commits on Jan 23, 2012
@plusjade plusjade Rename set_paths to more generic 'setup'
This is because 'setup' will need to be included in every post/page file if we want to have access to BASE_PATH. So I figure 'setup' will be a good access path for any future inclusions we need to make
7ef7288
@plusjade plusjade Include 'JB/setup' in all posts and pages
This is the only way we can have global access to dynamic liquid variables. Using site configuration is too convulated since switching themes and runing in development vs. production relies on being able to dynamically define variables
a1a7efa
@plusjade plusjade rename HOME_URL to HOME_PATH 0fec345
@plusjade plusjade Refactor new post rake task
Rename from 'rake new_post' to 'rake post'. Also use environment variables over rake arguments
f52ff5a
@plusjade plusjade Add rake task to create pages
Usage: rake page name='about.md'
6d0e38b
@plusjade plusjade Move helpers to namespaced system
Also do away with .html extension
8b79986
@plusjade plusjade Update helper calls
Use 'JB/[HELPER]' format
5c0a7a6
@plusjade plusjade Remove all filename extenstions from JB files 08d59a6
@plusjade plusjade Provide custom overrides to all helpers
Now all helpers can be overridden by custom implementations without editing JB source. Just define a helper's 'engine' as 'custom' in the _config.yml file and provide a helper file of the same name in _includes/custom/. This helps users cleanly upgrade JB versions since they no longer need to edit the files directly.
6c0b6c1
@plusjade plusjade Place paths to main pages in JB hash 3f0579c
@plusjade plusjade Document and reorganize _config.yml 9b3a325
@plusjade plusjade production url should be close to JB 2402716
Commits on Jan 24, 2012
@plusjade plusjade Use ENV variables for switch_theme 9bd0dea
@plusjade plusjade 'Provider' is more correct than 'engine' 065e6ed
@plusjade plusjade version 0.1.0 c197237
@plusjade plusjade Remove BASE_PATH setting
Had this set for testing purposes. Not a good idea to ship with it
266475e
Commits on Jan 30, 2012
@SegFaultAX SegFaultAX Adding a site-wide configuration option for tagline. The twitter them…
…e will

still explicitly require a per-page tagline. Adding rvmrc to gitignore for those
of us still using Ruby Version Manager.
9ba7f1b
@plusjade plusjade Merge pull request #25 from SegFaultAX/tagline-option
Site-wide configuration option for tagline
e99e752
Commits on Jan 31, 2012
@fleeting fleeting Adding Facebook Comments 683d1be
Commits on Feb 01, 2012
@plusjade plusjade Implement theme installer v 0.1.0 53a801b
@plusjade plusjade Update theme packager methods
Allow users to pass git url for a given theme to be installed. Use manifest to maintain compatibility. Add TomDoc comments
21b64c2
@plusjade plusjade don't track _theme_packages directory
This should be treated as a staging directory
d25b40e
@plusjade plusjade Namespace 'switch_theme'
Make sure to maintain backwards compatibility
533d840
Commits on Feb 02, 2012
@plusjade plusjade Fix prompt complaining that directories already exist
When installing from a theme package we create an array of all files to be mirrored. We need to omit directories from this array since directories are recursively created for a given file. This needlessly raised 'directory already exist' errors which was annoying. - Also make error output friendlier
fdfb9c4
@plusjade plusjade Themes are tracked and installed via the packager.
Detach themes from core JB framework.
5b2cc52
@plusjade plusjade Add changelog a86349e
@plusjade plusjade update contributing instructions 58fa445
Commits on Feb 04, 2012
@plusjade plusjade bump version : 0.2.0 4c29c7e
@sdball sdball fix clicky tracking image
If the visitor has JavaScript disabled, clicky
still tracks the visit by having the browser load
a gif that's specific to the site id in the
tracking code.
1580fb2
@plusjade plusjade Merge pull request #29 from sdball/fix_getclicky_code
fix clicky tracking image
eb40808
Commits on Feb 05, 2012
@philips philips index.md: add tagline metadata
Instead of hard coding the tagline use some metadata
7a799ce
Commits on Feb 06, 2012
@nolith nolith Loading custom rake file from _rake/*.rake 4a4a4a8
@plusjade plusjade Resolve incorrect HOME_PATH/BASE_PATH settings
JB/setup needs to account for  being falsy. Also add better usage instructions for BASE_PATH. Fixes #30
3a2df76
Commits on Feb 08, 2012
@vattay vattay Added error check for git clone system call. 068e522
Commits on Feb 19, 2012
@sstarr sstarr Small fix to check the correct variable (page.comments instead of pag…
…e.JB.comments) so that disabling comments works as documented.
9bb6ea1
Commits on Feb 23, 2012
@vattay vattay Issue #46, theme install fails on msys, permissions. ba5fa9b
@vattay vattay Improved error text. 4a03980
Commits on Feb 25, 2012
@tommyblue tommyblue Added the wordpress_id value in Disqus code if present in the post
Signed-off-by: Tommaso Visconti <tommaso.visconti@gmail.com>
7956efe
@plusjade plusjade Merge pull request #47 from tommyblue/jb-development
Added the wordpress_id value in Disqus code if present in the post
878e06c
Commits on Feb 29, 2012
@koomar koomar Adding Mixpanel as analytics provider af88390
Commits on Mar 01, 2012
@daz daz Update to bootstrap 2.0.1 309a6f4
@plusjade plusjade Merge pull request #44 from sstarr/patch-1
Resolved an issue preventing disabling comments for individual pages
c031df4
@koomar koomar Setting google as default analytics provider f9b9cff
@plusjade plusjade Merge remote-tracking branch 'nolith/custom-rake' into jb-development…
…. issue #33
535aa3d
@plusjade plusjade Merge pull request #40 from 3martini/windows-topic
Windows MSYS Support
ca37b93
@plusjade plusjade Merge pull request #49 from koomar/jb-development
Mixpanel as Analytics Provider for JB
b804d16
@plusjade plusjade Merge remote-tracking branch 'daz/master' into jb-development. issue #50 76d3a97
@plusjade plusjade Merge remote-tracking branch 'philips/tagline-metadata' into jb-devel…
…opment. issue #31
beb45da
@plusjade plusjade bump to 0.2.7 12e4175
Andrea Schiavini Added option to specify time when creating posts 02e2f86
Andrea Schiavini Using Time.parse to ensure date format is valid 2d629f2
Andrea Schiavini Forgot including require time 1a9411a
Andrea Schiavini Added exception handling to display a user friendly message when time…
… parse goes wrong
9c1cf75
@plusjade plusjade bump to 0.2.8
Forgot about my buddy @metalelf0 =/
cefdd4e
Commits on Mar 07, 2012
@alishutc alishutc Fix for the error on post creation if date was not specified. 9a69c8e
@plusjade plusjade Fix typo 6d97712
@plusjade plusjade Bump to 0.2.9 162a85d
Commits on Mar 24, 2012
@koriroys koriroys fixed extra h hanging out in atomfeed ids #60 59d6a7b
@LukasKnuth LukasKnuth Added the description-variable in the Rakefile to include it in newly…
… created posts/pages
1aa9527
@plusjade plusjade styling cc7a99f
@plusjade plusjade Show tagline only if set. credit to @sway as seen in pull #48 e3e849e
@mjpieters mjpieters Only list pages with a title. #69
This skips the page.html, default.html, what-have-you-not pages that should not be listed in this list anyway, which otherwise result in empty bullet points.
cbfb9ca
@plusjade plusjade bump to 0.2.13 9c00269
Commits on Dec 10, 2012
@stvn fixed readme c687546