aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge PR #812 branch 'develop-olympus' into developOleg Pudeyev2012-05-211-4/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10565] Add line breaks to query in order to follow coding guidelines. [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
| * | | | Merge PR #812 branch 'bantu/ticket/10565' into develop-olympusOleg Pudeyev2012-05-211-4/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10565: [ticket/10565] Add line breaks to query in order to follow coding guidelines. [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clause
| | * | | | [ticket/10565] Add line breaks to query in order to follow coding guidelines.Andreas Fischer2012-05-221-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10565
| | * | | | [ticket/10565] update_forum_tracking_info(): Remove unnecessary GROUP BY clauseAndreas Fischer2012-05-221-2/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-10565
* | | | | Merge PR #808 branch 'develop-olympus' into developOleg Pudeyev2012-05-211-2/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10898] Do not write ?> into config.php to avoid whitespace output.
| * | | | [ticket/10898] Do not write ?> into config.php to avoid whitespace output.Andreas Fischer2012-05-181-2/+0
| |/ / / | | | | | | | | | | | | PHPBB3-10898
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-142-54/+164
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10605] Use database updater function _sql() instead of $db->sql_query() [ticket/10605] Put end of array on its own line because start of array is too. [ticket/10605] Add parameter documentation to phpbb_delete_user_pms [ticket/10605] Fix left join usage. [ticket/10605] Add a section for updating from 3.0.10 to schema updates. [ticket/10605] Fix syntax error in database updater. [ticket/10605] Reset user´s pm count to 0 when deleting his PMs [ticket/10605] Split query to be able to use indexes [ticket/10605] Rename $delete_rows to $delete_ids. [ticket/10605] Break long comment into multiple lines 80 chars short. [ticket/10605] Remove unnecessary $delete_ids array. [ticket/10605] Remove unnecessary array_keys calls on $delete_rows. [ticket/10605] Remove unused variable declarations. [ticket/10605] Turn $undelivered_user into a real array of counters. [ticket/10605] Use unset() instead of checking user_id over and over again. [ticket/10605] Prefix function with phpbb_ and use true instead of 1 [ticket/10605] Delete orphan private messages on update [ticket/10605] Check for orphan privmsgs when deleting a user
| * | | Merge branch 'ticket/10605' into develop-olympusAndreas Fischer2012-05-142-54/+164
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10605: [ticket/10605] Use database updater function _sql() instead of $db->sql_query() [ticket/10605] Put end of array on its own line because start of array is too. [ticket/10605] Add parameter documentation to phpbb_delete_user_pms [ticket/10605] Fix left join usage. [ticket/10605] Add a section for updating from 3.0.10 to schema updates. [ticket/10605] Fix syntax error in database updater. [ticket/10605] Reset user´s pm count to 0 when deleting his PMs [ticket/10605] Split query to be able to use indexes [ticket/10605] Rename $delete_rows to $delete_ids. [ticket/10605] Break long comment into multiple lines 80 chars short. [ticket/10605] Remove unnecessary $delete_ids array. [ticket/10605] Remove unnecessary array_keys calls on $delete_rows. [ticket/10605] Remove unused variable declarations. [ticket/10605] Turn $undelivered_user into a real array of counters. [ticket/10605] Use unset() instead of checking user_id over and over again. [ticket/10605] Prefix function with phpbb_ and use true instead of 1 [ticket/10605] Delete orphan private messages on update [ticket/10605] Check for orphan privmsgs when deleting a user Conflicts: phpBB/install/database_update.php
| | * | [ticket/10605] Add parameter documentation to phpbb_delete_user_pmsJoas Schilling2012-04-131-0/+4
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Reset user´s pm count to 0 when deleting his PMsJoas Schilling2012-03-271-1/+11
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Split query to be able to use indexesJoas Schilling2012-03-271-3/+31
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Rename $delete_rows to $delete_ids.Andreas Fischer2012-03-271-9/+9
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Break long comment into multiple lines 80 chars short.Andreas Fischer2012-03-271-1/+2
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Remove unnecessary $delete_ids array.Andreas Fischer2012-03-271-5/+3
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Remove unnecessary array_keys calls on $delete_rows.Andreas Fischer2012-03-271-3/+3
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Remove unused variable declarations.Andreas Fischer2012-03-271-1/+0
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Turn $undelivered_user into a real array of counters.Andreas Fischer2012-03-271-4/+12
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Use unset() instead of checking user_id over and over again.Andreas Fischer2012-03-271-5/+1
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Prefix function with phpbb_ and use true instead of 1Joas Schilling2012-03-122-4/+4
| | | | | | | | | | | | | | | | PHPBB3-10605
| | * | [ticket/10605] Check for orphan privmsgs when deleting a userJoas Schilling2012-02-182-54/+120
| | | | | | | | | | | | | | | | | | | | | | | | Also moved the hole code into a new function. PHPBB3-10605
* | | | [ticket/10893] Update the usage of ComposerJoseph Warner2012-05-131-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes 'vendor/.composer/autoload.php' to 'vendor/autoload.php' as per the change in the way that composer works as noted https://groups.google.com/forum/#!msg/composer-dev/fWIs3KocwoA/nU3aLko9LhQJ PHPBB3-10893
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-094-104/+43
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10858] Move generic row seeking to DBAL [ticket/10858] Tests for row seeking with fetchfield() [ticket/10858] Fix MSSQL Native's row seeking behavior Conflicts: tests/dbal/select_test.php
| * | | [ticket/10858] Move generic row seeking to DBALPatrick Webster2012-05-084-129/+43
| | | | | | | | | | | | | | | | | | | | | | | | Removed from: firebird, mssql_odbc, and mssqlnative PHPBB3-10858
| * | | [ticket/10858] Fix MSSQL Native's row seeking behaviorPatrick Webster2012-05-081-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | The result_mssqlnative class remains in case someone wants to use it PHPBB3-10858
* | | | Merge remote-tracking branch 'brunoais/ticket/10871' into developAndreas Fischer2012-05-041-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10871: [ticket/10871] Delete the unwanted implode
| * | | | [ticket/10871] Delete the unwanted implodeBruno Ais2012-05-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted the implode that had no reason to be there PHPBB3-10871
* | | | | Merge remote-tracking branch 'Senky/ticket/10847' into developAndreas Fischer2012-05-012-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10847: [ticket/10847] fixing all misspelled "dependant" to "dependent"
| * | | | | [ticket/10847] fixing all misspelled "dependant" to "dependent"Senky2012-04-302-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10847
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | * develop-olympus: [ticket/10846] fixing SQL query bug in acp_main.php
| * | | | [ticket/10846] fixing SQL query bug in acp_main.phpSenky2012-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10846
* | | | | Merge PR #731 branch 'VSEphpbb/ticket/10779' into developOleg Pudeyev2012-04-251-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * VSEphpbb/ticket/10779: [ticket/10779] Move jQuery CDN option to Load Settings
| * | | | [ticket/10779] Move jQuery CDN option to Load SettingsMatt Friedman2012-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-10779 PHPBB3-10779
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-211-0/+10
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10492] Fix line endings [ticket/10492] Backporting functional tests [ticket/10492] Separate config generation from the installer Conflicts: phpBB/includes/functions_install.php phpunit.xml.functional tests/bootstrap.php tests/test_framework/phpbb_functional_test_case.php tests/test_framework/phpbb_test_case_helpers.php
| * | | | [ticket/10492] Separate config generation from the installerPatrick Webster2012-04-201-0/+52
| | | | | | | | | | | | | | | | | | | | PHPBB3-10492
| * | | | Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympusNils Adermann2012-04-201-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
* | \ \ \ \ Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-192-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shibulijack/ticket/10688: [ticket/10688] Update install.html for 3.1 and current practices. [ticket/10688] Update readme for 3.1 and current practices. [ticket/10688] Changed version 3.0 to 3.1 [ticket/10688] Updated version to 3.1 [ticket/10688] Changed 3.0 to 3.1 in docs Conflicts: phpBB/docs/INSTALL.html phpBB/docs/README.html
| * | | | | | [ticket/10688] Updated version to 3.1Shibu Lijack2012-04-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace phpBB 3.0.x to phpBB 3.1.x PHPBB-10688
* | | | | | | Merge remote-tracking branch 'github-dhruv/ticket/10797' into developNils Adermann2012-04-201-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
| * | | | | | [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When warning a user in MCP, the user's rank title and image are displayed. language key user rank also added. PHPBB3-10797
* | | | | | | [ticket/10756] Fixing variable declarations in style and template classesVjacheslav Trushkin2012-04-193-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variable declaration, removing function from template locator that does not belong there PHPBB3-10756
* | | | | | | [ticket/10756] Renaming phpbb_style_template to phpbb_templateVjacheslav Trushkin2012-04-196-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming phpbb_style_template to phpbb_template PHPBB3-10756
* | | | | | | [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-193-11/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing path provider from template class because it is not used by template class PHPBB3-10756
* | | | | | | [ticket/10756] Creating locator interfaceVjacheslav Trushkin2012-04-193-5/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating locator interface to be used in template class PHPBB3-10756
* | | | | | | [ticket/10756] Renaming template classesVjacheslav Trushkin2012-04-198-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming template classes from phpbb_style_template_ to phpbb_template_ PHPBB3-10756
* | | | | | | [ticket/10756] Moving template classesVjacheslav Trushkin2012-04-196-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving template class files from includes/style/ to includes/template/ and removing template_ file prefix PHPBB3-10756
* | | | | | | Merge remote-tracking branch 'github-cyberalien/ticket/10762' into developNils Adermann2012-04-191-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-cyberalien/ticket/10762: [ticket/10762] Check for phpbb_version when installing style [ticket/10762] Changing version format in style.cfg
| * | | | | | | [ticket/10762] Check for phpbb_version when installing styleVjacheslav Trushkin2012-04-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if phpbb_version exists when installing style. Do not warn users about installing outdated styles yet, that part of acp_styles will be changed in different branch. PHPBB3-10762
* | | | | | | | [ticket/10783] Correctly add assets_version config var to includejs urlsNils Adermann2012-04-132-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10783
* | | | | | | | Merge remote-tracking branch 'github-callumacrae/ticket/10783' into developNils Adermann2012-04-132-4/+7
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-callumacrae/ticket/10783: [ticket/10783] Added assets_version to ACP and simple_*.html. [ticket/10783] Added assets_version to subsilver2. [ticket/10783] Added ?assets_version to assets.
| * | | | | | | [ticket/10783] Added ?assets_version to assets.Callum Macrae2012-04-112-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10783