Nathaniel Guse 68363e362d Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103 ...

Conflicts:
	phpBB/install/schemas/mssql_schema.sql
	phpBB/report.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html

2012-11-10 10:58:44 -06:00

..

ajax.js

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-11-10 10:58:44 -06:00

attachment.html

[ticket/9948] Inline quicktime files won't show

2010-12-15 09:39:28 +01:00

bbcode.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

captcha_default.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

captcha_qa.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

captcha_recaptcha.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

confirm_body.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

custom_profile_fields.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

drafts.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

editor.js

[ticket/10731] Fixed addquote() to work on opera browser.

2012-04-01 17:05:31 +03:00

faq_body.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

forum_fn.js

[ticket/11008] Remove eval() calls to get document[id]

2012-07-21 00:12:37 +02:00

forumlist_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

index_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

index.htm

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

jumpbox.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

login_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

login_forum.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_approve.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_ban.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_footer.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

mcp_forum.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_front.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_header.html

[ticket/10734] Removed all the unnecessary corner classes

2012-04-02 16:15:55 +05:30

mcp_logs.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_message.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

mcp_move.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_notes_front.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_notes_user.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_post.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_queue.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_reports.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_topic.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_warn_front.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_warn_list.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_warn_post.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_warn_user.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

mcp_whois.html

[ticket/10734] Removed all the unnecessary corner classes

2012-04-02 16:15:55 +05:30

memberlist_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

memberlist_email.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

memberlist_im.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

memberlist_leaders.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

memberlist_search.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

memberlist_view.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

message_body.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

overall_footer.html

[ticket/11021] Fix the language changes that were lost previously

2012-09-15 11:28:58 -05:00

overall_header.html

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-11-10 10:58:44 -06:00

pagination.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

posting_attach_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

posting_body.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

posting_buttons.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

posting_editor.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

posting_layout.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

posting_pm_layout.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

posting_poll_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

posting_preview.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

posting_review.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

posting_smilies.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

posting_topic_review.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

quickreply_editor.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

report_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

search_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

search_results.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

simple_footer.html

[ticket/10783] Added assets_version to ACP and simple_*.html.

2012-04-11 14:37:15 +01:00

simple_header.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

timezone_option.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

timezone.js

[feature/new-tz-handling] Move js functions into assets core.js

2012-06-19 18:57:20 +02:00

ucp_agreement.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_attachments.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_avatar_options.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_footer.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

ucp_groups_manage.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_groups_membership.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_header.html

[ticket/10734] Removed all the unnecessary corner classes

2012-04-02 16:15:55 +05:30

ucp_main_bookmarks.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

ucp_main_drafts.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_main_front.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_main_subscribed.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

ucp_notifications.html

[ticket/11103] Message of no notifications if you have none

2012-10-20 19:19:26 -05:00

ucp_pm_history.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_pm_message_footer.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

ucp_pm_message_header.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_pm_options.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_pm_popup.html

[ticket/10734] Removed all the unnecessary corner classes

2012-04-02 16:15:55 +05:30

ucp_pm_viewfolder.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_pm_viewmessage_print.html

Merge branch 'develop-olympus' into develop

2012-10-06 06:15:01 +02:00

ucp_pm_viewmessage.html

[ticket/10780] Use L_COLON for "download all attachments".

2012-11-10 00:27:37 +01:00

ucp_prefs_personal.html

Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103

2012-11-10 10:58:44 -06:00

ucp_prefs_post.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_prefs_view.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_profile_autologin_keys.html

[feature/delete-auto-logins] fixes style

2012-05-17 14:08:50 +05:30

ucp_profile_avatar.html

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

ucp_profile_profile_info.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_profile_reg_details.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_profile_signature.html

[ticket/10734] Removed all the unnecessary corner classes

2012-04-02 16:15:55 +05:30

ucp_register.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_remind.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_resend.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_zebra_foes.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

ucp_zebra_friends.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

viewforum_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

viewonline_body.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00

viewonline_whois.html

[ticket/10734] Removed unwanted span classes

2012-04-02 00:42:11 +05:30

viewtopic_body.html

[ticket/10780] Use L_COLON for "download all attachments".

2012-11-10 00:27:37 +01:00

viewtopic_print.html

[ticket/10780] Replace colon usage in template output with {L_COLON}

2012-11-10 00:23:03 +01:00