Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Toying with twig #34

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Toying with twig #34

wants to merge 19 commits into from

Commits on Jan 17, 2012

  1. ignore .htaccess

    @bumpux
    bumpux committed Jan 17, 2012
    Configuration menu
    Copy the full SHA
    c3c8622 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @bumpux
    bumpux committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    149a36c View commit details
    Browse the repository at this point in the history

  2. dont ignore htaccess

    @bumpux
    bumpux committed Jan 19, 2012
    Configuration menu
    Copy the full SHA
    8a08635 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @bumpux
    bumpux committed Jan 30, 2012
    Configuration menu
    Copy the full SHA
    d0fb146 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @bumpux
    bumpux committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    01eca61 View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2012

  1. Merge remote-tracking branch 'upstream/master'

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    acbde31 View commit details
    Browse the repository at this point in the history

  2. got the extends template thing working

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    ff1429e View commit details
    Browse the repository at this point in the history

  3. figuring out the new stacey vars

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    207e800 View commit details
    Browse the repository at this point in the history

  4. hmmm

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    88cd0f1 View commit details
    Browse the repository at this point in the history

  5. Update with Twig Dir

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    2d36690 View commit details
    Browse the repository at this point in the history

  6. Renamed back to default

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    87a3f93 View commit details
    Browse the repository at this point in the history

  7. Using Twig "extends" to consolidate shared code between templates

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    f1cfbfa View commit details
    Browse the repository at this point in the history

  8. ignore espresso

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    3ca1dfa View commit details
    Browse the repository at this point in the history

  9. kill espresso

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    cda5fcf View commit details
    Browse the repository at this point in the history

  10. cleanup

    @bumpux
    bumpux committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    f64f4d8 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2012

  1. updated .twig setup showing nested block (footer)

    @bumpux
    bumpux committed Feb 8, 2012
    Configuration menu
    Copy the full SHA
    c21a659 View commit details
    Browse the repository at this point in the history

  2. update twig stuff

    @bumpux
    bumpux committed Feb 8, 2012
    Configuration menu
    Copy the full SHA
    142c77a View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2012

  1. quick update

    @bumpux
    bumpux committed Feb 13, 2012
    Configuration menu
    Copy the full SHA
    cdadf67 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into toying_with_twig

    @bumpux
    bumpux committed Feb 13, 2012
    Configuration menu
    Copy the full SHA
    3849c9b View commit details
    Browse the repository at this point in the history