makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 20:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes/acp
History
Joas Schilling bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [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
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [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
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
..
info [ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION 2013-02-23 14:20:56 -05:00
acp_attachments.php [ticket/11010] validation to match type 2013-05-20 18:42:02 +02:00
acp_ban.php [ticket/11099] Mark acp_ban::display_ban_options() as static. 2012-10-30 18:43:00 -04:00
acp_bbcodes.php [ticket/10271] AJAXified various deletions in the ACP. 2012-03-31 02:09:15 +02:00
acp_board.php [feature/auth-refactor] Fix code style issue 2013-07-02 14:03:43 -04:00
acp_bots.php [ticket/10990] Changes for develop 2012-07-22 14:48:39 -05:00
acp_captcha.php Merge branch 'develop-olympus' into develop 2013-07-03 04:03:39 +02: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_extensions.php Merge remote-tracking branch 'EXreaction/ticket/11415' into develop 2013-05-18 11:20:47 -04:00
acp_forums.php Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission 2013-03-03 20:06:52 +01:00
acp_groups.php [ticket/11602] Do not call localize_errors() if avatars are disabled 2013-06-11 14:54:22 +02:00
acp_icons.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
acp_inactive.php [ticket/11454] Use set_addresses in other applicable areas 2013-04-24 15:34:12 -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/8713] Call htmlspecialchars_decode() on transfer (e.g. ftp) passwords. 2012-09-08 14:42:38 +02:00
acp_logs.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +02:00
acp_main.php Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission 2013-03-03 20:06:52 +01:00
acp_modules.php [ticket/11465] Check if class exists before including info file 2013-04-14 17:25:45 +02:00
acp_permission_roles.php [ticket/11585] Make $auth_admin class property 2013-07-02 00:10:30 +05:30
acp_permissions.php [ticket/10758] Extract obtain_user_data for the benefit of tests. 2012-12-19 21:50:35 -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 [feature/php-events] Remove event core.acp_profile_field_edit 2012-08-05 14:50:33 +02:00
acp_prune.php Merge PR #1371 branch 'EXreaction/ticket/11236' into develop 2013-04-26 22:35:13 -04:00
acp_ranks.php [ticket/11259] htmlspecialchars($phpbb_admin_path) 2012-12-10 21:16:08 -06: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/11011] pass $auth to search backend constructor 2012-08-08 11:07:47 +05:30
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/11310] Add hashes to action links to prevent CSRF attacks 2013-03-12 17:19:30 +01:00
acp_update.php Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop 2013-05-20 11:55:33 -05:00
acp_users.php Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02: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