Joas Schilling 13eb0ec5b9 Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/12035] Correcting the condition
  [ticket/12035] Adding necessary conditions
  [ticket/12035] Adding link to user posts to ACP page

Conflicts:
	phpBB/adm/style/acp_users_overview.html

2014-03-22 15:13:41 +01:00

..

info

[ticket/11169] Move module 'prune users' to users category

2014-03-16 02:53:01 +01:00

acp_attachments.php

Merge pull request #2035 from prototech/ticket/12138

2014-02-20 21:13:06 -06:00

acp_ban.php

…

acp_bbcodes.php

[ticket/12060] Further clarifying new event docblocks as much as possible

2013-12-16 23:54:55 -08:00

acp_board.php

[ticket/12241] Add @var for the arguments

2014-03-14 12:49:04 +01:00

acp_bots.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

acp_captcha.php

…

acp_database.php

[ticket/11990] Remove result_mssqlnative usage in acp_database.php

2013-11-03 00:37:18 -05:00

acp_disallow.php

…

acp_email.php

…

acp_extensions.php

[ticket/12009] Prevent user from enabling invalid extension through direct URL

2013-12-12 14:40:03 -08:00

acp_forums.php

Merge branch 'develop' of https://github.com/phpbb/phpbb into feature/passwords

2013-12-29 13:46:42 +01:00

acp_groups.php

[ticket/12153] Remove redundant calls to pagination.on_page().

2014-02-03 23:00:39 -08:00

acp_icons.php

Merge pull request #1920 from prototech/ticket/12038

2013-12-30 11:23:22 -08:00

acp_inactive.php

[ticket/12153] Remove redundant calls to pagination.on_page().

2014-02-03 23:00:39 -08:00

acp_jabber.php

…

acp_language.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

acp_logs.php

[ticket/12153] Remove redundant calls to pagination.on_page().

2014-02-03 23:00:39 -08:00

acp_main.php

[ticket/9871] Use $request->variable instead of request_var

2014-03-05 19:00:52 -06:00

acp_modules.php

[ticket/12038] AJAXify move up/down buttons in the module management pages.

2013-12-05 23:41:26 -08:00

acp_permission_roles.php

[ticket/12038] Free query results.

2013-12-30 11:09:08 -08:00

acp_permissions.php

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-16 01:24:05 +02:00

acp_php_info.php

…

acp_profile.php

[ticket/12233] Allow profile fields to be contact fields

2014-02-28 14:38:03 +01:00

acp_prune.php

[ticket/12187] Remove user_website functionality

2014-03-03 20:01:19 +01:00

acp_ranks.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

acp_reasons.php

[ticket/12038] Free query results.

2013-12-30 11:09:08 -08:00

acp_search.php

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04:00

acp_send_statistics.php

…

acp_styles.php

[ticket/12292] Improve style details page

2014-03-20 18:11:45 -07:00

acp_update.php

[ticket/9871] Use $request->variable instead of request_var

2014-03-05 19:00:52 -06:00

acp_users.php

Merge branch 'develop-olympus' into develop-ascraeus

2014-03-22 15:13:41 +01:00

acp_words.php

…

auth.php

[ticket/11981] Fix code sniffer complaints

2013-10-28 23:05:46 +01:00