githubFork/roundcubemail.git

Roundcubemail devel

- Merge devel-framework branch, resolved conflicts

alecpl

2012-04-13 0c259682f65eaaf23ea4ccb56a706d6baf3007e4

refs
author	alecpl <alec@alec.pl>
	Friday, April 13, 2012 04:52 -0400
committer	alecpl <alec@alec.pl>
	Friday, April 13, 2012 04:52 -0400
commit	0c259682f65eaaf23ea4ccb56a706d6baf3007e4
tree	f1491f39189c8a970e7612b9dcc20f9409d7361e tree \| zip \| gz
parent	ce64332e7a9bf2468eabdb4b789270aebb3e7dc7 view \| diff

- Merge devel-framework branch, resolved conflicts

6 files added

36 files modified

2 files renamed

2 files deleted

	CHANGELOG	11 ●●●●● diff \| view \| raw \| blame \| history
	bin/msgexport.sh	2 ●●●●● diff \| view \| raw \| blame \| history
	index.php	27 ●●●●● diff \| view \| raw \| blame \| history
	installer/index.php	2 ●●●●● diff \| view \| raw \| blame \| history
	installer/utils.php	16 ●●●●● diff \| view \| raw \| blame \| history
	program/include/clisetup.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/include/html.php	66 ●●●●● diff \| view \| raw \| blame \| history
	program/include/iniset.php	60 ●●●●● diff \| view \| raw \| blame \| history
	program/include/main.inc	2114 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail.php	1247 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube.php	1226 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_addressbook.php	7 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_base_replacer.php	110 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_cache.php	14 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_config.php	14 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_contacts.php	42 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_html_page.php	323 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_imap.php	53 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_imap_cache.php	69 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_imap_generic.php	49 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_ldap.php	32 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_mdb2.php	345 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_message.php	18 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_message_header.php	238 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_message_part.php	103 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_output.php	259 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_output_html.php	646 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_output_json.php	99 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_plugin.php	16 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_plugin_api.php	83 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_session.php	21 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_shared.inc	654 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_smtp.php	6 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_spellchecker.php	20 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_sqlite.inc	79 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_storage.php	92 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_string_replacer.php	6 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_ui.php	1468 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_user.php	36 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcube_vcard.php	6 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/func.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/compose.inc	16 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/func.inc	25 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/get.inc	25 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/show.inc	28 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/utils/error.inc	15 ●●●●● diff \| view \| raw \| blame \| history