Changes in Dev #753

Closed
wants to merge 43 commits into
from

Conversation

Projects
None yet
7 participants
@Jotschi
Member

Jotschi commented Oct 10, 2012

No description provided.

izak and others added some commits Oct 4, 2012

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.
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.
whitespace gardening
Apply a tab throughout.
Made java maven jslint checks compliant with githook checks. Somehow …
…the nodejs jslint checks did not cover 'console' calls. Java jslint works better ;)
Tobias Steiner
Updates jquery.layout to newest version
Fixes jQuery 1.8 curCSS incompatibility.
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.
Tobias Steiner
Merge branch 'dev' of ssh://github.com/alohaeditor/Aloha-Editor into …
…dev-wikidocs

Conflicts:
	build/dev-changelog.md
deliminator
Merge pull request #782 from girigiri/dev-wikidocs
Added special keycodes for comma and period
Merge pull request #790 from wimleers/dev-aloha-format-typo-fix
s/Pre formated text/Preformatted text/. Fixes #789.
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.
Merge branch 'release' of github.com:alohaeditor/Aloha-Editor into dev
Conflicts:
	build/dev-changelog.md
	src/plugins/common/ui/nls/i18n.js
@Jotschi

This comment has been minimized.

Show comment
Hide comment
@Jotschi

Jotschi Nov 7, 2012

Member

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?

Member

Jotschi commented Nov 7, 2012

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?

@ghost ghost assigned Jotschi Nov 7, 2012

@Jotschi

This comment has been minimized.

Show comment
Hide comment
@Jotschi

Jotschi Nov 8, 2012

Member

@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?

Member

Jotschi commented Nov 8, 2012

@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

This comment has been minimized.

Show comment
Hide comment
@deliminator

deliminator Nov 8, 2012

Contributor

To avoid merge commits do git rebase -i

Contributor

deliminator commented Nov 8, 2012

To avoid merge commits do git rebase -i

Jotschi and others added some commits Nov 14, 2012

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
Update CONTRIBUTING.md
Fixed link to style guide

@Jotschi Jotschi closed this Dec 17, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment