Nils Adermann 014dc53a80 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/6632] Better viewing of topics for wide screen displays

Conflicts:
	phpBB/styles/prosilver/template/forumlist_body.html
	phpBB/styles/prosilver/template/viewforum_body.html

2011-07-16 23:16:23 -04:00

..

attachment.html

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

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

bbcode.html

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

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

captcha_default.html

Copy 3.0.x branch to trunk

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

captcha_qa.html

Copy 3.0.x branch to trunk

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

captcha_recaptcha.html

[ticket/9853] Change recaptcha theme from default to 'clean'.

2010-10-18 10:59:00 +02:00

confirm_body.html

Copy 3.0.x branch to trunk

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

custom_profile_fields.html

Copy 3.0.x branch to trunk

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

drafts.html

Copy 3.0.x branch to trunk

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

editor.js

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

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

faq_body.html

Copy 3.0.x branch to trunk

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

forum_fn.js

[ticket/9499] Unify definition of dE() and other javascript functions

2010-07-26 13:29:53 -05:00

forumlist_body.html

Merge branch 'develop-olympus' into develop

2011-07-16 23:16:23 -04:00

index_body.html

[ticket/10173] Use a loop var for the birthdays list to allow proper templating

2011-05-08 15:36:27 +02:00

index.htm

Copy 3.0.x branch to trunk

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

jumpbox.html

Copy 3.0.x branch to trunk

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

login_body.html

Merge branch 'develop-olympus' into develop

2010-12-29 23:01:19 +01:00

login_forum.html

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

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

mcp_approve.html

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

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

mcp_ban.html

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

2010-11-11 19:10:55 +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

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

mcp_front.html

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

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

mcp_header.html

Copy 3.0.x branch to trunk

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

mcp_logs.html

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

2010-11-11 19:10:55 +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/8065] Add an option to lock topics while moving them.

2011-01-30 01:23:20 +01:00

mcp_notes_front.html

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

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

mcp_notes_user.html

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

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

mcp_post.html

Merge branch 'develop-olympus' into develop

2011-02-24 20:59:19 -05:00

mcp_queue.html

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

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

mcp_reports.html

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

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

mcp_topic.html

Merge branch 'develop-olympus' into develop

2011-05-23 23:56:55 +02:00

mcp_viewlogs.html

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

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

mcp_warn_front.html

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

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

mcp_warn_list.html

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

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

2010-11-11 19:10:55 +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

Merge branch 'develop-olympus' into develop

2011-07-16 21:06:49 -04:00

memberlist_email.html

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

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

memberlist_im.html

Merge branch 'develop-olympus' into develop

2011-04-22 00:04:51 -04:00

memberlist_leaders.html

[ticket/9549] Enhance teampage and legend functionality

2011-02-16 18:21:49 +01:00

memberlist_search.html

[ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH

2011-01-08 01:33:35 +01:00

memberlist_view.html

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

2010-11-11 19:10:55 +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

Merge branch 'develop-olympus' into develop

2011-07-06 21:52:05 -04:00

overall_header.html

[ticket/10260] Remove prosilver styleswitcher

2011-07-12 01:43:55 +02:00

posting_attach_body.html

Copy 3.0.x branch to trunk

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

posting_body.html

Copy 3.0.x branch to trunk

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

posting_buttons.html

[ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH

2011-01-08 01:33:35 +01:00

posting_editor.html

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

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

posting_layout.html

Copy 3.0.x branch to trunk

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

posting_pm_layout.html

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

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

posting_poll_body.html

Copy 3.0.x branch to trunk

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

posting_preview.html

Copy 3.0.x branch to trunk

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

posting_review.html

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

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

posting_smilies.html

Merge branch 'develop-olympus' into develop

2011-02-27 23:18:33 +01:00

posting_topic_review.html

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

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

quickreply_editor.html

[ticket/9146] Fix double occurring tabindex="6" in prosilver's QR

2010-05-16 16:59:48 +02:00

report_body.html

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

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

search_body.html

[ticket/7417] Focus search keywords field when prosilver search page is loaded.

2010-10-16 12:24:37 +02:00

search_results.html

[ticket/9684] Remove code for global announcement in root-files

2011-04-07 13:45:44 +02:00

simple_footer.html

Merge branch 'develop-olympus' into develop

2011-07-06 21:52:05 -04:00

simple_header.html

[ticket/10260] Remove prosilver styleswitcher

2011-07-12 01:43:55 +02:00

template.cfg

[develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases.

2011-06-12 19:45:01 +02:00

ucp_agreement.html

Copy 3.0.x branch to trunk

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

ucp_attachments.html

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

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

ucp_avatar_options.html

Bug #52495 - [Fix] Replace hard coded "px" with translated language-string.

2010-01-25 15:57:10 +00: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

Merge branch 'develop-olympus' into develop

2011-03-20 22:42:51 +01:00

ucp_groups_membership.html

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

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

ucp_header.html

Copy 3.0.x branch to trunk

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

ucp_main_bookmarks.html

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

ucp_main_drafts.html

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

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

ucp_main_front.html

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

ucp_main_subscribed.html

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

ucp_pm_history.html

[ticket/9757] Fix empty template variable {HISTORY_TITLE}

2010-07-29 13:19:19 -05: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

Copy 3.0.x branch to trunk

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

ucp_pm_options.html

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

2010-11-11 19:10:55 +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

Merge branch 'ticket/hanakin/10001' into develop

2011-02-28 00:07:59 +01:00

ucp_pm_viewmessage_print.html

Merge branch 'develop-olympus' into develop

2011-07-06 21:52:05 -04:00

ucp_pm_viewmessage.html

[ticket/8542] Display custom profile fields in private messages

2011-05-20 16:45:29 +02:00

ucp_prefs_personal.html

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

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

ucp_prefs_post.html

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

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

ucp_prefs_view.html

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

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

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

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

ucp_profile_reg_details.html

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

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

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

ucp_remind.html

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

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

ucp_resend.html

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

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

ucp_zebra_foes.html

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

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

ucp_zebra_friends.html

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

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

viewforum_body.html

Merge branch 'develop-olympus' into develop

2011-07-16 23:16:23 -04:00

viewonline_body.html

Copy 3.0.x branch to trunk

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

viewonline_whois.html

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

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

viewtopic_body.html

Merge branch 'develop-olympus' into develop

2011-06-19 17:58:16 +02:00

viewtopic_print.html

Merge branch 'develop-olympus' into develop

2011-07-06 21:52:05 -04:00