BK-936 Aloha plugin to increase/decrease indent #47

Closed
wants to merge 38 commits into
from

Conversation

Projects
None yet
3 participants
@japina
Contributor

japina commented Nov 26, 2013

I don't know why styling-plugin is in the file list: only aloha_menu.html and aloha_header.html were changed and indent-plugin.js added.

japina and others added some commits Oct 17, 2013

Merge remote-tracking branch 'sf_booktype/2.0' into 2.0
Conflicts:
	lib/booktype/apps/edit/channel.py
	lib/booktype/apps/edit/static/edit/js/aloha/plugins/booktype/wcount/lib/wcount-plugin.js
	lib/booktype/apps/edit/templates/edit/panel_aloha.html
Merge remote-tracking branch 'sf_booktype/2.0' into 2.0
Conflicts:
	lib/booktype/apps/edit/static/edit/js/aloha/plugins/booktype/indent/lib/indent-plugin.js

@japina japina closed this Apr 25, 2014

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