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
Joas Schilling 948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop 
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
2012-11-10 12:27:19 +01:00
..
info [ticket/10631] Fix so it installs the module in the correct place 2012-09-01 15:05:10 +01:00
acp_attachments.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +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 [ticket/11021] Add the option to specify a Site home URL and text 2012-07-22 22:26:38 -05:00
acp_bots.php [ticket/10990] Changes for develop 2012-07-22 14:48:39 -05:00
acp_captcha.php [ticket/11157] get_captcha_types is an instance method. 2012-10-29 14:48:42 -04: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 [ticket/10631] Fix a spelling typo 2012-09-01 17:32:59 +02:00
acp_forums.php [feature/soft-delete] Fix the rest of *_approved and the delete_post unit test 2012-11-10 11:24:52 +01:00
acp_groups.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +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 Merge remote-tracking branch 'upstream/develop' into feature/prune-users 2012-11-06 11:11:27 -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 remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop 2012-11-10 12:27:19 +01: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 [feature/php-events] Remove event core.acp_profile_field_edit 2012-08-05 14:50:33 +02:00
acp_prune.php Merge remote-tracking branch 'upstream/develop' into feature/prune-users 2012-11-06 11:11:27 -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/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/11041] Correctly import PHP file extension from global space. 2012-08-02 12:38:49 +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 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop 2012-11-10 12:27:19 +01: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