Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Apr 24, 2012

  1. Doug Puchalski

    Merge remote-tracking branch 'upstream/master' into dev

    authored

Apr 15, 2012

  1. Jeremy Jackson

    Merge pull request #209 from swistak/master

    Fixes bug #204
    jejacks0n authored
  2. Marcin Raczkowski

    Change escape sequence to unicode instead of octal. Fixes #204

    swistak authored

Mar 30, 2012

  1. Doug Puchalski

    Merge branch 'toggle_preview_event' into dev

    authored
  2. Doug Puchalski

    Merge branch 'set_change' into dev

    authored
  3. Doug Puchalski

    setPreview triggers toggle:preview when page content is changed.

    authored
  4. Doug Puchalski

    Call Mercury.setChanges rather than setting variable directly.

    authored

Mar 18, 2012

  1. Jeremy Jackson

    added (name)-snippet class to snippets, so they can be styled easier …

    …by type -- fixes #176
    jejacks0n authored
  2. Jeremy Jackson

    fixed an issue with the panel spec (check tests guys!)

    jejacks0n authored
  3. Jeremy Jackson

    include POST_INSTALL in gemspec -- fixes #185

    jejacks0n authored
  4. Jeremy Jackson

    Merge pull request #186 from nreckart/pr/form-styles

    Move form styles into their own file and namespace with .mercury-form.
    jejacks0n authored
  5. Jeremy Jackson

    Merge pull request #182 from aceofspades/asset_precompile

    Fix asset precompile
    jejacks0n authored
  6. Jeremy Jackson

    Merge pull request #184 from mixonic/safari_uploads

    Safari uploads, closes #37. Please help review.
    jejacks0n authored

Mar 16, 2012

  1. Matthew Beale

    Fallback from JS File object .name to .fileName and family. Closes #145.

    mixonic authored
  2. Nathan Reckart

    Move form styles into their own file and namespace with .mercury-form.

    nreckart authored

Mar 15, 2012

  1. Matthew Beale

    Update mercury js files

    mixonic authored
  2. Matthew Beale

    CoffeeScript flunks on preserving JavaScript behavior

    mixonic authored
  3. Matthew Beale

    Correct test: Without FileReader, not with.

    mixonic authored
  4. Matthew Beale

    Use FormBuilder as a fallback from lacking support for FileReader and…

    … multipart posts in Safari. Closes #37.
    mixonic authored

Mar 14, 2012

  1. Matthew Beale

    Merge master into this older fork.

    mixonic authored

Mar 13, 2012

  1. Doug Puchalski

    Initialize for assets should have "group :all" to ensure "rake assets…

    …:precompile" picks them up.
    authored

Mar 12, 2012

  1. Matthew Beale

    Build js for #180

    mixonic authored
  2. Matthew Beale

    Build js files for #180

    mixonic authored
  3. Matthew Beale

    Merge branch 'jejacks0n-master'

    mixonic authored
  4. Merge pull request #180 from nreckart/pr/panel-handle-span

    Correctly close the span element in the panel h1.
    Matthew Beale authored
  5. Matthew Beale

    Merge save_failed trigger

    mixonic authored
  6. Matthew Beale

    Add save_failed trigger

    mixonic authored
  7. Nathan Reckart

    Correctly close the span element in the panel h1.

    nreckart authored
  8. Matthew Beale

    Merge jejacks0n-master in to master

    mixonic authored
  9. Jeremy Jackson

    building distro.

    jejacks0n authored
  10. Jeremy Jackson

    fixed broken panel specs (the addition of the span in panel title)

    jejacks0n authored
  11. Jeremy Jackson

    adjustments to gemspec.

    jejacks0n authored
  12. Jeremy Jackson

    changed .apply to .call -- fixes #175

    jejacks0n authored
  13. Jeremy Jackson

    resolved saveURL to saveUrl everywhere (including docs), and fixed an…

    … bug with the saveDataType addition.
    jejacks0n authored
  14. Jeremy Jackson

    Merge pull request #170 from aceofspades/save_data_type_null

    Allow PageEditor to leave dataType set to null for auto-handling
    jejacks0n authored
Something went wrong with that request. Please try again.