Permalink
Commits on May 8, 2012
  1. Merge pull request #534 from evo42/dev-merge-hotfix

    happy testing :-)
    evo42 committed May 8, 2012
  2. Merge pull request #533 from evo42/hotfix-sidebar

    Hotfix sidebar
    evo42 committed May 8, 2012
  3. updated readme

    evo42 committed May 8, 2012
  4. cherry pick #523 alohaeditor#523

    cprerovsky committed with evo42 Apr 19, 2012
  5. Merge pull request #532 from evo42/hotfix-ie7-fixes

    IE7 fixes
    deliminator committed May 8, 2012
  6. removed debugging code

    evo42 committed May 8, 2012
  7. changelog entry

    evo42 committed May 8, 2012
  8. pull upstream

    evo42 committed May 8, 2012
  9. IE7 debugging...

    evo42 committed May 8, 2012
Commits on May 7, 2012
  1. Adding sandbox.html into tests.

    Petro Salema committed May 7, 2012
  2. Updating documentation of sourceview plugin.

    Petro Salema committed May 7, 2012
  3. Merge branch 'dev-sourceview-plugin' of github.com:petro065/Aloha-Edi…

    …tor into hotfix
    Petro Salema committed May 7, 2012
Commits on Apr 27, 2012
  1. Merge pull request #527 from Jotschi/hotfix

    Changed browser plugin browser width behaviour
    deliminator committed Apr 27, 2012
  2. Removed old css that were not enabled. Changed onWindowResized to a p…

    …rivate method. Added css workaround to _onWindowResized method.
    Jotschi committed Apr 27, 2012
  3. The browser plugin can now adjust the width of the browser automatica…

    …lly. Previous the width was fixed at a given value.
    Jotschi committed Apr 27, 2012
Commits on Apr 26, 2012
  1. merge upstream

    evo42 committed Apr 26, 2012
  2. some bugfixes... #517 #516 #515; also removed layerX and layerY from …

    …jQuery (webkit messages) #381 #419; added window. to setTimeouts
    evo42 committed Apr 26, 2012
Commits on Apr 24, 2012
  1. Merge pull request #526 from Jotschi/hotfix

    Browser.js javascript error fix
    deliminator committed Apr 24, 2012
Commits on Apr 19, 2012
  1. Merge pull request #521 from berni2288/hotfix-createcontextualfragment

    Rebuilt aloha.js to the reflect the recent changes
    Jotschi committed Apr 19, 2012
  2. fixes #497 (changeMarkup/addMarkup disappeared somehow after merge; t…

    …he same with hotkey functionality)
    evo42 committed Apr 19, 2012
Commits on Apr 17, 2012
  1. Post release cleanup

    GenticsDev committed Apr 17, 2012
  2. Preparing maven release

    GenticsDev committed Apr 17, 2012
  3. Merge pull request #512 from berni2288/hotfix-createcontextualfragment

    core: Fixed a typo in the previous bugfix: Fixed a javascript error in IE9 stating that the method createContextualFragment doesn't exist
    Jotschi committed Apr 17, 2012
  4. core: Fixed a typo in the previous bugfix: Fixed a javascript error i…

    …n IE9 stating that the method createContextualFragment doesn't exist
    berni2288 committed Apr 17, 2012
Commits on Apr 16, 2012
  1. Post release cleanup

    GenticsDev committed Apr 16, 2012
  2. Preparing maven release

    GenticsDev committed Apr 16, 2012