Oleg Pudeyev 87ea50948e Merge remote-tracking branch 'upstream/develop' into feature/prune-users ...

* upstream/develop: (2171 commits)
  [ticket/11164] Update composer.phar
  [ticket/10933] Use inheritDoc, eliminate copy pasted docblocks.
  [ticket/10933] Dependency inject template context.
  [ticket/10933] Expanded prose documentation for phpbb_extension_provider.
  [ticket/10933] Specify empty template path for absolute includephp test.
  [ticket/10933] Useful documentation for template locate function
  [ticket/10933] Typo fixes
  [ticket/10933] Initialize template context when template is constructed.
  [ticket/11099] Mark acp_ban::display_ban_options() as static.
  [ticket/11158] Require acl_u_sig for ucp signature module.
  [ticket/11158] Revert old fix in PHPBB3-10186.
  [ticket/11159] static public is the currently approved order.
  [ticket/11157] static public is the currently approved order.
  [ticket/11157] Fix remaining captcha spam.
  [ticket/11157] get_captcha_types is an instance method.
  [ticket/11156] Delete "Misc" tab of forum based permissions + move items
  [ticket/10848] Move include up.
  [ticket/11014] Fix old pagination assignment
  [ticket/11018] Fix several paginations in ACP
  [ticket/11014] Fix IF statements for new template pagination
  ...

Conflicts:
	phpBB/includes/functions_user.php

2012-11-06 11:11:27 -05:00

..

acp_attachments.html

[ticket/11018] Fix several paginations in ACP

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

acp_ban.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_bbcodes.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

acp_board.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_bots.html

[ticket/10272] Renamed AJAX callback act_deact to activate_deactivate.

2012-03-31 02:09:22 +02:00

acp_captcha.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_database.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_disallow.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_email.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_ext_details.html

[ticket/10631] Adjust prefixes to be easier to understand

2012-09-01 15:05:57 +01:00

acp_ext_disable.html

[ticket/10631] Various front-end fixes (extensions manager)

2012-09-01 15:05:54 +01:00

acp_ext_enable.html

[ticket/10631] Various front-end fixes (extensions manager)

2012-09-01 15:05:54 +01:00

acp_ext_list.html

[ticket/10631] Adjust prefixes to be easier to understand

2012-09-01 15:05:57 +01:00

acp_ext_purge.html

[ticket/10631] Various front-end fixes (extensions manager)

2012-09-01 15:05:54 +01:00

acp_forums_copy_perm.html

…

acp_forums.html

[ticket/10982] Remove overlay on first up/down move of forums in ACP

2012-07-11 14:54:31 +02:00

acp_groups_position.html

[ticket/10410] Add option to display users in their first teampage group

2011-10-28 22:55:26 +02:00

acp_groups.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_icons.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_inactive.html

[ticket/11018] Fix several paginations in ACP

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

acp_jabber.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_language.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_logs.html

[ticket/11018] Fix several paginations in ACP

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

acp_main.html

[ticket/10271] AJAXified buttons on acp_main.

2012-03-31 02:09:15 +02:00

acp_modules.html

[feature/ajax] Remove not working module enable/disable ajax code

2012-03-31 02:10:17 +02:00

acp_permission_roles.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

acp_permissions.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_php_info.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_profile.html

Merge branch 'develop-olympus' into develop

2012-07-23 15:50:54 +02:00

acp_prune_forums.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_prune_users.html

Merge remote-tracking branch 'upstream/develop' into feature/prune-users

2012-11-06 11:11:27 -05:00

acp_ranks.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

acp_reasons.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

acp_search.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_send_statistics.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_styles.html

[feature/ajax] Fix acp_styles activate_deactivate ajax callback name

2012-03-31 02:10:17 +02:00

acp_update.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

acp_users_avatar.html

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

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

acp_users_feedback.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_users_overview.html

Merge branch 'develop-olympus' into develop

2012-10-16 14:40:25 +02:00

acp_users_prefs.html

[feature/new-tz-handling] Fix timezone option when editing a user in the ACP

2012-06-18 15:09:45 +02:00

acp_users_profile.html

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

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

acp_users_signature.html

Merge branch 'develop-olympus' into develop

2011-07-30 19:37:24 -04:00

acp_users_warnings.html

…

acp_users.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

acp_words.html

[ticket/10271] AJAXified various deletions in the ACP.

2012-03-31 02:09:15 +02:00

admin.css

[ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same

2012-10-17 23:30:57 +02:00

ajax.js

[ticket/10784] Do not show ajax overlay unless needed

2012-04-12 21:03:47 +02:00

captcha_default_acp_demo.html

…

captcha_gd_acp.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

captcha_qa_acp_demo.html

ACP usability

2010-01-26 10:57:00 +00:00

captcha_qa_acp.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

captcha_recaptcha_acp.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

captcha_recaptcha.html

[ticket/9939] Fix JavaScript error in admin recaptcha template

2010-12-05 14:35:19 +01:00

colour_swatch.html

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02:00

confirm_bbcode.html

merge r10513 into 3.0 branch: propdel

2010-02-23 16:18:57 +00:00

confirm_body_prune.html

[feature/prune-users] Add spaces inside brackets.

2012-04-19 20:35:13 -04:00

confirm_body.html

…

custom_profile_fields.html

…

editor.js

Merge branch 'develop-olympus' into develop

2011-12-16 15:50:11 +01:00

install_convert.html

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

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

install_error.html

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

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

install_footer.html

Merge branch 'develop-olympus' into develop

2012-10-06 06:15:01 +02:00

install_header.html

[ticket/10258] Add HTML5 meta charset tag

2011-07-29 16:32:22 +02:00

install_install.html

…

install_main.html

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

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

install_update_diff.html

Merge branch 'develop-olympus' into develop

2012-05-06 18:39:32 +02:00

install_update.html

[ticket/9914] Add backup warning to updater.

2012-02-03 16:14:48 +00: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/10783] Added assets_version to ACP and simple_*.html.

2012-04-11 14:37:15 +01:00

overall_header.html

[ticket/11008] Remove eval() calls to get document[id]

2012-07-21 00:12:37 +02:00

pagination.html

[feature/pagination-as-list] Various fixes and improvements

2012-07-18 14:31:21 +01:00

permission_forum_copy.html

[ticket/10362] HTML5 Fix - Replace name attribute with id in anchors

2011-09-11 17:04:47 -07:00

permission_mask.html

[ticket/9535] Fix some more rtl margin issues.

2010-05-16 18:50:25 +02:00

permission_roles_mask.html

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

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

permission_trace.html

…

permissions.js

…

progress_bar.html

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

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

simple_body.html

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

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

simple_footer.html

[ticket/10783] Added assets_version to ACP and simple_*.html.

2012-04-11 14:37:15 +01:00

simple_header.html

[ticket/10783] Added assets_version to ACP and simple_*.html.

2012-04-11 14:37:15 +01:00

timezone_option.html

[feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicates

2012-06-19 19:08:53 +02:00

timezone.js

[feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicates

2012-06-19 19:08:53 +02:00

tooltip.js

…

viewsource.html

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

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