Permalink
Commits on Mar 2, 2012
  1. Merge pull request #173 from mixonic/another_sprockets_fix

    Another small Sprockets dependency fix
    jejacks0n committed Mar 2, 2012
  2. Sprockets split into sprockets and sprockets-helpers this winter, and…

    … Rails itself doesn't handle the new libraries well
    mixonic committed Mar 2, 2012
Commits on Mar 1, 2012
  1. Merge pull request #166 from mixonic/drop_gemfile_lock

    Drop Gemfile.lock
    jejacks0n committed Mar 1, 2012
  2. Merge pull request #169 from mixonic/gem_fixes

    Gem fixes
    jejacks0n committed Mar 1, 2012
  3. Merge pull request #171 from mixonic/drop_hotkeys_from_simple

    Drop hotkeys from the simple type, they will not work anyway.
    jejacks0n committed Mar 1, 2012
  4. Drop Gemfile.lock

    mixonic committed Mar 1, 2012
Commits on Feb 28, 2012
  1. Merge pull request #164 from KristianOellegaard/patch-1

    Update danish translation
    jejacks0n committed Feb 28, 2012
Commits on Feb 27, 2012
Commits on Feb 18, 2012
  1. Merge pull request #146 from mixonic/determineType

    Add determineType for programatically deciding what type a region is
    jejacks0n committed Feb 18, 2012
  2. Merge pull request #147 from mixonic/add_simple_region

    Add simple region
    jejacks0n committed Feb 18, 2012
Commits on Feb 8, 2012
  1. updated version… yeah

    jejacks0n committed Feb 8, 2012
  2. updating build

    jejacks0n committed Feb 8, 2012
  3. updated gems

    jejacks0n committed Feb 8, 2012
  4. bumped version -- 0.3.0

    jejacks0n committed Feb 8, 2012
Commits on Feb 3, 2012
  1. Merge pull request #153 from gmurphey/master

    Fixing bug where PageEditor doesn't check editorUrlRegEx in config correctly.
    jejacks0n committed Feb 3, 2012
Commits on Feb 1, 2012
  1. Add textAlign inherit

    mixonic committed Feb 1, 2012
Commits on Jan 29, 2012
  1. updated the layout a bit, and moved some configuration declarations a…

    …round (providing some weak documentation)
    jejacks0n committed Jan 29, 2012
  2. Merge pull request #140 from aceofspades/layout_config

    Layout and config
    jejacks0n committed Jan 29, 2012
  3. Merge pull request #141 from martinjlowm/master

    A redirection fix for users that are not permitted to edit content.
    jejacks0n committed Jan 29, 2012
  4. Merge pull request #139 from mixonic/more_dev_friendly_setup

    Move rvmrc to example file. Drop thin from dev dependencies, webrick good enough
    jejacks0n committed Jan 29, 2012
  5. Merge pull request #138 from shadowhand/bugfix/mercury-loader-visible…

    …-fix
    
    Fix visible setting for mercury_loader
    jejacks0n committed Jan 29, 2012
  6. Merge pull request #148 from mixonic/add_close_button_option_to_modals

    Add close button option to modals
    jejacks0n committed Jan 29, 2012
  7. Merge pull request #149 from dorajistyle/master

    Added Korean locale.
    jejacks0n committed Jan 29, 2012
  8. Merge pull request #150 from eMxyzptlk/use_table_name

    set_table_name has been deprecated in favor of self.table_name= as of Rails 3.2 (commit 0b72a04)
    jejacks0n committed Jan 29, 2012