Merging with upstream! :D

2025-08-10 00:27:45 +02:00 · 2013-10-09 17:29:56 -05:00
parent ad712f0b07
commit 6e56832e9b
60 changed files with 0 additions and 0 deletions
--- a/cron.php
+++ b/cron.php
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
--- a/e107_core/bbcodes/spoiler.bb
+++ b/e107_core/bbcodes/spoiler.bb
--- a/e107_core/bbcodes/stream.bb
+++ b/e107_core/bbcodes/stream.bb
--- a/e107_core/shortcodes/batch/signup_shortcodes.php
+++ b/e107_core/shortcodes/batch/signup_shortcodes.php
--- a/e107_core/shortcodes/batch/usersettings_shortcodes.php
+++ b/e107_core/shortcodes/batch/usersettings_shortcodes.php
--- a/e107_core/shortcodes/single/breadcrumb.sc
+++ b/e107_core/shortcodes/single/breadcrumb.sc
--- a/e107_core/shortcodes/single/extended.sc
+++ b/e107_core/shortcodes/single/extended.sc
--- a/e107_core/shortcodes/single/url.sc
+++ b/e107_core/shortcodes/single/url.sc
--- a/e107_core/templates/membersonly_template.php
+++ b/e107_core/templates/membersonly_template.php
--- a/e107_core/templates/signup_template.php
+++ b/e107_core/templates/signup_template.php
--- a/e107_core/templates/usersettings_template.php
+++ b/e107_core/templates/usersettings_template.php
--- a/e107_handlers/e107Url.php
+++ b/e107_handlers/e107Url.php
--- a/e107_handlers/online_class.php
+++ b/e107_handlers/online_class.php
--- a/e107_languages/English/admin/lan_users_extended.php
+++ b/e107_languages/English/admin/lan_users_extended.php
--- a/e107_plugins/alt_auth/alt_auth_adminmenu.php
+++ b/e107_plugins/alt_auth/alt_auth_adminmenu.php
--- a/e107_plugins/alt_auth/alt_auth_conf.php
+++ b/e107_plugins/alt_auth/alt_auth_conf.php
--- a/e107_plugins/alt_auth/alt_auth_login_class.php
+++ b/e107_plugins/alt_auth/alt_auth_login_class.php
--- a/e107_plugins/alt_auth/ldap_auth.php
+++ b/e107_plugins/alt_auth/ldap_auth.php
--- a/e107_plugins/alt_auth/ldap_conf.php
+++ b/e107_plugins/alt_auth/ldap_conf.php
--- a/e107_plugins/download/plugin.xml
+++ b/e107_plugins/download/plugin.xml
--- a/e107_plugins/forum/attachments/index.htm
+++ b/e107_plugins/forum/attachments/index.htm
--- a/e107_plugins/forum/attachments/thumb/index.htm
+++ b/e107_plugins/forum/attachments/thumb/index.htm
--- a/e107_plugins/forum/e_admin_events.php
+++ b/e107_plugins/forum/e_admin_events.php
--- a/e107_plugins/forum/e_emailprint.php
+++ b/e107_plugins/forum/e_emailprint.php
--- a/e107_plugins/forum/images/dark/attach.png
+++ b/e107_plugins/forum/images/dark/attach.png
--- a/e107_plugins/forum/images/dark/track.png
+++ b/e107_plugins/forum/images/dark/track.png
--- a/e107_plugins/forum/images/dark/untrack.png
+++ b/e107_plugins/forum/images/dark/untrack.png
--- a/e107_plugins/forum/images/lite/attach.png
+++ b/e107_plugins/forum/images/lite/attach.png
--- a/e107_plugins/forum/images/lite/track.png
+++ b/e107_plugins/forum/images/lite/track.png
--- a/e107_plugins/forum/images/lite/untrack.png
+++ b/e107_plugins/forum/images/lite/untrack.png
--- a/e107_plugins/forum/images/sub_forums_16.png
+++ b/e107_plugins/forum/images/sub_forums_16.png
--- a/e107_plugins/forum/languages/English/lan_newforumposts_menu.php
+++ b/e107_plugins/forum/languages/English/lan_newforumposts_menu.php
--- a/e107_plugins/forum/newforumposts_menu.php
+++ b/e107_plugins/forum/newforumposts_menu.php
--- a/e107_plugins/forum/newforumposts_menu_config.php
+++ b/e107_plugins/forum/newforumposts_menu_config.php
--- a/e107_plugins/forum/plugin.xml
+++ b/e107_plugins/forum/plugin.xml
--- a/e107_plugins/linkwords/e_tohtml.php
+++ b/e107_plugins/linkwords/e_tohtml.php
--- a/e107_plugins/login_menu/login_menu_shortcodes.php
+++ b/e107_plugins/login_menu/login_menu_shortcodes.php
--- a/e107_plugins/pm/images/attach.png
+++ b/e107_plugins/pm/images/attach.png
--- a/e107_plugins/pm/images/mail_get.png
+++ b/e107_plugins/pm/images/mail_get.png
--- a/e107_plugins/pm/images/mail_send.png
+++ b/e107_plugins/pm/images/mail_send.png
--- a/e107_plugins/pm/images/newpm.gif
+++ b/e107_plugins/pm/images/newpm.gif
--- a/e107_plugins/pm/images/pm.png
+++ b/e107_plugins/pm/images/pm.png
--- a/e107_plugins/pm/images/pvt_message_16.png
+++ b/e107_plugins/pm/images/pvt_message_16.png
--- a/e107_plugins/pm/images/pvt_message_32.png
+++ b/e107_plugins/pm/images/pvt_message_32.png
--- a/e107_plugins/pm/images/read.png
+++ b/e107_plugins/pm/images/read.png
--- a/e107_plugins/pm/images/unread.png
+++ b/e107_plugins/pm/images/unread.png
--- a/e107_plugins/pm/languages/English.php
+++ b/e107_plugins/pm/languages/English.php
--- a/e107_plugins/pm/languages/English_admin_pm.php
+++ b/e107_plugins/pm/languages/English_admin_pm.php
--- a/e107_plugins/pm/plugin.xml
+++ b/e107_plugins/pm/plugin.xml
--- a/e107_plugins/pm/pm.php
+++ b/e107_plugins/pm/pm.php
--- a/e107_plugins/pm/pm_class.php
+++ b/e107_plugins/pm/pm_class.php
--- a/e107_plugins/pm/pm_conf.php
+++ b/e107_plugins/pm/pm_conf.php
--- a/e107_plugins/pm/pm_default.php
+++ b/e107_plugins/pm/pm_default.php
--- a/e107_plugins/pm/pm_func.php
+++ b/e107_plugins/pm/pm_func.php
--- a/e107_plugins/pm/pm_notes.txt
+++ b/e107_plugins/pm/pm_notes.txt
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
--- a/e107_plugins/pm/pm_sql.php
+++ b/e107_plugins/pm/pm_sql.php
--- a/e107_plugins/pm/pm_template.php
+++ b/e107_plugins/pm/pm_template.php
--- a/e107_plugins/pm/private_msg_menu.php
+++ b/e107_plugins/pm/private_msg_menu.php