forums - The forums.mageia.org Website

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	Merge PR #1130 branch 'EXreaction/ticket/11259' into develop	Oleg Pudeyev	2012-12-29	19	-49/+63
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* EXreaction/ticket/11259: [ticket/11259] htmlspecialchars($phpbb_admin_path) [ticket/11259] adm_relative_path -> phpbb_adm_relative_path [ticket/11259] Also make adm_relative_path available in the container [ticket/11259] Make phpbb_admin_path available everywhere Conflicts: phpBB/install/index.php phpBB/install/install_update.php
\| * \| \| \| \| \| \|	[ticket/11259] htmlspecialchars($phpbb_admin_path)	Nathan Guse	2012-12-10	5	-22/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11259
\| * \| \| \| \| \| \|	[ticket/11259] adm_relative_path -> phpbb_adm_relative_path	Nathan Guse	2012-12-09	6	-16/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We can assume they properly format their config settings, right? PHPBB3-11259
\| * \| \| \| \| \| \|	[ticket/11259] Also make adm_relative_path available in the container	Nathan Guse	2012-12-09	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11259
\| * \| \| \| \| \| \|	[ticket/11259] Make phpbb_admin_path available everywhere	Nathan Guse	2012-12-09	16	-32/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11259
* \| \| \| \| \| \| \|	Merge PR #1162 branch 'develop-olympus' into develop	Oleg Pudeyev	2012-12-29	1	-9/+33
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# By Andreas Fischer # Via Andreas Fischer (1) and Oleg Pudeyev (1) * develop-olympus: [ticket/11291] phing: Also add checkreturn="true" to composer execution. [ticket/11291] phing: Add checkreturn="true" to all new commands. [ticket/11291] phing: Exclude vendor folder from diffs. [ticket/11291] phing packaging: Export composer.phar and install dependencies. [ticket/11291] phing: Remove no longer needed create-package target. [ticket/11291] phing: The package target does not depend on composer. [ticket/11291] phing: Adjust directory format of composer exec. [ticket/11291] phing: Add description for composer target. [ticket/11291] phing: Add --dev to composer install. [ticket/11291] phing: Correct dependencies of composer target. [ticket/11291] phing: Make sure composer is available before calling it.
\| * \| \| \| \| \| \|	Merge PR #1162 branch 'bantu/ticket/11291' into develop-olympus	Oleg Pudeyev	2012-12-29	1	-9/+33
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11291: [ticket/11291] phing: Also add checkreturn="true" to composer execution. [ticket/11291] phing: Add checkreturn="true" to all new commands. [ticket/11291] phing: Exclude vendor folder from diffs. [ticket/11291] phing packaging: Export composer.phar and install dependencies. [ticket/11291] phing: Remove no longer needed create-package target. [ticket/11291] phing: The package target does not depend on composer. [ticket/11291] phing: Adjust directory format of composer exec. [ticket/11291] phing: Add description for composer target. [ticket/11291] phing: Add --dev to composer install. [ticket/11291] phing: Correct dependencies of composer target. [ticket/11291] phing: Make sure composer is available before calling it.
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: Also add checkreturn="true" to composer execution.	Andreas Fischer	2012-12-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: Add checkreturn="true" to all new commands.	Andreas Fischer	2012-12-29	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: Exclude vendor folder from diffs.	Andreas Fischer	2012-12-29	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Otherwise we end up with very huge diffs and the build process is severely slowed down. PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing packaging: Export composer.phar and install dependencies.	Andreas Fischer	2012-12-29	1	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: Remove no longer needed create-package target.	Andreas Fischer	2012-12-29	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: The package target does not depend on composer.	Andreas Fischer	2012-12-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The packaging process does not require running composer in the phpBB tree. It does however require running composer on the git exports, but this is not what the composer target does. PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: Adjust directory format of composer exec.	Andreas Fischer	2012-12-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust the directory format to what all the other exec calls are using. PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: Add description for composer target.	Andreas Fischer	2012-12-29	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: Add --dev to composer install.	Andreas Fischer	2012-12-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The composer target runs composer in the phpBB tree in order to load dependencies for testing. The testing framework may have additional development dependencies (e.g. goutte). We also have to load those. PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: Correct dependencies of composer target.	Andreas Fischer	2012-12-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This command runs composer in the phpBB tree and does not write to the build folders. Thus, it does not have to depend on prepare and clean targets. PHPBB3-11291
\| \| * \| \| \| \| \| \|	[ticket/11291] phing: Make sure composer is available before calling it.	Andreas Fischer	2012-12-23	1	-3/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Older versions of the tree didn't use it. PHPBB3-11291
* \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'p/ticket/11294-develop' into develop	Andreas Fischer	2012-12-27	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* p/ticket/11294-develop: [ticket/11294] Update required/optional extension list for develop.
\| * \| \| \| \| \| \| \| \|	[ticket/11294] Update required/optional extension list for develop.	Oleg Pudeyev	2012-12-27	1	-0/+3
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11294
* \| \| \| \| \| \| \| \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2012-12-26	1	-2/+19
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-olympus: [ticket/11294] Capitalize phpunit. [ticket/11294] Update required/optional extension list for olympus.
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'p/ticket/11294' into develop-olympus	Andreas Fischer	2012-12-26	1	-2/+19
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* p/ticket/11294: [ticket/11294] Capitalize phpunit. [ticket/11294] Update required/optional extension list for olympus.
\| \| * \| \| \| \| \| \|	[ticket/11294] Capitalize phpunit.	Oleg Pudeyev	2012-12-26	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11294
\| \| * \| \| \| \| \| \|	[ticket/11294] Update required/optional extension list for olympus.	Oleg Pudeyev	2012-12-25	1	-1/+18
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-11294
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'p/ticket/10758' into develop	Andreas Fischer	2012-12-25	11	-50/+245
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* p/ticket/10758: [ticket/10758] Add return to the other compat function. [ticket/10758] Add periods. [ticket/10758] Yes, only one empty line. [ticket/10758] Add deprecated tags. [ticket/10758] Add compat functions. [ticket/10758] Admin is not working yet. [ticket/10758] Test moderator and admin permissions. [ticket/10758] Check that acl was changed in the test. [ticket/10758] Extract obtain_user_data for the benefit of tests. [ticket/10758] Functional test for changing a user's permission. [ticket/10758] Spelling fix. [ticket/10758] Add a test for acp login. [ticket/10758] Dependency inject parameters into update_foes. [ticket/10758] Dependency inject parameters into cache_moderators.
\| * \| \| \| \| \| \|	[ticket/10758] Add return to the other compat function.	Oleg Pudeyev	2012-12-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Add periods.	Oleg Pudeyev	2012-12-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Yes, only one empty line.	Oleg Pudeyev	2012-12-22	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Add deprecated tags.	Oleg Pudeyev	2012-12-20	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Add compat functions.	Oleg Pudeyev	2012-12-20	1	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Admin is not working yet.	Oleg Pudeyev	2012-12-19	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Test moderator and admin permissions.	Oleg Pudeyev	2012-12-19	1	-5/+60
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Check that acl was changed in the test.	Oleg Pudeyev	2012-12-19	1	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Extract obtain_user_data for the benefit of tests.	Oleg Pudeyev	2012-12-19	2	-6/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Functional test for changing a user's permission.	Oleg Pudeyev	2012-12-15	1	-0/+53
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Spelling fix.	Oleg Pudeyev	2012-12-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Add a test for acp login.	Oleg Pudeyev	2012-12-15	2	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Dependency inject parameters into update_foes.	Oleg Pudeyev	2012-12-15	3	-8/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
\| * \| \| \| \| \| \|	[ticket/10758] Dependency inject parameters into cache_moderators.	Oleg Pudeyev	2012-12-15	7	-33/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also add phpbb prefix since the signature is being changed anyway. PHPBB3-10758
* \| \| \| \| \| \| \|	[develop] Set build version (and thus package name) to 3.1.0-dev.	Andreas Fischer	2012-12-23	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'develop-olympus' into develop	Andreas Fischer	2012-12-23	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-olympus: [develop-olympus] Set build version (and thus package name) to 3.0.12-dev.
\| * \| \| \| \| \| \|	[develop-olympus] Set build version (and thus package name) to 3.0.12-dev.	Andreas Fischer	2012-12-23	1	-3/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is so generated packages are not confused with the already-released 3.0.11 version.
* \| \| \| \| \| \|	Merge PR #1152 branch 'develop-olympus' into develop	Oleg Pudeyev	2012-12-22	1	-17/+30
\|\ \ \ \ \ \ \ \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* develop-olympus: [ticket/11278] Comment out the code for dropping the Q&A tables [ticket/11278] Fix not running queries from db tools in database update Conflicts: phpBB/install/database_update.php
\| * \| \| \| \| \|	Merge PR #1152 branch 'nickvergessen/ticket/11278' into develop-olympus	Oleg Pudeyev	2012-12-22	1	-17/+30
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* nickvergessen/ticket/11278: [ticket/11278] Comment out the code for dropping the Q&A tables [ticket/11278] Fix not running queries from db tools in database update
\| \| * \| \| \| \| \|	[ticket/11278] Comment out the code for dropping the Q&A tables	Joas Schilling	2012-12-21	1	-6/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Due to a bug, vanilla phpbb could not create captcha tables in 3.0.8 on firebird. It was possible for board administrators to adjust the code to work. If code was manually adjusted by board administrators, index names would not be the same as what 3.0.9 and newer expect. This code fragment drops captcha tables, destroying all entered Q&A captcha configuration, such that when Q&A is configured next the respective tables will be created with corrent index names. If you wish to preserve your Q&A captcha configuration, you can manually rename indexes to the currently expected name: phpbb_captcha_questions_lang_iso => phpbb_captcha_question_lang phpbb_captcha_answers_question_id => phpbb_captcha_answers_qid Again, this needs to be done only if a board was manually modified to fix broken captcha code. PHPBB3-11278
\| \| * \| \| \| \| \|	[ticket/11278] Fix not running queries from db tools in database update	Joas Schilling	2012-12-19	1	-13/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The db_tools class is running in return mode, which means that the queries are not run, but just returned. Therefor the broken tables were not removed from the database. PHPBB3-11278
* \| \| \| \| \| \| \|	Merge remote-tracking branch 'p/ticket/10758-upload' into develop	Andreas Fischer	2012-12-22	2	-1/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* p/ticket/10758-upload: [ticket/10758-upload] Mark tests that don't work incomplete. [ticket/10758-upload] Convert error to a failure.
\| * \| \| \| \| \| \| \|	[ticket/10758-upload] Mark tests that don't work incomplete.	Oleg Pudeyev	2012-12-21	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
\| * \| \| \| \| \| \| \|	[ticket/10758-upload] Convert error to a failure.	Oleg Pudeyev	2012-12-20	2	-1/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PHPBB3-10758
* \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'p/ticket/11248' into develop	Andreas Fischer	2012-12-22	3	-1796/+1826
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* p/ticket/11248: [ticket/11248] Convert line endings to LF - develop edition.