Marc Alexander c56db535b4 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars ...

Conflicts:
	phpBB/config/services.yml

2013-02-07 00:07:59 +01:00

..

attachment.html

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

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

avatars.js

[feature/avatars] Change avatar javascript to conform to new coding guidelines

2013-01-04 18:13:49 +01:00

bbcode.html

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

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

breadcrumbs.html

[feature/events] Fix some subsilver2 events

2012-12-17 11:57:18 -05: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/9556] Drop php closing tags, add trailing newline

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

custom_profile_fields.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

Merge branch 'develop-olympus' into develop

2011-12-25 00:58:11 +01:00

forumlist_body.html

[feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)

2012-12-17 17:59:41 -05:00

index_body.html

[feature/events] Fix some subsilver2 events

2012-12-17 11:57:18 -05:00

index.htm

ahhh, there are you. I can see a new haircut... looks good.

2007-04-01 22:46:14 +00:00

jumpbox.html

[ticket/11095] Forward GET parameters into hidden fields for jumpbox.

2012-11-29 13:36:00 -05: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/11014] Fix IF statements for new template pagination

2012-10-17 23:34:37 +02: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/10641] Update MCP template with new plurality forms

2012-02-11 01:40:01 -06:00

mcp_header.html

#i62 - #i65

2007-09-22 18:31:50 +00:00

mcp_jumpbox.html

[ticket/11095] Forward GET parameters into hidden fields for jumpbox.

2012-11-29 13:36:00 -05:00

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

Merge remote-tracking branch 'erikfrerejean/ticket/10312' into develop

2011-08-16 18:36:22 +02: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/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +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/9556] Drop php closing tags, add trailing newline

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

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/9556] Drop php closing tags, add trailing newline

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

memberlist_group.html

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

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

memberlist_im.html

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

memberlist_leaders.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03:00

memberlist_search.html

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

memberlist_view.html

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

message_body.html

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

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

overall_footer.html

[ticket/11311] Include asset core.js in subsilver2 overall_footer.html

2013-01-05 11:42:58 +01:00

overall_header.html

[feature/events] Fix some subsilver2 events

2012-12-17 11:57:18 -05:00

pagination.html

[ticket/11014] Fix text for previous/next links in Subsilver2

2012-10-17 23:34:37 +02:00

posting_attach_body.html

#i62 - #i65

2007-09-22 18:31:50 +00:00

posting_body.html

[feature/events] Fix more subsilver2 events

2012-12-17 11:59:23 -05:00

posting_buttons.html

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

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

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_progress_bar.html

#i62 - #i65

2007-09-22 18:31:50 +00:00

posting_review.html

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

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

posting_smilies.html

[ticket/10968] Render pagination within the template

2012-07-18 14:30:20 +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

searchbox.html

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

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

simple_footer.html

[feature/events] Fix more subsilver2 events

2012-12-17 11:59:23 -05:00

simple_header.html

[feature/remove-imagesets] Changing subsilver

2011-09-04 11:05:10 +03: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

[ticket/10949] Converted missing code to new JS coding guidelines

2013-01-04 22:46:12 +01: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_gravatar.html

[feature/avatars] Remove unnecessary abbreviations

2012-11-25 00:54:34 +01:00

ucp_avatar_options_local.html

[feature/avatars] Inform user of no available local avatars

2013-01-04 10:25:08 +01:00

ucp_avatar_options_remote.html

[feature/avatars] Remove unnecessary abbreviations

2012-11-25 00:54:34 +01:00

ucp_avatar_options_upload.html

[feature/avatars] Remove unnecessary abbreviations

2012-11-25 00:54:34 +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

[feature/avatars] Remove unnecessary abbreviations

2012-11-25 00:54:34 +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/10780] Replace colon usage in template output with {L_COLON}

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

ucp_main_bookmarks.html

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

2012-11-10 00:23:03 +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

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

2012-11-10 00:23:03 +01: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

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

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

ucp_pm_message_header.html

some fixes. :P

2007-09-18 14:49:19 +00: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/9556] Drop php closing tags, add trailing newline

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

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

[feature/events] There is nothing between head and body.

2012-12-17 11:37:36 -05:00

ucp_pm_viewmessage.html

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

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

ucp_prefs_personal.html

Merge PR #1053 branch 'develop-olympus' into develop

2012-12-05 12:21:25 -05: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

[feature/avatars] Remove unnecessary abbreviations

2012-11-25 00:54:34 +01:00

ucp_profile_profile_info.html

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +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/9556] Drop php closing tags, add trailing newline

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

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

Merge branch 'develop-olympus' into develop

2013-01-30 16:56:16 -06: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/9556] Drop php closing tags, add trailing newline

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

viewtopic_body.html

[feature/events] Adding viewtopic_topic_title_prepend template event

2012-12-17 11:37:26 -05:00

viewtopic_print.html

[feature/events] There is nothing between head and body.

2012-12-17 11:37:36 -05:00