Nathaniel Guse 35b628f737 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig ...

# By Joseph Warner (44) and others
# Via Joas Schilling (4) and others
* 'develop' of https://github.com/phpbb/phpbb3: (63 commits)
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  [ticket/11566] Rename var to $visual_confirmation_response
  [ticket/11566] Revert forum permission changes
  [ticket/11566] Use language variable instead of hardcode
  [ticket/11566] add tests for reporting post
  [ticket/11566] add captcha reset and hidden fields
  [ticket/11566] display error instead of trigger_error
  [ticket/11566] add error in template
  [ticket/11566] add error functionality
  [ticket/11566] add interface for captcha
  ...

2013-07-04 11:19:10 -05:00

..

ajax.js

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

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

attachment.html

…

avatars.js

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

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

bbcode.html

…

captcha_default.html

…

captcha_qa.html

…

captcha_recaptcha.html

…

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/11010] adding type="number" to CPF int type

2013-05-20 18:39:56 +02:00

drafts.html

…

editor.js

[feature/editor-code-tabs] Check for browser support in function

2013-05-20 20:33:51 +03:00

faq_body.html

…

forum_fn.js

[ticket/11516] Upgrading the .live jquery function because it is deprecated.

2013-05-28 01:48:25 +02:00

forumlist_body.html

[ticket/11489] Template changes for new topiclist layout

2013-05-14 09:17:43 +03:00

index_body.html

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

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

index.htm

…

jumpbox.html

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

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

login_body.html

…

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

…

mcp_footer.html

…

mcp_forum.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

mcp_front.html

[ticket/11489] Template changes for new topiclist layout

2013-05-14 09:17:43 +03:00

mcp_header.html

…

mcp_logs.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

mcp_message.html

…

mcp_move.html

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

2013-03-03 17:23:06 +01:00

mcp_notes_front.html

…

mcp_notes_user.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

mcp_post.html

…

mcp_queue.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

mcp_reports.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

mcp_topic.html

[ticket/11010] dealing with dimensions problem, removing extra code

2013-05-20 18:42:06 +02:00

mcp_warn_front.html

…

mcp_warn_list.html

…

mcp_warn_post.html

…

mcp_warn_user.html

…

mcp_whois.html

…

memberlist_body.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

memberlist_email.html

[ticket/11010] Changing email and url input types in prosilver templates

2013-05-20 18:39:46 +02: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

…

memberlist_search.html

[feature/twig] INCLUDEJS behavior now supports local relative paths

2013-07-02 11:07:12 -05: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

…

overall_footer.html

[feature/twig] INCLUDEJS behavior now supports local relative paths

2013-07-02 11:07:12 -05:00

overall_header.html

[ticket/11010] Change input type to search for search forms

2013-05-20 18:42:05 +02:00

pagination.html

…

posting_attach_body.html

…

posting_body.html

…

posting_buttons.html

[feature/twig] INCLUDEJS behavior now supports local relative paths

2013-07-02 11:07:12 -05:00

posting_editor.html

[ticket/11010] adding type="number" and type="date" to prosilver

2013-05-20 18:39:59 +02:00

posting_layout.html

…

posting_pm_layout.html

…

posting_poll_body.html

[ticket/11010] adding type="number" and type="date" to prosilver

2013-05-20 18:39:59 +02:00

posting_preview.html

…

posting_review.html

…

posting_smilies.html

…

posting_topic_review.html

…

quickreply_editor.html

…

report_body.html

Merge branch 'ticket/11566' into ticket/11566-develop

2013-07-01 23:25:29 +05:30

search_body.html

[ticket/11010] Change input type to search for search forms

2013-05-20 18:42:05 +02:00

search_results.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

simple_footer.html

[ticket/11554] Move forum_fn.js to footer

2013-05-19 11:07:29 +03:00

simple_header.html

[ticket/11554] Move forum_fn.js to footer

2013-05-19 11:07:29 +03:00

timezone_option.html

[feature/twig] INCLUDEJS behavior now supports local relative paths

2013-07-02 11:07:12 -05:00

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

…

ucp_attachments.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

ucp_avatar_options_gravatar.html

[ticket/11010] Fix email inputs

2013-05-20 18:42:09 +02: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

[ticket/11010] Fix input type for urls

2013-05-20 18:42:10 +02:00

ucp_avatar_options_upload.html

[ticket/11010] Fix input type for urls

2013-05-20 18:42:10 +02:00

ucp_avatar_options.html

[feature/twig] INCLUDEJS behavior now supports local relative paths

2013-07-02 11:07:12 -05:00

ucp_footer.html

…

ucp_groups_manage.html

Merge branch 'develop-olympus' into develop

2013-05-26 19:19:08 +02:00

ucp_groups_membership.html

[ticket/11489] Template changes for new topiclist layout

2013-05-14 09:17:43 +03:00

ucp_header.html

…

ucp_main_bookmarks.html

[ticket/11489] Template changes for new topiclist layout

2013-05-14 09:17:43 +03:00

ucp_main_drafts.html

[ticket/11489] Template changes for new topiclist layout

2013-05-14 09:17:43 +03:00

ucp_main_front.html

[ticket/11489] Template changes for new topiclist layout

2013-05-14 09:17:43 +03:00

ucp_main_subscribed.html

[ticket/11489] Template changes for new topiclist layout

2013-05-14 09:17:43 +03:00

ucp_notifications.html

[ticket/11489] Template changes for new topiclist layout

2013-05-14 09:17:43 +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

…

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

…

ucp_pm_popup.html

…

ucp_pm_viewfolder.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

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

…

ucp_prefs_view.html

…

ucp_profile_autologin_keys.html

…

ucp_profile_avatar.html

…

ucp_profile_profile_info.html

[ticket/11010] Fix email inputs

2013-05-20 18:42:09 +02:00

ucp_profile_reg_details.html

[ticket/11010] Changing email and url input types in prosilver templates

2013-05-20 18:39:46 +02:00

ucp_profile_signature.html

…

ucp_register.html

[ticket/11010] Changing email and url input types in prosilver templates

2013-05-20 18:39:46 +02:00

ucp_remind.html

[ticket/11010] Changing email and url input types in prosilver templates

2013-05-20 18:39:46 +02:00

ucp_resend.html

[ticket/11010] Changing email and url input types in prosilver templates

2013-05-20 18:39:46 +02:00

ucp_zebra_foes.html

…

ucp_zebra_friends.html

…

viewforum_body.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

viewonline_body.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

viewonline_whois.html

…

viewtopic_body.html

[ticket/9341] Use U_PREVIOUS and U_NEXT in template files

2013-06-22 03:44:22 +05:30

viewtopic_print.html

[feature/events] Append "_append" to viewtopic_print_head

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