makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/language/en/acp
History
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
..
attachments.php Merge branch 'develop-olympus' into develop 2012-05-31 11:55:12 +02:00
ban.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
board.php Merge PR #1004 branch 'develop-olympus' into develop 2012-10-09 19:41:25 -04:00
bots.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
common.php [ticket/10631] Adding an extensions admin 2012-09-01 15:04:33 +01:00
database.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
email.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
extensions.php [ticket/10631] Use exceptions for errors. Build action list dynamically. 2012-09-01 15:05:34 +01:00
forums.php [ticket/10650] Changed acp option from per forum to global 2012-04-08 10:34:44 +05:30
groups.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
index.htm some bugfixes 2006-10-26 10:58:58 +00:00
language.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
modules.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
permissions.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
permissions_phpbb.php [ticket/11156] Delete "Misc" tab of forum based permissions + move items 2012-10-29 08:01:16 -04:00
posting.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
profile.php Merge branch 'develop-olympus' into develop 2012-07-23 15:50:54 +02:00
prune.php Merge remote-tracking branch 'upstream/develop' into feature/prune-users 2012-11-06 11:11:27 -05:00
search.php [feature/sphinx-fulltext-search] use 9312 as default port 2012-07-27 11:10:04 +05:30
styles.php [ticket/10161] all "e-mail" strings in language files changed to "email" 2012-04-15 20:10:51 +02:00
users.php Merge branch 'develop-olympus' into develop 2012-07-21 16:15:42 +02:00