From: Roland Haeder Date: Mon, 3 Feb 2014 19:20:11 +0000 (+0100) Subject: Merge branch 'contrib' into 'master' X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=6297478ce1c3127044dbf1e72194c6ccee14f9ea;p=mailer.git Merge branch 'contrib' into 'master' Signed-off-by: Roland Häder Conflicts: .gitattributes .gitignore --- 6297478ce1c3127044dbf1e72194c6ccee14f9ea diff --cc .gitattributes index c0556d8ead,88339e7120..39b1aedccd --- a/.gitattributes +++ b/.gitattributes @@@ -1,45 -1,49 +1,93 @@@ * text=auto !eol -/autoreg_output.php svneol=native#text/plain -/autoreg_test.php -text svneol=unset#text/plain -/captcha-base.xcf -text svneol=unset#application/x-xcf -code_swarm/README -text -code_swarm/mailer.config -text -code_swarm/mailer.sh svneol=native#text/plain -/debug-lines.sh svneol=native#text/plain -ext-partner/earnstar-datenimport.pdf -text svneol=unset#application/pdf -/final-checker.sh svneol=native#text/plain -/get_Global.php -text svneol=unset#text/plain -ideas/000-README.txt svneol=native#text/plain -ideas/ext-affiliate.php svneol=native#text/plain -ideas/ext-club.php svneol=native#text/plain -ideas/ext-coupon.php svneol=native#text/plain -ideas/ext-digit.php svneol=native#text/plain -ideas/ext-engine.php svneol=native#text/plain -ideas/ext-refund.php svneol=native#text/plain -ideas/ext-shop.php svneol=native#text/plain -ideas/ext-shredder.php svneol=native#text/plain -ideas/ext-signup.php svneol=native#text/plain -ideas/ext_coupon.tpl svneol=native#text/plain -ideas/ext_signup.tpl svneol=native#text/plain -/install_svn.php svneol=native#text/plain -/interface_test.php -text svneol=unset#text/plain -/lint.sh svneol=native#text/plain -/merge-exp.sh svneol=native#text/plain -mt_konverter/AENDERUNGEN.txt svneol=native#text/plain -mt_konverter/INHALT.txt svneol=native#text/plain -mt_konverter/Lizenzdatei.txt svneol=native#text/plain -mt_konverter/mt_mxchange_converter.php svneol=native#text/plain -mt_konverter/readme_konverter.txt svneol=native#text/plain -/patch_core.sh svneol=native#text/plain -/prop-set.sh svneol=native#text/plain -/remove-deprecated.sh svneol=native#text/plain -/teaser.txt svneol=native#text/plain -/todo-builder.sh svneol=native#text/plain -updater/.cmds.sh svneol=native#text/plain -updater/.cms.sh svneol=native#text/plain -updater/.config.sh svneol=native#text/plain -updater/.cvs.sh svneol=native#text/plain -updater/.extensions.sh svneol=native#text/plain -updater/.ftp.sh svneol=native#text/plain -updater/.functions.sh svneol=native#text/plain -updater/.hp.sh svneol=native#text/plain -updater/.themes.sh svneol=native#text/plain -updater/LICENSE -text -updater/cvs-updater.sh svneol=native#text/plain -/validator.sh svneol=native#text/plain +application/.htaccess -text +application/mailer/.htaccess svneol=native#text/plain +application/mailer/class_ApplicationHelper.php svneol=native#text/plain +application/mailer/config.php svneol=native#text/plain +application/mailer/data.php svneol=native#text/plain +application/mailer/debug.php svneol=native#text/plain +application/mailer/exceptions.php svneol=native#text/plain +application/mailer/exceptions/.htaccess svneol=native#text/plain +application/mailer/init.php svneol=native#text/plain +application/mailer/interfaces/.htaccess svneol=native#text/plain +application/mailer/loader.php svneol=native#text/plain +application/mailer/main/.htaccess svneol=native#text/plain +application/mailer/main/menu/.htaccess svneol=native#text/plain +application/mailer/main/menu/class_MailerConfirmMenu.php svneol=native#text/plain +application/mailer/main/menu/class_MailerHomeMenu.php svneol=native#text/plain +application/mailer/main/menu/class_MailerLoginAreaMenu.php svneol=native#text/plain +application/mailer/main/menu/class_MailerLoginFailedMenu.php svneol=native#text/plain +application/mailer/main/menu/class_MailerLoginMenu.php svneol=native#text/plain +application/mailer/main/menu/class_MailerLogoutMenu.php svneol=native#text/plain +application/mailer/main/menu/class_MailerRegisterMenu.php svneol=native#text/plain +application/mailer/main/menu/class_MailerStatusMenu.php svneol=native#text/plain +application/mailer/starter.php svneol=native#text/plain +application/mailer/templates/.htaccess svneol=native#text/plain +application/mailer/templates/de/.htaccess svneol=native#text/plain +application/mailer/templates/de/code/.htaccess svneol=native#text/plain +application/mailer/templates/de/code/emergency_exit.ctp svneol=native#text/plain +application/mailer/templates/de/code/footer.ctp svneol=native#text/plain +application/mailer/templates/de/code/footer_msg.ctp svneol=native#text/plain +application/mailer/templates/de/code/header.ctp svneol=native#text/plain +application/mailer/templates/de/code/home.ctp svneol=native#text/plain +application/mailer/templates/de/code/mailer_main.ctp svneol=native#text/plain +application/mailer/templates/de/menu/.htaccess svneol=native#text/plain +application/mailer/templates/de/menu/base_menu.xml svneol=native#text/plain +application/mailer/templates/de/menu/generic_menu_entries.xml svneol=native#text/plain ++contrib/autoreg_output.php svneol=native#text/plain ++contrib/autoreg_test.php -text svneol=unset#text/plain ++contrib/captcha-base.xcf -text svneol=unset#application/x-xcf ++contrib/code_swarm/README -text ++contrib/code_swarm/mailer.config -text ++contrib/code_swarm/mailer.sh svneol=native#text/plain ++contrib/debug-lines.sh svneol=native#text/plain ++contrib/ext-partner/earnstar-datenimport.pdf -text svneol=unset#application/pdf ++contrib/final-checker.sh svneol=native#text/plain ++contrib/get_Global.php -text svneol=unset#text/plain ++contrib/ideas/000-README.txt svneol=native#text/plain ++contrib/ideas/ext-affiliate.php svneol=native#text/plain ++contrib/ideas/ext-club.php svneol=native#text/plain ++contrib/ideas/ext-coupon.php svneol=native#text/plain ++contrib/ideas/ext-digit.php svneol=native#text/plain ++contrib/ideas/ext-engine.php svneol=native#text/plain ++contrib/ideas/ext-refund.php svneol=native#text/plain ++contrib/ideas/ext-shop.php svneol=native#text/plain ++contrib/ideas/ext-shredder.php svneol=native#text/plain ++contrib/ideas/ext-signup.php svneol=native#text/plain ++contrib/ideas/ext_coupon.tpl svneol=native#text/plain ++contrib/ideas/ext_signup.tpl svneol=native#text/plain ++contrib/install_svn.php svneol=native#text/plain ++contrib/interface_test.php -text svneol=unset#text/plain ++contrib/lint.sh svneol=native#text/plain ++contrib/merge-exp.sh svneol=native#text/plain ++contrib/mt_konverter/AENDERUNGEN.txt svneol=native#text/plain ++contrib/mt_konverter/INHALT.txt svneol=native#text/plain ++contrib/mt_konverter/Lizenzdatei.txt svneol=native#text/plain ++contrib/mt_konverter/mt_mxchange_converter.php svneol=native#text/plain ++contrib/mt_konverter/readme_konverter.txt svneol=native#text/plain ++contrib/patch_core.sh svneol=native#text/plain ++contrib/prop-set.sh svneol=native#text/plain ++contrib/remove-deprecated.sh svneol=native#text/plain ++contrib/teaser.txt svneol=native#text/plain ++contrib/todo-builder.sh svneol=native#text/plain ++contrib/updater/.cmds.sh svneol=native#text/plain ++contrib/updater/.cms.sh svneol=native#text/plain ++contrib/updater/.config.sh svneol=native#text/plain ++contrib/updater/.cvs.sh svneol=native#text/plain ++contrib/updater/.extensions.sh svneol=native#text/plain ++contrib/updater/.ftp.sh svneol=native#text/plain ++contrib/updater/.functions.sh svneol=native#text/plain ++contrib/updater/.hp.sh svneol=native#text/plain ++contrib/updater/.themes.sh svneol=native#text/plain ++contrib/updater/LICENSE -text ++contrib/updater/cvs-updater.sh svneol=native#text/plain ++contrib/validator.sh svneol=native#text/plain +db/.htaccess -text +db/news/.htaccess -text +docs/COPYING -text +docs/COPYING.documents -text +docs/COPYING.software -text +docs/NEWS -text +docs/README -text +docs/THANKS -text +docs/TODOs.txt -text svneol=unset#text/plain +/index.php svneol=native#text/plain diff --cc .gitignore index 5e4afd2d1a,5380179a56..fb5ab8be63 --- a/.gitignore +++ b/.gitignore @@@ -1,3 -1,1 +1,4 @@@ -/seitwert_www_mxchange_org.pdf +/.cache +/.project +/.settings ++contrib/seitwert_www_mxchange_org.pdf