Permalink
Commits on Apr 3, 2012
Commits on Mar 18, 2012
  1. Merge pull request #186 from nreckart/pr/form-styles

    jejacks0n committed Mar 18, 2012
    Move form styles into their own file and namespace with .mercury-form.
  2. Merge pull request #182 from aceofspades/asset_precompile

    jejacks0n committed Mar 18, 2012
    Fix asset precompile
  3. Merge pull request #184 from mixonic/safari_uploads

    jejacks0n committed Mar 18, 2012
    Safari uploads, closes #37. Please help review.
Commits on Mar 16, 2012
Commits on Mar 15, 2012
  1. Update mercury js files

    mixonic committed Mar 15, 2012
  2. Use FormBuilder as a fallback from lacking support for FileReader and…

    mixonic committed Mar 15, 2012
    … multipart posts in Safari. Closes #37.
Commits on Mar 14, 2012
Commits on Mar 13, 2012
  1. Initialize for assets should have "group :all" to ensure "rake assets…

    aceofspades committed Mar 13, 2012
    …:precompile" picks them up.
Commits on Mar 12, 2012
  1. Build js for #180

    mixonic committed Mar 12, 2012
  2. Build js files for #180

    mixonic committed Mar 12, 2012
  3. Merge branch 'jejacks0n-master'

    mixonic committed Mar 12, 2012
  4. Merge pull request #180 from nreckart/pr/panel-handle-span

    Matthew Beale committed Mar 12, 2012
    Correctly close the span element in the panel h1.
  5. Merge save_failed trigger

    mixonic committed Mar 12, 2012
  6. Add save_failed trigger

    mixonic committed Mar 12, 2012
  7. building distro.

    jejacks0n committed Mar 12, 2012
  8. adjustments to gemspec.

    jejacks0n committed Mar 12, 2012
  9. resolved saveURL to saveUrl everywhere (including docs), and fixed an…

    jejacks0n committed Mar 12, 2012
    … bug with the saveDataType addition.
  10. Merge pull request #170 from aceofspades/save_data_type_null

    jejacks0n committed Mar 12, 2012
    Allow PageEditor to leave dataType set to null for auto-handling
  11. Merge pull request #158 from joelmoss/snippet_identity_count

    jejacks0n committed Mar 12, 2012
    Snippet identity name is now set correctly even when a snippet with same identity exists.
  12. Merge pull request #177 from nreckart/pr/panel-handle-span

    jejacks0n committed Mar 12, 2012
    Add a span element to the panel h1 to act as the draggable handle.
Commits on Mar 8, 2012
  1. Add a span element to the panel h1 to act as the draggable handle.

    nreckart committed Mar 8, 2012
    In some situations, making the entire h1 the draggable handle prevents the close link from being clicked. By adding an span element to the h1 and making it the draggable handle, the close link remains clickable.
Commits on Mar 5, 2012
  1. Rebuild the js files

    mixonic committed Mar 5, 2012
  2. Merge branch 'image_region'

    mixonic committed Mar 5, 2012