githubFork/roundcubemail.git

Roundcubemail devel

Aleksander Machniak

2014-05-17 efc470f0ac7587707665e92701e3937c9b6cc78d

refs
author	Aleksander Machniak <alec@alec.pl>
	Saturday, May 17, 2014 03:27 -0400
committer	Aleksander Machniak <alec@alec.pl>
	Saturday, May 17, 2014 03:27 -0400
commit	efc470f0ac7587707665e92701e3937c9b6cc78d
tree	6674f2f57526f086e02755142f46901db74469c5 tree \| zip \| gz
parent	f1aaca6807742f7a890db152395d5c293b6e4e66 view \| diff c0a5aa5f5ff38ac7b8a650b07c134b7b86deb27f view \| diff

Merge branch 'dev-text2html'

Conflicts:
	program/js/app.js

Fix handling magic_quotes in rcube_text2html and rcube_html2text - move
stripslashes from these classes to action files

3 files added

15 files modified

	plugins/hide_blockquote/hide_blockquote.js	2 ●●●●● diff \| view \| raw \| blame \| history
	program/js/app.js	70 ●●●●● diff \| view \| raw \| blame \| history
	program/js/editor.js	2 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_html2text.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_mime.php	22 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_text2html.php	307 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/en_US/messages.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/compose.inc	12 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/func.inc	84 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/sendmail.inc	25 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/utils/html2text.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/utils/text2html.inc	33 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/editor_content.css	13 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/mail.css	11 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/editor_content.css	13 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/mail.css	11 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Text2Html.php	93 ●●●●● diff \| view \| raw \| blame \| history
	tests/phpunit.xml	1 ●●●●● diff \| view \| raw \| blame \| history