Permalink
Commits on Aug 25, 2012
  1. Devise dependency set to ~> 2.1.0

    parndt committed May 18, 2012
Commits on Aug 24, 2012
Commits on Aug 23, 2012
  1. Remove incorrect documentation

    We don't actually use current_page? at all.
    parndt committed Aug 23, 2012
Commits on Aug 22, 2012
  1. Merge remote-tracking branch 'simplelogica/fix/engine-generator-multi…

    …ple-resources-migrations-routes'
    parndt committed Aug 22, 2012
Commits on Aug 18, 2012
  1. Merge pull request #1890 from thomasn/master

    Typo
    ugisozols committed Aug 18, 2012
  2. Typo in docs

    Using content_for instead of content_for?
    thomasn committed Aug 18, 2012
  3. Port list reordering fix to update_child_positions too so that nested…

    … items are ordered correctly too.
    parndt committed with robyurkowski Aug 18, 2012
Commits on Aug 17, 2012
  1. Revert "Bump jquery-rails version to prevent breakage."

    As it turns out, jQuery 1.8 has a few bugs in it. We'll suggest
    jquery-rails 2.0 for the time being.
    
    This reverts commit c547ad5.
    robyurkowski committed Aug 17, 2012
  2. Detecting that config/routes.rb already exists and then trying to mer…

    …ge it. Related to the issue GH-1885
    brenes committed Aug 17, 2012
  3. Added spec to test that routes for the new resource are appended to t…

    …he config/routes.rb file as reported in GH-1885
    brenes committed Aug 17, 2012
  4. Fixing the regex used for detecting that a generator template was a m…

    …igration (it didn't include final '.erb'). Related to the issue GH-1885 about bad revisions numbering
    brenes committed Aug 17, 2012
  5. Added spec for testing that migration for a new resource in an extens…

    …ion will be numbered properly as reported in GH-1885
    brenes committed Aug 17, 2012
  6. Merge pull request #1884 from resolve/resource-accept-params

    Make multiple resource uploads pass on form parameters, which should be ...
    parndt committed Aug 17, 2012
  7. Make multiple resource uploads pass on form parameters, which should …

    …be expected behaviour.
    
    In the situation where you add a field to Resources, upon create, you're unable to save any of those additional attributes because we only pass on the file attribute at the moment when the user is uploading multiple files. Of course, the user is always uploading multiple files, because the default html5ish behaviour is to send an array anyway. This corrects the existing create method and allows the user to submit multiple attributes to be saved.
    robyurkowski committed Aug 17, 2012
Commits on Aug 16, 2012
  1. Revert "Lock to sass 3.1.12 so that tests pass."

    This reverts commit 6672d9e.
    Sass 3.2.1 is out and fixes the issue.
    parndt committed Aug 16, 2012
Commits on Aug 15, 2012
  1. Lock to sass 3.1.12 so that tests pass.

    They fail on 3.2.0 because of sass/sass#482
    parndt committed Aug 15, 2012
  2. Add failing spec for #1585.

    robyurkowski committed Aug 15, 2012
Commits on Aug 12, 2012
  1. Tiny changes to sk files

    Matho committed Aug 12, 2012
  2. Merge pull request #1876 from Aupajo/patch-1

    Fix typo
    parndt committed Aug 12, 2012
  3. Fix typo

    Aupajo committed Aug 12, 2012
Commits on Aug 10, 2012
  1. Merge pull request #1871 from kandadaboggu/patch-2

    Added 'placeholder' attribute to the 'input' tag
    parndt committed Aug 10, 2012
  2. Added 'placeholder' attribute to the 'input' tag

    Fix for https://github.com/resolve/refinerycms/issues/1870
    
    Made following changes to the validation section of the `input` tag:
      - Added the missing `placeholder` attribute.
      - Removed `placeholder` as one of the possible values for the `type` tag.  Refer to the spec(http://www.w3.org/TR/html5/the-input-element.html#attr-input-type) for more details.
    kandadaboggu committed Aug 10, 2012
  3. Only allow to update image if the image being uploaded has the same f…

    …ile name as the image being replaced.
    ugisozols committed with parndt Aug 9, 2012
  4. Remove duplicate validity spec and stub out config values instead of …

    …setting them directly.
    ugisozols committed with parndt Aug 9, 2012
Commits on Aug 9, 2012
  1. Merge pull request #1842 from resolve/remove-extra-javascript-content…

    …-blocks
    
    Remove extra javascript content blocks.
    ugisozols committed Aug 9, 2012