Nathan Guse d64eb0e575 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103 ...

# By Oleg Pudeyev (21) and others
# Via Andreas Fischer (7) and others
* 'develop' of github.com:phpbb/phpbb3: (56 commits)
  [ticket/11015] Move comment in the right place.
  [ticket/11015] Correctly transform 'mysqli' etc. in phpbb_convert_30_dbms_to_31
  [ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.
  [ticket/11015] Change permission adding in database updater to new style.
  [ticket/11015] Change more docblocks to phpbb_db_driver.
  [ticket/11015] Installer still needs 3.0-style dbms name.
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11015] Include functions.php because it is not always included.
  [ticket/11265] Add assertions for board installation success.
  [ticket/11263] Fix PHP Notice: Undefined variable: extension_manager
  [ticket/11015] Convert database drivers to new spelling in post setup sync.
  [ticket/11015] Convert connect test to the new syntax.
  [ticket/11015] Restore whitespace to avoid conflict when merging develop.
  [ticket/10975] Add a test for viewing a profile.
  [ticket/10975] Test restricting by first character.
  [ticket/10975] Avoid rewriting global config twice.
  [ticket/10975] Test memberlist, not user creation.
  [ticket/10975] Some quick tests to check the memberlist behaviour
  [ticket/10491] Make recreate_database static.
  [ticket/11088] Pass required objects in as arguments
  ...

Conflicts:
	phpBB/install/database_update.php

2012-12-13 19:21:29 -06:00

..

info

[ticket/11088] Move style, extension and language pack management to customise

2012-12-12 11:39:14 -05: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/11103] ACP option to enable/disable notifications output in header

2012-10-05 13:43:03 -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/php-events] Fix acp_manage_forums_update_data_before and is_new_forum

2012-08-18 20:32:58 +02:00

acp_groups.php

Merge remote-tracking branch 'Fyorl/ticket/10939' into develop

2012-11-10 23:49:29 +01: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 branch 'develop-olympus' into develop

2012-11-09 23:47:07 +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

[ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968

2012-10-17 23:34:37 +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