githubFork/roundcubemail.git

Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-09-05 ba3cd80c0c61e679cef92a1f4f51e645090a1472

refs
author	Thomas Bruederli <thomas@roundcube.net>
	Wednesday, September 5, 2012 10:17 -0400
committer	Thomas Bruederli <thomas@roundcube.net>
	Wednesday, September 5, 2012 10:17 -0400
commit	ba3cd80c0c61e679cef92a1f4f51e645090a1472
tree	4bd7c352dade0d18c19f25d65b04a5b896813918 tree \| zip \| gz
parent	957ac142e3c80db3b86df4f0db3b82cfa8856206 view \| diff e263994adc3f8f331c6167da1665c1920a5142f9 view \| diff

Merge branch 'master' of github.com:roundcube/roundcubemail

2 files renamed

17 files deleted

41 files added

61 files modified

	CHANGELOG	51 ●●●●● diff \| view \| raw \| blame \| history
	config/main.inc.php.dist	25 ●●●●● diff \| view \| raw \| blame \| history
	installer/rcube_install.php	11 ●●●●● diff \| view \| raw \| blame \| history
	plugins/acl/acl.php	3 ●●●●● diff \| view \| raw \| blame \| history
	plugins/acl/skins/larry/acl.css	4 ●●●●● diff \| view \| raw \| blame \| history
	plugins/acl/skins/larry/templates/table.html	8 ●●●●● diff \| view \| raw \| blame \| history
	plugins/hide_blockquote/hide_blockquote.php	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/hide_blockquote/skins/larry/style.css	diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/Makefile	7 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/Parser.php	54 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/Tokenizer.php	33 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parser.phpt	120 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parser_body.phpt	49 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parser_imapflags.phpt	28 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parser_include.phpt	30 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parser_kep14.phpt	19 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parser_prefix.phpt	25 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parser_relational.phpt	25 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parser_vacation.phpt	39 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parser_variables.phpt	39 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/parset_subaddress.phpt	38 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser	52 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser.out	52 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_body	17 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_imapflags	7 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_include	7 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_kep14	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_kep14.out	3 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_prefix	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_relational	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_subaddress	11 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_vacation	12 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/src/parser_variables	12 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/tests/tokenize.phpt	66 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/drivers/virtualmin.php	4 ●●●●● diff \| view \| raw \| blame \| history
	plugins/virtuser_query/virtuser_query.php	5 ●●●●● diff \| view \| raw \| blame \| history
	program/include/html.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail.php	35 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube.php	1485 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_bc.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_browser.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_charset.php	6 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_config.php	1 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_imap.php	4 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_imap_cache.php	52 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_imap_generic.php	5 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_ldap.php	5 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_message.php	28 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_mime.php	4 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_output_html.php	36 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_plugin.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_shared.inc	33 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_storage.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_utils.php	61 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_vcard.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/js/app.js	152 ●●●●● diff \| view \| raw \| blame \| history
	program/js/common.js	7 ●●●●● diff \| view \| raw \| blame \| history
	program/js/googiespell.js	4 ●●●●● diff \| view \| raw \| blame \| history
	program/js/list.js	4 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/en_US/labels.inc	13 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/pl_PL/labels.inc	1 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/export.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/compose.inc	53 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/func.inc	17 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/headers.inc	3 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/folders.inc	12 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/func.inc	16 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/save_folder.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/save_prefs.inc	4 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/functions.js	15 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/includes/links.html	1 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/splitter.js	4 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/compose.html	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/message.html	15 ●●●●● diff \| view \| raw \| blame \| history
	skins/classic/templates/messageerror.html	15 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/addressbook.css	1 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/ie7hacks.css	16 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/iehacks.css	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/images/contactpic_32px.png	diff \| view \| raw \| blame \| history
	skins/larry/images/contactpic_48px.png	diff \| view \| raw \| blame \| history
	skins/larry/includes/links.html	1 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/mail.css	90 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/styles.css	6 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/svggradient.php	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/svggradients.css	2 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/message.html	63 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/messageerror.html	10 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/templates/messagepreview.html	5 ●●●●● diff \| view \| raw \| blame \| history
	skins/larry/ui.js	62 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/BaseReplacer.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Browser.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Cache.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Charset.php	28 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/ContentFilter.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Html.php	46 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Image.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Imap.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/ImapGeneric.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/MessageHeader.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/MessagePart.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Mime.php	123 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Rcube.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/ResultIndex.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/ResultSet.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/ResultThread.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Shared.php	204 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Smtp.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Spellchecker.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/StringReplacer.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/User.php	20 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Utils.php	196 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/VCard.php	59 ●●●●● diff \| view \| raw \| blame \| history
	tests/HtmlToText.php	32 ●●●●● diff \| view \| raw \| blame \| history
	tests/MailFunc.php	172 ●●●●● diff \| view \| raw \| blame \| history
	tests/bootstrap.php	35 ●●●●● diff \| view \| raw \| blame \| history
	tests/maildecode.php	130 ●●●●● diff \| view \| raw \| blame \| history
	tests/mailfunc.php	173 ●●●●● diff \| view \| raw \| blame \| history
	tests/modcss.php	45 ●●●●● diff \| view \| raw \| blame \| history
	tests/phpunit.xml	37 ●●●●● diff \| view \| raw \| blame \| history
	tests/runtests.sh	54 ●●●●● diff \| view \| raw \| blame \| history
	tests/vcards.php	65 ●●●●● diff \| view \| raw \| blame \| history