Skip to content
Permalink

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: codevise/pageflow
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.7.0
Choose a base ref
...
head repository: codevise/pageflow
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.7.1
Choose a head ref
  • 10 commits
  • 4 files changed
  • 2 contributors

Commits on Feb 5, 2015

  1. Accept functions in Marionette Renderer 

    If template is a function simply use it as a template.
    @tf
    tf committed Feb 5, 2015
    Configuration menu
    Copy the full SHA
    fb87805 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2015

  1. Restrict sass-rails Gem Version to ~> 4.0 

    `sass-rails 5.0` no longer allows mixing sprockets `require` and scss
`@import`. Still `jquery-ui-rails` uses `require` which causes some
stylesheets not to be loaded.
    @tf
    tf committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    008401a View commit details
    Browse the repository at this point in the history

  2. Bump to alpha

    @tf
    tf committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    012c3fc View commit details
    Browse the repository at this point in the history

  3. Merge pull request #252 from tf/marionette-renderer 

    Accept Functions in Marionette Renderer
    @tf
    tf committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    1d05c89 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #254 from tf/sass-rails-version 

    Restrict sass-rails Gem Version to ~> 4.0
    @tf
    tf committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    3058631 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2015

  1. Loosen JBuilder Dependency 

    fixes #190

2.x should also be compatible.
    @tf
    tf committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    9281285 View commit details
    Browse the repository at this point in the history

  2. Narrow down Gem Versions in pageflow.gemspec 

    Use pessimistic version constraint

* on minor versions for gems >= 1.0
* on patch level version for 0.x gems
    @tf
    tf committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    52c1e82 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #256 from tf/pessimistic-gemspec 

    Narrow down Gem Versions in pageflow.gemspec
    @tf
    tf committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    df972dc View commit details
    Browse the repository at this point in the history

  4. Merge pull request #257 from tf/jbuilder-version 

    Loosen JBuilder Dependency
    @tf
    tf committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    1edb019 View commit details
    Browse the repository at this point in the history

  5. Bump version to 0.7.1

    @tf
    tf committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    a4a5e92 View commit details
    Browse the repository at this point in the history
Loading