Permalink
Commits on Dec 14, 2011
  1. Merge pull request #32 from liip/overlayPadding

    Resize overlay background
    bergie committed Dec 14, 2011
Commits on Dec 12, 2011
  1. Added resizeOverlay

    Background overlay needs to be resize when content is modified
    fabian committed Dec 12, 2011
Commits on Dec 10, 2011
  1. Merge pull request #31 from liip/overlayPadding

    Use custom <div> with padding instead of overriding the background-color
    bergie committed Dec 10, 2011
Commits on Dec 9, 2011
  1. Fixed bug with outline-offset

    fabian committed Dec 9, 2011
Commits on Dec 8, 2011
  1. Merge pull request #30 from liip/toolbarPosition

    Pass missing event
    bergie committed Dec 8, 2011
  2. Merge pull request #29 from liip/formatBlock

    Ignore all other formaBlocks, except P and H1-9
    bergie committed Dec 8, 2011
  3. Pass missing event

    fabian committed Dec 8, 2011
Commits on Nov 30, 2011
  1. Update JS files

    bergie committed Nov 30, 2011
Commits on Nov 23, 2011
  1. Merge pull request #28 from liip/hallolists

    Make hallolists configurable
    bergie committed Nov 23, 2011
Commits on Nov 22, 2011
  1. Merge pull request #27 from liip/formattings

    Use object instead of array for formattings
    bergie committed Nov 22, 2011
Commits on Nov 21, 2011
  1. Make hallolists configurable

    Ordered list has been removed by accident in 3f54849
    fabian committed Nov 21, 2011
  2. Use object instead of array for formattings

    jQuery UI has problems with array as default options. See also http://bugs.jqueryui.com/ticket/7718 (fixed in master of jQuery UI, but not released yet)
    fabian committed Nov 21, 2011
Commits on Nov 15, 2011
  1. Merge pull request #26 from rryter/master

    fixing toolbar shown in wrong place on keyboard selection
    bergie committed Nov 15, 2011
Commits on Nov 14, 2011
  1. Correct jQuery usage

    bergie committed Nov 14, 2011
  2. Correct jQuery usage

    bergie committed Nov 14, 2011
  3. Skip if there is no event

    bergie committed Nov 14, 2011
  4. Merge pull request #24 from liip/master

    Extending hallo
    bergie committed Nov 14, 2011
Commits on Nov 10, 2011
  1. Another fix from merging

    colinfrei committed Nov 10, 2011
  2. Bugfixing after merge

    colinfrei committed Nov 10, 2011
  3. Merge remote-tracking branch 'upstream/master'

    Conflicts:
    	examples/hallo.css
    	examples/hallo.js
    	examples/headings.js
    	examples/linkimg.js
    	hallo.coffee
    	plugins/headings.coffee
    	plugins/linkimg.coffee
    colinfrei committed Nov 10, 2011
Commits on Nov 4, 2011
  1. update image.js file

    Reto Ryter committed Nov 4, 2011
  2. fixing drag n drop behaviour

    Reto Ryter committed Nov 4, 2011
  3. Update JS file

    colinfrei committed Nov 4, 2011
Commits on Nov 3, 2011
  1. Placeholder support

    bergie committed Nov 3, 2011
Commits on Nov 2, 2011
  1. fix calculation of overlay to be executed after tmp object has been i…

    …nserted.
    Reto Ryter committed Nov 2, 2011
  2. Be aware only to select the contenteditable divs (there are also imag…

    …es which have contenteditable=false to avoid having resize handles on them)
    Sebastien Roch committed Nov 2, 2011
Commits on Nov 1, 2011
  1. Remove unnecessary debug

    bergie committed Nov 1, 2011
  2. Update examples

    bergie committed Nov 1, 2011