githubFork/roundcubemail.git

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

Aleksander Machniak

2013-05-08 a522971cf853b2f0ccd1b569491a06218ebbaee9

refs
author	Aleksander Machniak <alec@alec.pl>
	Wednesday, May 8, 2013 08:28 -0400
committer	Aleksander Machniak <alec@alec.pl>
	Wednesday, May 8, 2013 08:28 -0400
commit	a522971cf853b2f0ccd1b569491a06218ebbaee9
tree	cf0e8c6bbe0978cf302b112080370b9a01cf5900 tree \| zip \| gz
parent	ea6d6958e0a32c88bf8c00cbd118cfcd48fae096 view \| diff c4723999e21da0b266b0467de6e58cbd26c4b5bf view \| diff

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

Conflicts:
	program/js/list.js

15 files added

67 files modified

	CHANGELOG	15 ●●●●● diff \| view \| raw \| blame \| history
	bin/updatecss.sh	122 ●●●●● diff \| view \| raw \| blame \| history
	config/main.inc.php.dist	3 ●●●●● diff \| view \| raw \| blame \| history
	installer/rcube_install.php	9 ●●●●● diff \| view \| raw \| blame \| history
	plugins/acl/acl.php	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/attachment_reminder.js	51 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/attachment_reminder.php	81 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/de_CH.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/de_DE.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/en_US.inc	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/es_ES.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/fr_FR.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/it_IT.inc	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/nl_NL.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/pl_PL.inc	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/zh_CN.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/localization/zh_TW.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/attachment_reminder/package.xml	66 ●●●●● diff \| view \| raw \| blame \| history
	plugins/autologon/autologon.php	4 ●●●●● diff \| view \| raw \| blame \| history
	plugins/debug_logger/runlog/runlog.php	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/enigma/enigma.php	9 ●●●●● diff \| view \| raw \| blame \| history
	plugins/enigma/lib/enigma_engine.php	34 ●●●●● diff \| view \| raw \| blame \| history
	plugins/enigma/lib/enigma_ui.php	5 ●●●●● diff \| view \| raw \| blame \| history
	plugins/help/help.php	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/lib/Roundcube/rcube_sieve_script.php	6 ●●●●● diff \| view \| raw \| blame \| history
	plugins/managesieve/managesieve.php	8 ●●●●● diff \| view \| raw \| blame \| history
	plugins/new_user_identity/new_user_identity.php	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/drivers/directadmin.php	1 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/drivers/pam.php	3 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/drivers/sql.php	7 ●●●●● diff \| view \| raw \| blame \| history
	plugins/password/drivers/xmail.php	4 ●●●●● diff \| view \| raw \| blame \| history
	plugins/squirrelmail_usercopy/squirrelmail_usercopy.php	2 ●●●●● diff \| view \| raw \| blame \| history
	plugins/vcard_attachments/vcard_attachments.php	3 ●●●●● diff \| view \| raw \| blame \| history
	plugins/zipdownload/zipdownload.php	4 ●●●●● diff \| view \| raw \| blame \| history
	program/include/bc.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail.php	30 ●●●●● diff \| view \| raw \| blame \| history
	program/include/rcmail_output_html.php	42 ●●●●● diff \| view \| raw \| blame \| history
	program/js/app.js	101 ●●●●● diff \| view \| raw \| blame \| history
	program/js/list.js	177 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/html.php	34 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_addressbook.php	26 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_contacts.php	36 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_csv2vcard.php	53 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_db.php	13 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_db_mysql.php	4 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_enriched.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_imap.php	9 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_imap_cache.php	4 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_imap_generic.php	18 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_ldap.php	74 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_message.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_mime.php	48 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_output.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_plugin_api.php	1 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_smtp.php	6 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_spellchecker.php	17 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_utils.php	2 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/Roundcube/rcube_vcard.php	27 ●●●●● diff \| view \| raw \| blame \| history
	program/lib/utf8.class.php	4 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/en_GB/labels.inc	1 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/en_US/csv2vcard.inc	17 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/en_US/labels.inc	1 ●●●●● diff \| view \| raw \| blame \| history
	program/localization/fr_FR/csv2vcard.inc	96 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/func.inc	7 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/import.inc	4 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/addressbook/show.inc	8 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/autocomplete.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/compose.inc	38 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/func.inc	57 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/mail/show.inc	4 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/edit_prefs.inc	2 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/folders.inc	3 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/func.inc	11 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/settings/save_prefs.inc	1 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/utils/spell.inc	7 ●●●●● diff \| view \| raw \| blame \| history
	program/steps/utils/spell_html.inc	5 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/Mime.php	4 ●●●●● diff \| view \| raw \| blame \| history
	tests/Framework/VCard.php	14 ●●●●● diff \| view \| raw \| blame \| history
	tests/src/Csv2vcard/tb_plain.csv	2 ●●●●● diff \| view \| raw \| blame \| history
	tests/src/Csv2vcard/tb_plain.vcf	2 ●●●●● diff \| view \| raw \| blame \| history
	tests/src/format-flowed-unfolded.txt	2 ●●●●● diff \| view \| raw \| blame \| history
	tests/src/format-flowed.txt	2 ●●●●● diff \| view \| raw \| blame \| history