Andreas Fischer 3f0c02533a Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
  [ticket/9012] Adjust shadow topic title to the title at the time it was moved.

Conflicts:
	phpBB/styles/subsilver2/template/editor.js
	phpBB/styles/subsilver2/template/posting_topic_review.html
	phpBB/styles/subsilver2/template/ucp_pm_history.html

2010-07-12 00:13:32 +02:00

..

attachment.html

Copy 3.0.x branch to trunk

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

bbcode.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00: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

merge changes from 3.0.x branch

2009-12-16 15:48:23 +00: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/9531] BBCode-less quotes fallback-option is missing "Author wrote:"

2010-07-11 10:18:45 +02:00

faq_body.html

Copy 3.0.x branch to trunk

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

forum_fn.js

- Forgot to fix jQuery code in r10409 #54395

2010-01-17 16:58:38 +00:00

forumlist_body.html

Copy 3.0.x branch to trunk

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

index_body.html

merge changes from 3.0.x branch

2009-12-16 15:48:23 +00: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 changes from 3.0.x branch

2009-12-16 15:48:23 +00:00

login_forum.html

merge changes from 3.0.x branch

2009-12-16 15:48:23 +00:00

mcp_approve.html

Copy 3.0.x branch to trunk

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

mcp_ban.html

Copy 3.0.x branch to trunk

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

mcp_footer.html

Copy 3.0.x branch to trunk

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

mcp_forum.html

Copy 3.0.x branch to trunk

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

mcp_front.html

Copy 3.0.x branch to trunk

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

mcp_header.html

Copy 3.0.x branch to trunk

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

mcp_logs.html

Copy 3.0.x branch to trunk

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

mcp_message.html

Copy 3.0.x branch to trunk

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

mcp_move.html

Copy 3.0.x branch to trunk

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

mcp_notes_front.html

Copy 3.0.x branch to trunk

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

mcp_notes_user.html

Copy 3.0.x branch to trunk

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

mcp_post.html

Bug #54745 - Fix language string for PM-Reports refering to post-data.

2010-01-26 14:06:00 +00:00

mcp_queue.html

Copy 3.0.x branch to trunk

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

mcp_reports.html

[bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)

2010-04-04 02:03:23 +02:00

mcp_topic.html

Copy 3.0.x branch to trunk

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

mcp_viewlogs.html

Copy 3.0.x branch to trunk

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

mcp_warn_front.html

Copy 3.0.x branch to trunk

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

mcp_warn_list.html

Copy 3.0.x branch to trunk

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

mcp_warn_post.html

Copy 3.0.x branch to trunk

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

mcp_warn_user.html

Copy 3.0.x branch to trunk

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

mcp_whois.html

Copy 3.0.x branch to trunk

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

memberlist_body.html

Copy 3.0.x branch to trunk

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

memberlist_email.html

Copy 3.0.x branch to trunk

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

memberlist_im.html

Copy 3.0.x branch to trunk

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

memberlist_leaders.html

Copy 3.0.x branch to trunk

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

memberlist_search.html

Copy 3.0.x branch to trunk

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

memberlist_view.html

Copy 3.0.x branch to trunk

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

message_body.html

Copy 3.0.x branch to trunk

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

overall_footer.html

Copy 3.0.x branch to trunk

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

overall_header.html

Integrate active topics feed. Some language adjustments and rearrangements.

2009-12-27 00:48:52 +00: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

Copy 3.0.x branch to trunk

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

posting_editor.html

Copy 3.0.x branch to trunk

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

posting_layout.html

Copy 3.0.x branch to trunk

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

posting_pm_layout.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00: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

Copy 3.0.x branch to trunk

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

posting_smilies.html

Copy 3.0.x branch to trunk

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

posting_topic_review.html

[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"

2010-07-11 10:18:45 +02: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

Copy 3.0.x branch to trunk

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

search_body.html

Copy 3.0.x branch to trunk

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

search_results.html

merge changes from 3.0.x branch

2009-12-16 15:48:23 +00:00

simple_footer.html

Copy 3.0.x branch to trunk

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

simple_header.html

Copy 3.0.x branch to trunk

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

styleswitcher.js

Copy 3.0.x branch to trunk

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

template.cfg

Change version numbers to 3.0.7 and 3.0.8-dev in preparation for development on next release

2010-02-01 01:14:06 +00:00

ucp_agreement.html

Copy 3.0.x branch to trunk

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

ucp_attachments.html

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00: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

Copy 3.0.x branch to trunk

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

ucp_groups_manage.html

Copy 3.0.x branch to trunk

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

ucp_groups_membership.html

Copy 3.0.x branch to trunk

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

ucp_header.html

Copy 3.0.x branch to trunk

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

ucp_main_bookmarks.html

Copy 3.0.x branch to trunk

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

ucp_main_drafts.html

Copy 3.0.x branch to trunk

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

ucp_main_front.html

Copy 3.0.x branch to trunk

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

ucp_main_subscribed.html

Copy 3.0.x branch to trunk

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

ucp_pm_history.html

[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"

2010-07-11 10:18:45 +02: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

Copy 3.0.x branch to trunk

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

ucp_pm_popup.html

Copy 3.0.x branch to trunk

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

ucp_pm_viewfolder.html

[ticket/9135] Fix report-icon for moderators in PM folders.

2010-05-26 01:38:19 +02:00

ucp_pm_viewmessage_print.html

Fix Bug #30315 - No longer use group colours for usernames on print view. Colour could be white. Patch by Pasqualle.

2009-12-29 02:11:16 +00:00

ucp_pm_viewmessage.html

Copy 3.0.x branch to trunk

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

ucp_prefs_personal.html

Copy 3.0.x branch to trunk

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

ucp_prefs_post.html

Copy 3.0.x branch to trunk

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

ucp_prefs_view.html

Copy 3.0.x branch to trunk

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

ucp_profile_avatar.html

Copy 3.0.x branch to trunk

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

ucp_profile_profile_info.html

Copy 3.0.x branch to trunk

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

ucp_profile_reg_details.html

Copy 3.0.x branch to trunk

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

ucp_profile_signature.html

[ticket/9665] Allow preview of signature when it is the string "0".

2010-06-20 13:38:36 +02:00

ucp_register.html

#56455 - remove extra space in template

2010-01-17 17:27:19 +00:00

ucp_remind.html

Copy 3.0.x branch to trunk

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

ucp_resend.html

Copy 3.0.x branch to trunk

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

ucp_zebra_foes.html

Copy 3.0.x branch to trunk

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

ucp_zebra_friends.html

Copy 3.0.x branch to trunk

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

viewforum_body.html

[ticket/9605] Wrong class added to topiclist, when there's no announcement topic.

2010-06-17 15:56:25 +02:00

viewonline_body.html

Copy 3.0.x branch to trunk

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

viewonline_whois.html

Copy 3.0.x branch to trunk

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

viewtopic_body.html

Copy 3.0.x branch to trunk

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

viewtopic_print.html

Fix Bug #30315 - No longer use group colours for usernames on print view. Colour could be white. Patch by Pasqualle.

2009-12-29 02:11:16 +00:00