Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Changes in Dev #753

Closed
wants to merge 43 commits into from

7 participants

@Jotschi
Owner

No description provided.

izak and others added some commits
@izak izak restructuring so another plugin can extend undo. 8b71755
@izak izak Use hotkeys to attach to ctrl+z.
This works in most browsers. The old implementation failed because some
browsers can only detect ctrl+z on keyup, but the browser reacts to ctrl+z
on keydown and invokes native undo. jquery-hotkeys, used in aloha, has a
way of working around this, and shortens the code somewhat.
776266d
@izak izak Fix bug that only allowed one undo
A snapshot is only made if getSnapshotContent is called, so you need to call
it even if you don't use the returned value, otherwise the snapshot will be
stale the next time round.
12819a1
@izak izak whitespace gardening
Apply a tab throughout.
ea38a1f
@cprerovsky cprerovsky Merge branch 'dev-table-cell-alignment' of https://github.com/laktek/… 8f943e0
@cprerovsky cprerovsky merged lakshans table-cell-align improvements ce09d10
@cprerovsky cprerovsky merged laktek dev-table-cell-styles a30f8ca
@cprerovsky cprerovsky Merge branch 'dev-table-cell-styles' of https://github.com/laktek/Alo…
…ha-Editor into dev
fc7d9ef
@Jotschi Jotschi Made java maven jslint checks compliant with githook checks. Somehow …
…the nodejs jslint checks did not cover 'console' calls. Java jslint works better ;)
1c3c89c
Tobias Steiner Updates jqueryui to latest stable 4451bd3
Tobias Steiner Updates jquery.layout to newest version
Fixes jQuery 1.8 curCSS incompatibility.
42a2d66
Tobias Steiner Fixes 'you browser is not supported' error
With jQuery 1.8 this message would be logged into
the console. I don't know why. We support the latest
version of Chrome/Safari, so the browser.version < 20
should be correct.
f4bfd34
Tobias Steiner Fixes build error introduced by jquery-ui upgrade a535b62
Tobias Steiner Fixes build error introduced by jquery.layout upgrade e7e448a
Tobias Steiner Adds changelog for jquery-ui and jquery.layout upgrades 1592a21
Tobias Steiner Reverts accidental commit that breaks boilerplate demo a1dc12d
Tobias Steiner Final improvements to Ephemera API 40f99bc
Tobias Steiner Merge branch 'dev' of ssh://github.com/alohaeditor/Aloha-Editor into …
…dev-wikidocs

Conflicts:
	build/dev-changelog.md
1ae144f
Tobias Steiner Fixes jslint error 125b2b9
Tobias Steiner Fixes link-plugin remove class attribute value b9ed93b
Tobias Steiner Fixes the duplicate values in data-aloha-ephemera-attr attribute 82876ef
@evo42 evo42 updated img paths; fixes gh-764 31ff27a
@evo42 evo42 added changelog entry e96f641
@evo42 evo42 used hints from #749 to decrease icon file size d309b6a
@evo42 evo42 updated changelog ce07f25
@draftkraft draftkraft Added special keys comma and period 852294c
deliminator Merge pull request #782 from girigiri/dev-wikidocs
Added special keycodes for comma and period
f218d42
@wimleers wimleers Make editable-specific image plug-in configuration work again; based …
…on how it works in the link plug-in. Fixes #786.
eb88941
@wimleers wimleers s/Pre formated text/Preformatted text/. Fixes #789.m 18b03b4
@evo42 evo42 Merge pull request #790 from wimleers/dev-aloha-format-typo-fix
s/Pre formated text/Preformatted text/. Fixes #789.
f9b2a76
Tobias Steiner Revert "Make editable-specific image plug-in configuration work again…
…; based on how it works in the link plug-in. Fixes #786."

This reverts commit eb88941.
0fc437f
@Jotschi Jotschi Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into dev
Conflicts:
	build/dev-changelog.md
	src/plugins/common/ui/nls/i18n.js
e9a6e83
@Jotschi Jotschi Updated version b160643
@Jotschi Jotschi Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into dev 43a990c
@Jotschi
Owner

Clemens merge 8f943e0, a30f8ca was already applied for the release. Can someone explain why this is still listed? I already merged from release to dev (43a990c).

I want to release the dev branch. Any comments on that? Are there any known issues/problems that could affect the release?

@Jotschi Jotschi was assigned
@Jotschi
Owner

@evo42 Please try to keep your branch uptodate to avoid big merge commits and do not change the merge commit message. Would it be possible to revert those three merge commits?

@deliminator

To avoid merge commits do git rebase -i

Jotschi and others added some commits
@Jotschi Jotschi Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into dev
Conflicts:
	doc/guides/output/images/MultiSplitButton.png
	doc/guides/output/images/book_icon.gif
	doc/guides/output/images/chapters_icon.gif
	doc/guides/output/images/check_bullet.gif
	doc/guides/output/images/construction.png
	doc/guides/output/images/credits/haymo.jpg
	doc/guides/output/images/credits/hlubek.jpg
	doc/guides/output/images/credits/nka.jpg
	doc/guides/output/images/credits/rene_kapusta.jpg
	doc/guides/output/images/credits/skurfuerst.jpg
	doc/guides/output/images/credits_pic_blank.gif
	doc/guides/output/images/development_guide/Color-schema.png
	doc/guides/output/images/edge_badge.png
	doc/guides/output/images/editor_guide/Floatingmenu-multisplit.png
	doc/guides/output/images/editor_guide/Floatingmenu.png
	doc/guides/output/images/feature_tile.gif
	doc/guides/output/images/footer/facebook.png
	doc/guides/output/images/footer/google.png
	doc/guides/output/images/footer/html5_tech.png
	doc/guides/output/images/footer/logo.png
	doc/guides/output/images/footer/top.png
	doc/guides/output/images/footer/twitter.png
	doc/guides/output/images/footer_tile.gif
	doc/guides/output/images/grey_bullet.gif
	doc/guides/output/images/header/glow.png
	doc/guides/output/images/header/logo.png
	doc/guides/output/images/header/pixels.png
	doc/guides/output/images/header/search.png
	doc/guides/output/images/header_backdrop.png
	doc/guides/output/images/header_tile.gif
	doc/guides/output/images/icons/callouts/1.png
	doc/guides/output/images/icons/callouts/10.png
	doc/guides/output/images/icons/callouts/11.png
	doc/guides/output/images/icons/callouts/12.png
	doc/guides/output/images/icons/callouts/13.png
	doc/guides/output/images/icons/callouts/14.png
	doc/guides/output/images/icons/callouts/15.png
	doc/guides/output/images/icons/callouts/2.png
	doc/guides/output/images/icons/callouts/3.png
	doc/guides/output/images/icons/callouts/4.png
	doc/guides/output/images/icons/callouts/5.png
	doc/guides/output/images/icons/callouts/6.png
	doc/guides/output/images/icons/callouts/7.png
	doc/guides/output/images/icons/callouts/8.png
	doc/guides/output/images/icons/callouts/9.png
	doc/guides/output/images/icons/caution.png
	doc/guides/output/images/icons/example.png
	doc/guides/output/images/icons/home.png
	doc/guides/output/images/icons/important.png
	doc/guides/output/images/icons/next.png
	doc/guides/output/images/icons/note.png
	doc/guides/output/images/icons/prev.png
	doc/guides/output/images/icons/tip.png
	doc/guides/output/images/icons/up.png
	doc/guides/output/images/icons/warning.png
	doc/guides/output/images/nav_arrow.gif
	doc/guides/output/images/plugins/cite-01.png
	doc/guides/output/images/plugins/cite-02.png
	doc/guides/output/images/plugins/formatlesspaste-01.png
	doc/guides/output/images/plugins/formatlesspaste-02.png
	doc/guides/output/images/plugins/headerids-01.png
	doc/guides/output/images/plugins/linkbrowser-01.png
	doc/guides/output/images/plugins/metaview-01.png
	doc/guides/output/images/plugins/metaview-02.png
	doc/guides/output/images/plugins/numerated-headers-01.png
	doc/guides/output/images/plugins/numerated-headers-02.png
	doc/guides/output/images/plugins/wai-lang-add-annotation.png
	doc/guides/output/images/plugins/wai-lang-code.png
	doc/guides/output/images/plugins/wai-lang-select.png
	doc/guides/output/images/strobe/chapters.png
	doc/guides/output/images/strobe/check.png
	doc/guides/output/images/strobe/code.png
	doc/guides/output/images/strobe/containergradient.png
	doc/guides/output/images/strobe/contribute.png
	doc/guides/output/images/strobe/credits.png
	doc/guides/output/images/strobe/dude.png
	doc/guides/output/images/strobe/guide-button.png
	doc/guides/output/images/strobe/guidegradient.png
	doc/guides/output/images/strobe/guides.png
	doc/guides/output/images/strobe/notes.png
	doc/guides/output/images/strobe/paperandpencil.png
	doc/guides/output/images/strobe/pin.png
	doc/guides/output/images/strobe/sidebar-gradient.png
	doc/guides/output/images/strobe/starperson.png
	doc/guides/output/images/strobe/tab-code.png
	doc/guides/output/images/strobe/tab-notes.png
	doc/guides/output/images/strobe/tab-pin.png
	doc/guides/output/images/strobe/tab-warning.png
	doc/guides/output/images/strobe/warning.png
	doc/guides/output/images/tab_grey.gif
	doc/guides/output/images/tab_info.gif
	doc/guides/output/images/tab_note.gif
	doc/guides/output/images/tab_red.gif
	doc/guides/output/images/tab_yellow.gif
	doc/guides/output/images/tab_yellow.png
	doc/guides/output/images/toolbar.png
ae42ce4
Tobias Steiner Fixes metaKey + click doesn't follow link f6449aa
@Jotschi Jotschi Added contributing guidelines as described here: https://github.com/b… a391e9f
@Jotschi Jotschi Update CONTRIBUTING.md 089199b
@Jotschi Jotschi Update CONTRIBUTING.md
Fixed link to style guide
2b43801
@Jotschi Jotschi closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Oct 16, 2012
  1. @izak
  2. @izak

    Use hotkeys to attach to ctrl+z.

    izak authored
    This works in most browsers. The old implementation failed because some
    browsers can only detect ctrl+z on keyup, but the browser reacts to ctrl+z
    on keydown and invokes native undo. jquery-hotkeys, used in aloha, has a
    way of working around this, and shortens the code somewhat.
  3. @izak

    Fix bug that only allowed one undo

    izak authored
    A snapshot is only made if getSnapshotContent is called, so you need to call
    it even if you don't use the returned value, otherwise the snapshot will be
    stale the next time round.
  4. @izak

    whitespace gardening

    izak authored
    Apply a tab throughout.
  5. @cprerovsky
  6. @cprerovsky
  7. @cprerovsky
Commits on Oct 17, 2012
  1. @cprerovsky
  2. @Jotschi

    Made java maven jslint checks compliant with githook checks. Somehow …

    Jotschi authored
    …the nodejs jslint checks did not cover 'console' calls. Java jslint works better ;)
Commits on Oct 18, 2012
  1. Updates jqueryui to latest stable

    Tobias Steiner authored
  2. Updates jquery.layout to newest version

    Tobias Steiner authored
    Fixes jQuery 1.8 curCSS incompatibility.
  3. Fixes 'you browser is not supported' error

    Tobias Steiner authored
    With jQuery 1.8 this message would be logged into
    the console. I don't know why. We support the latest
    version of Chrome/Safari, so the browser.version < 20
    should be correct.
  4. Fixes build error introduced by jquery-ui upgrade

    Tobias Steiner authored
  5. Fixes build error introduced by jquery.layout upgrade

    Tobias Steiner authored
  6. Adds changelog for jquery-ui and jquery.layout upgrades

    Tobias Steiner authored
  7. Reverts accidental commit that breaks boilerplate demo

    Tobias Steiner authored
Commits on Oct 20, 2012
  1. Final improvements to Ephemera API

    Tobias Steiner authored
  2. Merge branch 'dev' of ssh://github.com/alohaeditor/Aloha-Editor into …

    Tobias Steiner authored
    …dev-wikidocs
    
    Conflicts:
    	build/dev-changelog.md
  3. Fixes jslint error

    Tobias Steiner authored
  4. Fixes link-plugin remove class attribute value

    Tobias Steiner authored
Commits on Oct 23, 2012
  1. @evo42

    updated img paths; fixes gh-764

    evo42 authored
  2. @evo42

    added changelog entry

    evo42 authored
  3. @evo42
  4. @evo42

    updated changelog

    evo42 authored
Commits on Oct 28, 2012
  1. @draftkraft
Commits on Oct 29, 2012
  1. Merge pull request #782 from girigiri/dev-wikidocs

    deliminator authored
    Added special keycodes for comma and period
  2. @wimleers

    Make editable-specific image plug-in configuration work again; based …

    wimleers authored
    …on how it works in the link plug-in. Fixes #786.
Commits on Oct 30, 2012
  1. @wimleers
  2. @evo42

    Merge pull request #790 from wimleers/dev-aloha-format-typo-fix

    evo42 authored
    s/Pre formated text/Preformatted text/. Fixes #789.
Commits on Nov 2, 2012
  1. Revert "Make editable-specific image plug-in configuration work again…

    Tobias Steiner authored
    …; based on how it works in the link plug-in. Fixes #786."
    
    This reverts commit eb88941.
Commits on Nov 7, 2012
  1. @Jotschi

    Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into dev

    Jotschi authored
    Conflicts:
    	build/dev-changelog.md
    	src/plugins/common/ui/nls/i18n.js
  2. @Jotschi

    Updated version

    Jotschi authored
  3. @Jotschi
  4. @evo42

    merged upstream

    evo42 authored
  5. @evo42

    merged upstream

    evo42 authored
  6. @evo42

    merged upstream

    evo42 authored
  7. Merge branch 'dev-better-icons' of ssh://github.com/evo42/Aloha-Edito…

    Tobias Steiner authored
    …r into dev
    
    Conflicts:
    	build/dev-changelog.md
Commits on Nov 14, 2012
  1. @Jotschi

    Merge branch 'hotfix' of github.com:alohaeditor/Aloha-Editor into dev

    Jotschi authored
    Conflicts:
    	doc/guides/output/images/MultiSplitButton.png
    	doc/guides/output/images/book_icon.gif
    	doc/guides/output/images/chapters_icon.gif
    	doc/guides/output/images/check_bullet.gif
    	doc/guides/output/images/construction.png
    	doc/guides/output/images/credits/haymo.jpg
    	doc/guides/output/images/credits/hlubek.jpg
    	doc/guides/output/images/credits/nka.jpg
    	doc/guides/output/images/credits/rene_kapusta.jpg
    	doc/guides/output/images/credits/skurfuerst.jpg
    	doc/guides/output/images/credits_pic_blank.gif
    	doc/guides/output/images/development_guide/Color-schema.png
    	doc/guides/output/images/edge_badge.png
    	doc/guides/output/images/editor_guide/Floatingmenu-multisplit.png
    	doc/guides/output/images/editor_guide/Floatingmenu.png
    	doc/guides/output/images/feature_tile.gif
    	doc/guides/output/images/footer/facebook.png
    	doc/guides/output/images/footer/google.png
    	doc/guides/output/images/footer/html5_tech.png
    	doc/guides/output/images/footer/logo.png
    	doc/guides/output/images/footer/top.png
    	doc/guides/output/images/footer/twitter.png
    	doc/guides/output/images/footer_tile.gif
    	doc/guides/output/images/grey_bullet.gif
    	doc/guides/output/images/header/glow.png
    	doc/guides/output/images/header/logo.png
    	doc/guides/output/images/header/pixels.png
    	doc/guides/output/images/header/search.png
    	doc/guides/output/images/header_backdrop.png
    	doc/guides/output/images/header_tile.gif
    	doc/guides/output/images/icons/callouts/1.png
    	doc/guides/output/images/icons/callouts/10.png
    	doc/guides/output/images/icons/callouts/11.png
    	doc/guides/output/images/icons/callouts/12.png
    	doc/guides/output/images/icons/callouts/13.png
    	doc/guides/output/images/icons/callouts/14.png
    	doc/guides/output/images/icons/callouts/15.png
    	doc/guides/output/images/icons/callouts/2.png
    	doc/guides/output/images/icons/callouts/3.png
    	doc/guides/output/images/icons/callouts/4.png
    	doc/guides/output/images/icons/callouts/5.png
    	doc/guides/output/images/icons/callouts/6.png
    	doc/guides/output/images/icons/callouts/7.png
    	doc/guides/output/images/icons/callouts/8.png
    	doc/guides/output/images/icons/callouts/9.png
    	doc/guides/output/images/icons/caution.png
    	doc/guides/output/images/icons/example.png
    	doc/guides/output/images/icons/home.png
    	doc/guides/output/images/icons/important.png
    	doc/guides/output/images/icons/next.png
    	doc/guides/output/images/icons/note.png
    	doc/guides/output/images/icons/prev.png
    	doc/guides/output/images/icons/tip.png
    	doc/guides/output/images/icons/up.png
    	doc/guides/output/images/icons/warning.png
    	doc/guides/output/images/nav_arrow.gif
    	doc/guides/output/images/plugins/cite-01.png
    	doc/guides/output/images/plugins/cite-02.png
    	doc/guides/output/images/plugins/formatlesspaste-01.png
    	doc/guides/output/images/plugins/formatlesspaste-02.png
    	doc/guides/output/images/plugins/headerids-01.png
    	doc/guides/output/images/plugins/linkbrowser-01.png
    	doc/guides/output/images/plugins/metaview-01.png
    	doc/guides/output/images/plugins/metaview-02.png
    	doc/guides/output/images/plugins/numerated-headers-01.png
    	doc/guides/output/images/plugins/numerated-headers-02.png
    	doc/guides/output/images/plugins/wai-lang-add-annotation.png
    	doc/guides/output/images/plugins/wai-lang-code.png
    	doc/guides/output/images/plugins/wai-lang-select.png
    	doc/guides/output/images/strobe/chapters.png
    	doc/guides/output/images/strobe/check.png
    	doc/guides/output/images/strobe/code.png
    	doc/guides/output/images/strobe/containergradient.png
    	doc/guides/output/images/strobe/contribute.png
    	doc/guides/output/images/strobe/credits.png
    	doc/guides/output/images/strobe/dude.png
    	doc/guides/output/images/strobe/guide-button.png
    	doc/guides/output/images/strobe/guidegradient.png
    	doc/guides/output/images/strobe/guides.png
    	doc/guides/output/images/strobe/notes.png
    	doc/guides/output/images/strobe/paperandpencil.png
    	doc/guides/output/images/strobe/pin.png
    	doc/guides/output/images/strobe/sidebar-gradient.png
    	doc/guides/output/images/strobe/starperson.png
    	doc/guides/output/images/strobe/tab-code.png
    	doc/guides/output/images/strobe/tab-notes.png
    	doc/guides/output/images/strobe/tab-pin.png
    	doc/guides/output/images/strobe/tab-warning.png
    	doc/guides/output/images/strobe/warning.png
    	doc/guides/output/images/tab_grey.gif
    	doc/guides/output/images/tab_info.gif
    	doc/guides/output/images/tab_note.gif
    	doc/guides/output/images/tab_red.gif
    	doc/guides/output/images/tab_yellow.gif
    	doc/guides/output/images/tab_yellow.png
    	doc/guides/output/images/toolbar.png
Commits on Nov 19, 2012
  1. Fixes metaKey + click doesn't follow link

    Tobias Steiner authored
Commits on Nov 21, 2012
  1. @Jotschi
  2. @Jotschi

    Update CONTRIBUTING.md

    Jotschi authored
  3. @Jotschi

    Update CONTRIBUTING.md

    Jotschi authored
    Fixed link to style guide
Something went wrong with that request. Please try again.