aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11465] Use extension finder when adding extensions' acp modulesMarc Alexander2013-03-211-47/+25
| | | | | | | | | | | | | The method acp_modules::get_module_infos() needs to use the extension finder whenever it is looking for a module's info file. While transitioning to the new extension system, only the initial search for all module info files was changed to the new system. Due to this it is not possible to add an extension's acp/mcp/ucp module manually in the ACP. This patch will always use the extension finder for the acp module's info files and therefore properly find the needed file. Additionally, the code has been cleaned up a little bit. PHPBB3-11465
* Merge PR #1298 branch 'nickvergessen/ticket/11438' into developOleg Pudeyev2013-03-203-70/+41
|\ | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11438: [ticket/11438] Add spaces after # comment start and before \ line breaks [ticket/11438] Add helpful comments from sample config to ACP output [ticket/11438] Add empty sql_query_pre to delta-source [ticket/11438] Move backslash to concatenate the query strings correctly [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
| * [ticket/11438] Add spaces after # comment start and before \ line breaksJoas Schilling2013-03-163-38/+38
| | | | | | | | PHPBB3-11438
| * [ticket/11438] Add helpful comments from sample config to ACP outputJoas Schilling2013-03-151-3/+3
| | | | | | | | PHPBB3-11438
| * [ticket/11438] Add empty sql_query_pre to delta-sourceJoas Schilling2013-03-151-0/+1
| | | | | | | | PHPBB3-11438
| * [ticket/11438] Move backslash to concatenate the query strings correctlyJoas Schilling2013-03-151-60/+30
| | | | | | | | | | | | Was broken in 03d2c6413c25b1faf7f37ff20625ce986b19eb88 PHPBB3-11438
| * [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()Joas Schilling2013-03-151-1/+1
| | | | | | | | PHPBB3-11438
* | Merge remote-tracking branch 'bantu/ticket/11457' into developJoas Schilling2013-03-181-5/+0
|\ \ | | | | | | | | | | | | * bantu/ticket/11457: [ticket/11457] Remove check and include for set_var function. It's not used.
| * | [ticket/11457] Remove check and include for set_var function. It's not used.Andreas Fischer2013-03-171-5/+0
| | | | | | | | | | | | PHPBB3-11457
* | | Merge remote-tracking branch 'bantu/ticket/11455' into developJoas Schilling2013-03-181-2/+2
|\ \ \ | |/ / |/| | | | | | | | * bantu/ticket/11455: [ticket/11455] Restore alphabetic order (underscore first) in config/tables.yml
| * | [ticket/11455] Restore alphabetic order (underscore first) in config/tables.ymlAndreas Fischer2013-03-171-2/+2
|/ / | | | | | | PHPBB3-11455
* | Merge remote-tracking branch 'nickvergessen/ticket/11443' into developAndreas Fischer2013-03-162-1/+6
|\ \ | | | | | | | | | | | | | | | * nickvergessen/ticket/11443: [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log object [ticket/11443] Add _test suffix to migration test filenames
| * | [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log objectJoas Schilling2013-03-161-1/+6
| | | | | | | | | | | | PHPBB3-11443
| * | [ticket/11443] Add _test suffix to migration test filenamesJoas Schilling2013-03-152-0/+0
| |/ | | | | | | PHPBB3-11443
* | Merge remote-tracking branch 'bantu/ticket/11441' into developJoas Schilling2013-03-152-49/+63
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11441: [ticket/11441] Split user loader tests into multiple test methods. [ticket/11441] Use setUp() in phpbb_user_loader_test. [ticket/11441] Update/correct copyright year of user loader test. [ticket/11441] Correct/fix class name of user loader test. [ticket/11441] Add _test prefix to user loader test filename.
| * | [ticket/11441] Split user loader tests into multiple test methods.Andreas Fischer2013-03-151-2/+9
| | | | | | | | | | | | PHPBB3-11441
| * | [ticket/11441] Use setUp() in phpbb_user_loader_test.Andreas Fischer2013-03-151-10/+17
| | | | | | | | | | | | PHPBB3-11441
| * | [ticket/11441] Update/correct copyright year of user loader test.Andreas Fischer2013-03-151-1/+1
| | | | | | | | | | | | PHPBB3-11441
| * | [ticket/11441] Correct/fix class name of user loader test.Andreas Fischer2013-03-151-1/+1
| | | | | | | | | | | | PHPBB3-11441
| * | [ticket/11441] Add _test prefix to user loader test filename.Andreas Fischer2013-03-151-0/+0
| | | | | | | | | | | | PHPBB3-11441
* | | Merge remote-tracking branch 'bantu/ticket/11439' into developJoas Schilling2013-03-151-0/+0
|\ \ \ | |/ / |/| | | | | | | | * bantu/ticket/11439: [ticket/11439] Add _test suffix to notification test filename.
| * | [ticket/11439] Add _test suffix to notification test filename.Andreas Fischer2013-03-151-0/+0
|/ / | | | | | | PHPBB3-11439
* | Merge remote-tracking branch 'remotes/Marc/ticket/11404' into developNathan Guse2013-03-122-90/+177
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11404: [ticket/11404] Remove version ID from manager_test.php file header [ticket/11404] Add tests for phpbb_avatar_manager::clean_row() [ticket/11404] Convert manager_test to UNIX line endings [ticket/11404] Use a default data row if $row is empty in clean_row() [ticket/11404] Return empty array of avatar data if $row is empty
| * | [ticket/11404] Remove version ID from manager_test.php file headerMarc Alexander2013-03-111-1/+0
| | | | | | | | | | | | PHPBB3-11404
| * | [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()Marc Alexander2013-03-111-0/+71
| | | | | | | | | | | | PHPBB3-11404
| * | [ticket/11404] Convert manager_test to UNIX line endingsMarc Alexander2013-03-111-90/+90
| | | | | | | | | | | | PHPBB3-11404
| * | [ticket/11404] Use a default data row if $row is empty in clean_row()Marc Alexander2013-03-071-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | A statically defined $default_row will be used inside the phpbb_avatar_manager::clean_row() method if the $row passed to it is empty. PHPBB3-11404
| * | [ticket/11404] Return empty array of avatar data if $row is emptyMarc Alexander2013-03-061-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While creating a group in the acp, the group data ($group_row) is empty. Due to that array_combine in phpbb_avatar_manager::clean_row() will cause PHP Warnings. In addition to that the required indexes 'avatar', 'avatar_width', 'avatar_height', and 'avatar_type' won't be defined. This patch will solve that issue. PHPBB3-11404
* | | Merge remote-tracking branch 'remotes/Marc/ticket/11433' into developNathan Guse2013-03-121-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/Marc/ticket/11433: [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
| * | | [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"Marc Alexander2013-03-121-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | This missing change caused the loading info to appear during ajax requests. With this patch it will be properly hidden as it should. PHPBB3-11433
* | | Merge remote-tracking branch 'remotes/nickv/ticket/11310' into developNathan Guse2013-03-121-6/+15
|\ \ \ | |/ / |/| | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11310: [ticket/11310] Add hashes to action links to prevent CSRF attacks
| * | [ticket/11310] Add hashes to action links to prevent CSRF attacksJoas Schilling2013-03-121-6/+15
|/ / | | | | | | PHPBB3-11310
* | Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into developNathaniel Guse2013-03-095-4/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv # Via Dhruv * remotes/dhruv/ticket/11303: [ticket/11303] rename attribute to timezone-preselect [ticket/11303] remove additional brackets [ticket/11303] use S_TZ_PRESELECT in subsilver [ticket/11303] add S_TZ_PRESELECT template var
| * | [ticket/11303] rename attribute to timezone-preselectDhruv2013-02-174-4/+4
| | | | | | | | | | | | PHPBB3-11303
| * | [ticket/11303] remove additional bracketsDhruv2013-02-121-1/+1
| | | | | | | | | | | | PHPBB3-11303
| * | [ticket/11303] use S_TZ_PRESELECT in subsilverDhruv2013-02-121-1/+1
| | | | | | | | | | | | PHPBB3-11303
| * | [ticket/11303] add S_TZ_PRESELECT template varDhruv2013-02-082-1/+2
| | | | | | | | | | | | | | | | | | | | | add a new template variable to check if timezone has already been selected by the user while registeration. PHPBB3-11303
* | | Merge remote-tracking branch 'remotes/marc/ticket/11323' into developNathaniel Guse2013-03-092-4/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * remotes/marc/ticket/11323: [ticket/11323] Reduce additional code and revert regex to previous one [ticket/11323] Enable tests for inclusion of defined variables [ticket/11323] Correctly treat variables in template defines
| * | | [ticket/11323] Reduce additional code and revert regex to previous oneMarc Alexander2013-02-261-7/+12
| | | | | | | | | | | | | | | | PHPBB3-11323
| * | | [ticket/11323] Enable tests for inclusion of defined variablesMarc Alexander2013-02-191-3/+0
| | | | | | | | | | | | | | | | PHPBB3-11323
| * | | [ticket/11323] Correctly treat variables in template definesMarc Alexander2013-02-191-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, any template variables that were used when defining a variable were treated as strings. This is a regression to phpBB 3.0. With this patch the template variables will be properly parsed. PHPBB3-11323
* | | | Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into developNathaniel Guse2013-03-091-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By OpenShift guest # Via OpenShift guest * remotes/Blitze/ticket/11383: [ticket/11383] Correctly revert modules added/removed by migrator
| * | | | [ticket/11383] Correctly revert modules added/removed by migratorOpenShift guest2013-03-031-0/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11383
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11423' into developDavid King2013-03-092-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathaniel Guse # Via Nathaniel Guse * EXreaction/ticket/11423: [ticket/11423] Send unformatted usernames to the email template
| * | | | | [ticket/11423] Send unformatted usernames to the email templateNathaniel Guse2013-03-092-2/+2
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11423
* | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11421' into developNathan Guse2013-03-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11421: [ticket/11421] Correctly display submit button when needed
| * | | | | [ticket/11421] Correctly display submit button when neededJoas Schilling2013-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11421
* | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11417' into developNathan Guse2013-03-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11417: [ticket/11417] FIx submit button description on notifications options page
| * | | | | | [ticket/11417] FIx submit button description on notifications options pageJoas Schilling2013-03-071-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11417
* | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/11390' into developNathan Guse2013-03-071-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/11390: [ticket/11390] Correctly separate list of notifications from header [ticket/11390] Hide pagination when there are no notifications