makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 12:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes/acp
History
Andreas Fischer 9480a5e512 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value

Conflicts:
	phpBB/includes/acp/acp_profile.php
2012-07-23 15:50:54 +02:00
..
info [feature/merging-style-components] New acp_styles 2012-03-14 23:47:57 +02:00
acp_attachments.php [ticket/10990] Changes for develop 2012-07-22 14:48:39 -05:00
acp_ban.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_bbcodes.php [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_board.php [feature/new-tz-handling] Don't use global user but make it a parameter 2012-07-19 17:41:27 +02:00
acp_bots.php [ticket/10990] Changes for develop 2012-07-22 14:48:39 -05:00
acp_captcha.php Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop 2012-01-02 17:54:54 +01:00
acp_database.php Merge branch 'develop-olympus' into develop 2012-05-31 15:34:58 +02:00
acp_disallow.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_email.php [ticket/10990] Do not use comma separator when storing it as a log. 2012-07-22 14:39:10 -05:00
acp_forums.php [ticket/10650] Removed changes from acp_forums.php 2012-04-08 11:12:29 +05:30
acp_groups.php [feature/pagination-as-list] New parameter for name of start var 2012-07-18 14:32:42 +01:00
acp_icons.php [feature/pagination-as-list] New parameter for name of start var 2012-07-18 14:32:42 +01:00
acp_inactive.php [ticket/10990] Changes for develop 2012-07-22 14:48:39 -05:00
acp_jabber.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_language.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_logs.php [feature/pagination-as-list] New parameter for name of start var 2012-07-18 14:32:42 +01:00
acp_main.php Merge branch 'develop-olympus' into develop 2012-05-01 13:38:25 +02:00
acp_modules.php [feature/ajax] Unify phpbb_json_response instantiation 2012-03-31 02:10:17 +02:00
acp_permission_roles.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_permissions.php [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate 2012-07-22 14:32:03 -05:00
acp_php_info.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_profile.php Merge branch 'develop-olympus' into develop 2012-07-23 15:50:54 +02:00
acp_prune.php [ticket/10990] Changes for develop 2012-07-22 14:48:39 -05:00
acp_ranks.php [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_reasons.php [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate 2012-07-22 14:32:03 -05:00
acp_search.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_send_statistics.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_styles.php [ticket/11012] Normalize $phpEx member vars to $php_ext 2012-07-21 16:19:01 +02:00
acp_update.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
acp_users.php [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate 2012-07-22 14:32:03 -05:00
acp_words.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
auth.php [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate 2012-07-22 14:32:03 -05:00