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: pero-ict-solutions/spree-static-content
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pero-ict-solutions/spree-static-content
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2-1-stable
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 13 commits
  • 23 files changed
  • 6 contributors

Commits on Nov 18, 2013

  1. use the correct spree 2-1-stable branch

    @peterberkenbosch
    peterberkenbosch committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    c526f3f View commit details
    Browse the repository at this point in the history

  2. update Versionfile to point to correct branch

    @peterberkenbosch
    peterberkenbosch committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    d772d56 View commit details
    Browse the repository at this point in the history

  3. implement fixes from #136. Thanks @daswasser

    @peterberkenbosch
    peterberkenbosch committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    e0ebe13 View commit details
    Browse the repository at this point in the history

  4. Update .travis.yml 

    test 1-3-stable, 2-0-stable, 2-1-stable and master.
    @peterberkenbosch
    peterberkenbosch committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    3a42437 View commit details
    Browse the repository at this point in the history

  5. update mail settings for travis

    @peterberkenbosch
    peterberkenbosch committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    98f04f9 View commit details
    Browse the repository at this point in the history

  6. Use notice for Travis CI notifications

    @radar
    radar committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    cb80338 View commit details
    Browse the repository at this point in the history

  7. Rename 'pages' table to 'spree_pages' in migrations

    @radar
    radar committed Nov 18, 2013
    Configuration menu
    Copy the full SHA
    ebf9f25 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2013

  1. update russion translations, thanks @GarPit

    @peterberkenbosch
    peterberkenbosch committed Nov 19, 2013
    Configuration menu
    Copy the full SHA
    05f32b0 View commit details
    Browse the repository at this point in the history

  2. add spec for rendering the correct page links 

    add database_cleaner

Conflicts:
	spec/requests/static_content_spec.rb
    @peterberkenbosch
    peterberkenbosch committed Nov 19, 2013
    Configuration menu
    Copy the full SHA
    5966c16 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2014

  1. Grammar nazi update 

    Tytuł is spelled with u not ó
    Filip Bartuzi committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    2ecf70e View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2014

  1. adding ability to deface the table and form 

    Closes #153
    @peterberkenbosch
    John Koht authored and peterberkenbosch committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    0e1a8e5 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2014

  1. Merge pull request #159 from Bartuz/patch-1 

    Grammar nazi update
    @JDutil
    JDutil committed Sep 16, 2014
    Configuration menu
    Copy the full SHA
    7932750 View commit details
    Browse the repository at this point in the history

  2. ignore coverage

    Jeff Dutil authored and Jeff Dutil committed Sep 16, 2014
    Configuration menu
    Copy the full SHA
    b72cfcb View commit details
    Browse the repository at this point in the history
Loading