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
..
bbcode	Merge branch 'develop-olympus' into develop	2012-07-08 23:10:42 +02:00
cache	Merge remote-tracking branch 'p/ticket/9983' into develop	2012-12-04 14:06:15 +01:00
class_loader	[ticket/10973] Drop all require_once for mocks. Use autoloading.	2012-07-08 22:57:23 +02:00
compress	[ticket/11109] Re-add file conflict checks to compress class	2012-09-14 01:26:33 +02:00
config	[ticket/10973] Drop all require_once for mocks. Use autoloading.	2012-07-08 22:57:23 +02:00
controller	[feature/controller] Reword comment for clarification	2012-11-16 17:05:57 -05:00
cron	[feature/compiled-dic] Remove old test	2012-11-10 12:02:55 +01:00
datetime	[feature/new-tz-handling] Fix unit test	2012-07-18 17:16:34 +02:00
dbal	[ticket/11015] Convert connect test to the new syntax.	2012-12-13 08:09:32 -05:00
di	[ticket/11015] Fixup some things from the big merge	2012-11-12 11:16:39 +01:00
download	[ticket/10973] Drop all require_once for mocks. Use autoloading.	2012-07-08 22:57:23 +02:00
event	[feature/compiled-dic] Compile the DI Container into a cached class	2012-11-10 11:40:09 +01:00
extension	[ticket/10933] Dependency inject template context.	2012-11-02 18:51:35 -04:00
fixtures	[ticket/10205] Add some columns to the empty fixture file for mssqlnative.	2012-12-04 19:00:42 -05:00
functional	[ticket/10975] Add a test for viewing a profile.	2012-12-13 07:41:24 -05:00
functions	[ticket/11015] Fix 3.0 to 3.1 dbms conversion for mysqli.	2012-12-13 19:15:24 -05:00
functions_acp	[feature/php-events] Add mock for unit tests and create it were needed	2012-08-11 15:25:14 +02:00
group_positions	[ticket/10733] Removing static from data providers	2012-04-01 19:14:53 +03:00
lock	[ticket/10103] Assert with messages.	2012-12-04 13:50:35 -05:00
mock	Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103	2012-12-12 16:30:50 -06:00
network	[ticket/9916] Updating license in non-distributed files	2012-01-02 19:10:36 +01:00
notification	[ticket/11103] Use scope: prototype	2012-12-09 13:43:06 -06:00
privmsgs	[ticket/11103] Instantiate $phpbb_notifications as needed	2012-12-13 19:19:40 -06:00
profile	[ticket/9916] Updating License in the header	2012-01-02 16:18:32 +00:00
random	[ticket/9916] Updating License in the header	2012-01-02 16:18:32 +00:00
regex	[ticket/10162] Add test cases for top level domain names longer than 6 chars.	2012-05-30 21:11:17 +02:00
request	Merge remote-tracking branch 'Fyorl/ticket/10939' into develop	2012-11-10 23:49:29 +01:00
search	[ticket/11255] Change search tests to use mock cache.	2012-12-07 15:32:26 -05:00
security	[ticket/11159] static public is the currently approved order.	2012-11-06 10:41:06 -05:00
session	[ticket/11248] Line endings to LF.	2012-12-05 20:11:00 -05:00
template	[feature/template-events] Test for event that is defined in parent style only.	2012-11-17 16:42:44 -05:00
test_framework	[ticket/11015] Installer still needs 3.0-style dbms name.	2012-12-13 17:49:30 -05:00
text_processing	[ticket/11159] static public is the currently approved order.	2012-11-06 10:41:06 -05:00
tmp	[ticket/10309] Update .gitignore and move .gitkeep.	2011-08-20 14:34:02 -04:00
upload	[ticket/10939] Modified fileupload tests to deal with new behaviour	2012-08-15 15:56:43 +01:00
user	[ticket/11103] Some improvements to the user loader	2012-12-08 18:40:41 -06:00
utf	[ticket/11159] static public is the currently approved order.	2012-11-06 10:41:06 -05:00
wrapper	[ticket/10931] Also test get_bytes() and get_string() with false.	2012-06-11 15:46:03 +02:00
bootstrap.php	[feature/add_events] Re-fix broken test	2012-08-21 11:18:53 -04:00
error_collector_test.php	[ticket/9916] Updating License in the header	2012-01-02 16:18:32 +00:00
lint_test.php	[ticket/10716] Collect standard error from executed php process.	2012-12-04 18:52:27 -05:00
RUNNING_TESTS.txt	Merge remote-tracking branch 'upstream/develop' into ticket/11015	2012-12-06 21:49:24 -05:00