Andreas Fischer f49be85859 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp

Conflicts:
	phpBB/styles/prosilver/template/ucp_groups_manage.html

2013-05-19 15:44:25 +02:00

..

ajax.js

[ticket/10741] Do not resize textarea.no-auto-resize

2013-04-12 16:46:54 +03:00

attachment.html

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

2010-12-15 09:39:28 +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

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/11442] Do not suggest an option on ajax confirm box

2013-05-08 00:07:13 +02:00

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/11275] Do not use spacer.gif in color picker

2013-04-12 16:42:36 +03:00

faq_body.html

[ticket/10734] Removed unwanted span classes

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

forum_fn.js

[ticket/11555] Fix page comparison

2013-05-19 10:56:15 +03:00

forumlist_body.html

[feature/events] Fix typo in event name

2012-12-17 17:39:25 -05:00

index_body.html

Merge PR #1148 branch 'imkingdavid/feature/events' into develop

2012-12-20 15:10:46 -05:00

index.htm

Copy 3.0.x branch to trunk

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

Merge branch 'develop-olympus' into develop

2013-05-06 22:11:33 +02:00

mcp_approve.html

[ticket/11166] Fix several custom confirm templates in prosilver

2013-03-03 17:23:06 +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/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +01:00

mcp_front.html

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

2013-03-02 17:45:18 -06:00

mcp_header.html

[ticket/10734] Removed all the unnecessary corner classes

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

mcp_logs.html

[ticket/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +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/11166] Fix several custom confirm templates in prosilver

2013-03-03 17:23:06 +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/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +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/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +01:00

mcp_reports.html

[ticket/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +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/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +01:00

memberlist_body.html

[ticket/10786] Javascript toggle member search panel in memberlist.php

2013-01-15 23:29:01 -06: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/11201] Revert WLM dropping because it is still used in China.

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

memberlist_leaders.html

[ticket/10734] Removed unwanted span classes

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

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/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +01:00

overall_footer.html

[ticket/11433] Rename CSS class "jalert" to "phpbb_alert"

2013-03-12 15:15:21 +01:00

overall_header.html

Merge remote-tracking branch 'remotes/VSE/ticket/11103-VSEphpbb' into ticket/11103

2013-02-28 09:56:37 -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/11275] Do not use document.write() for color palette

2013-04-12 16:40:32 +03:00

posting_editor.html

[feature/events] Append "_prepend" to posting_editor_options

2012-12-17 11:38:16 -05: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/11463] Add title attribute to topics in search results

2013-03-20 11:39:06 -07:00

simple_footer.html

[feature/events] simple_footer_end -> simple_footer_after

2012-12-17 11:40:42 -05: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/11303] rename attribute to timezone-preselect

2013-02-17 12:53:14 +05:30

timezone.js

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314

2013-03-26 13:18:54 +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/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +01:00

ucp_avatar_options_gravatar.html

[feature/avatars] Auto-clear avatar dimensions when first changing avatars

2013-02-28 22:56:01 +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] Auto-clear avatar dimensions when first changing avatars

2013-02-28 22:56:01 +01:00

ucp_avatar_options_upload.html

[feature/avatars] Remove unnecessary abbreviations

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

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

Merge branch 'develop-olympus' into develop

2013-05-19 15:44:25 +02: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

[ticket/11129] Added headers to empty subscription state

2013-04-23 15:02:38 -07:00

ucp_notifications.html

[ticket/11533] Change list to table for notification settings

2013-05-11 23:32:23 +03:00

ucp_pm_history.html

Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop

2013-03-02 17:50:31 -06: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/11328] Replace long buttons text with short text

2013-01-16 11:37:50 +02: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/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +01:00

ucp_pm_viewmessage_print.html

[feature/events] ucp_pm_viewmessage_print_head_append

2012-12-17 11:51:07 -05:00

ucp_pm_viewmessage.html

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

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

ucp_prefs_personal.html

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

2012-12-07 21:14:39 -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

[feature/avatars] UCP Avatar Interface

2012-03-18 22:19:16 +00: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/10734] Removed all the unnecessary corner classes

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

ucp_register.html

[ticket/11302] Correctly select first timezone or selected timezone

2013-01-02 22:05:14 +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/11342] Mark active topics read when marking forums read

2013-02-03 15:51:29 +01:00

viewonline_body.html

[ticket/11197] Prefix the css classes for the small arrow with "arrow"

2012-11-13 20:57:34 +01:00

viewonline_whois.html

[ticket/10734] Removed unwanted span classes

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

viewtopic_body.html

[ticket/11461] Add template event in the footer of view topic pages

2013-03-19 13:32:17 -07:00

viewtopic_print.html

[feature/events] Append "_append" to viewtopic_print_head

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