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
..
attachments.php	Merge branch 'develop-olympus' into develop	2012-05-31 11:55:12 +02:00
ban.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
board.php	[ticket/10771] fix remember me language	2012-12-02 15:40:25 +05:30
bots.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
common.php	Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11103	2012-12-13 19:21:29 -06:00
database.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
email.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
extensions.php	[ticket/10631] Use exceptions for errors. Build action list dynamically.	2012-09-01 15:05:34 +01:00
forums.php	[ticket/10650] Changed acp option from per forum to global	2012-04-08 10:34:44 +05:30
groups.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
index.htm	some bugfixes	2006-10-26 10:58:58 +00:00
language.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
modules.php	[ticket/9916] Updating header license and removing Version $Id$	2011-12-31 13:32:52 +00:00
permissions.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
permissions_phpbb.php	[ticket/10679] Add new permission for changing profile field information	2012-12-06 15:10:29 +01:00
posting.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
profile.php	Merge branch 'develop-olympus' into develop	2012-07-23 15:50:54 +02:00
prune.php	Merge remote-tracking branch 'upstream/develop' into feature/prune-users	2012-11-06 11:11:27 -05:00
search.php	[feature/sphinx-fulltext-search] use 9312 as default port	2012-07-27 11:10:04 +05:30
styles.php	[ticket/10161] all "e-mail" strings in language files changed to "email"	2012-04-15 20:10:51 +02:00
users.php	Merge branch 'develop-olympus' into develop	2012-07-21 16:15:42 +02:00