Permalink
Commits on Jun 3, 2012
  1. Text -> Reformat Selection

    [ci skip]
    parndt committed Jun 3, 2012
Commits on May 30, 2012
  1. Merge pull request #1717 from tdelam/master

    Encoding in core.erb.rb
    parndt committed May 30, 2012
  2. Use shorter syntax of render.

    Conflicts:
    
    	core/app/views/refinery/_content_page.html.erb
    ugisozols committed May 30, 2012
  3. @page is the variable name

    ghoppe committed with ugisozols May 29, 2012
  4. fix default template selected

    ghoppe committed with ugisozols May 29, 2012
  5. Merge pull request #1715 from terriblelabs/master

    Use Page#url to view page live from pages admin
    ugisozols committed May 30, 2012
  6. Updated testing guide.

    * Added ruby tags for ruby codes instead of shell tags.
    * Unfortunately spec/spec/config/environment.rb did not exist..
    * Added note about running the steps inside your extension and not from your project's root and warning about rake.
    parndt committed May 30, 2012
Commits on May 29, 2012
  1. Merge pull request #1713 from resolve/doc-updates

    Add a few clarifications about installation.
    parndt committed May 29, 2012
  2. "View this page live" links to Page#url, which

    is more reflective of how pages will be referenced
    and fixes issue with pages with the same slug
    under different parent nodes.
    
    Closes GH-1714
    jeremyw committed May 29, 2012
Commits on May 28, 2012
  1. Revert "Use shorter syntax of render where possible."

    This shouldn't be possible as the default for render in controllers is not partial.
    
    This reverts commit 7f0ce02.
    parndt committed May 28, 2012
  2. I can use id directly.

    ugisozols committed May 28, 2012
Commits on May 26, 2012
  1. Merge pull request #1708 from TheMaster/master

    Content disposition for dragonfly
    parndt committed May 26, 2012
  2. Fixes #1703 by downcasing usernames before saving them.

    Note: This has the implication that all usernames will now be stored downcased.
    
    Conflicts:
    
    	authentication/app/models/refinery/user.rb
    	changelog.md
    parndt committed with ugisozols May 26, 2012
Commits on May 25, 2012
  1. Merge pull request #1699 from resolve/canonical_master

    #1698 for master branch
    robyurkowski committed May 25, 2012
  2. Documented canonical_slug

    parndt committed May 25, 2012
  3. Added Refinery::Page#canonical_slug to allow us to have the same slug…

    … for multiple translations of a page.
    
    * We won't be needing home.css.scss anymore; Use #home-page
    parndt committed May 25, 2012
  4. Added support for @canonical in pages_controller.

    Fixes #1472
    
    Conflicts:
    
    	pages/app/models/refinery/page.rb
    parndt committed Apr 23, 2012