aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-06-114-6/+120
|\ | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * [3.1.x] Increase dev version to 3.1.6-devJoas Schilling2015-06-112-2/+2
| |
| * [ticket/13823] Move the part of the query, so the update will get it correctlyJoas Schilling2015-06-091-5/+5
| | | | | | | | PHPBB3-13823
| * [prep-release-3.1.5] Add changelog for 3.1.5-RC1Joas Schilling2015-06-091-0/+83
| |
| * [prep-release-3.1.5] Add migration for 3.1.5-RC1Joas Schilling2015-06-091-0/+31
| |
| * [prep-release-3.1.5] Update version to 3.1.5-RC1Joas Schilling2015-06-095-7/+7
| |
* | Merge branch '3.1.x'Andreas Fischer2015-06-091-1/+5
|\ \ | | | | | | | | | | | | | | | * 3.1.x: [ticket/13923] CS [ticket/13923] Update startup.php
| * \ Merge pull request #3685 from Nicofuma/ticket/13923Andreas Fischer2015-06-091-1/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13923] Update startup.php * Nicofuma/ticket/13923: [ticket/13923] CS [ticket/13923] Update startup.php
| | * | [ticket/13923] CSTristan Darricau2015-06-091-1/+1
| | | | | | | | | | | | | | | | PHPBB3-13923
| | * | [ticket/13923] Update startup.phpAJ Quick2015-06-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While suppressing the output from the 'set_magic_quotes_runtime(0)' is sufficient with normal phpBB installs, using this file in association with the oauth plugin will cause an error on some versions of PHP. This fixes a potential bug where set_magic_quotes_runtime is depreciated in newer versions of PHP. PHPBB3-13923
| * | | Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-0910-19/+19
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930: [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
* | | | Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-098-14/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13930] Check for correct spacing between keyword & parenthesis * marc1706/ticket/13930-master: [ticket/13930] Add missing space to mssql_extractor [ticket/13930] Add missing spaces to code [ticket/13930] Use OpeningParenthesisSniff in legacy ruleset [ticket/13930] Remove not needed return statements [ticket/13930] Add missing spaces to code [ticket/13930] Check for correct spacing between keyword & parenthesis
| * | | | [ticket/13930] Add missing space to mssql_extractorMarc Alexander2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13930
| * | | | Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-087-13/+13
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php
| | * | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-086-15/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-13930
| | * | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-074-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-13930
* | | | | Merge branch '3.1.x'Joas Schilling2015-06-091-4/+18
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #3551 from rxu/ticket/13779Joas Schilling2015-06-091-4/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13779] Set new auth options to the role only if matching the role type
| | * | | | [ticket/13779] Set new auth options to the role only if matching the role typerxu2015-04-261-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrations' permission tool allows setting permissions to the role which doesn't match the role type, e.g. m_ permissions for u_ role types and so on. As one of side effects, this may lead to granting users moderative/admin permissions silently. With this patch the only new permissions matching the role type will be set. PHPBB3-13779
* | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3486 from brunoais/ticket/13693Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13693] Allow modifying the MySQL author search query
| | * | | | | [ticket/13693] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13693
| | * | | | | [ticket/13693] Allow modifying the MySQL author search querybrunoais2015-03-121-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13693
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3485 from brunoais/ticket/13694Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13694] Allow modifying the Postgres native author search query for results
| | * | | | | | [ticket/13694] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13694
| | * | | | | | [ticket/13694] Allow modifying the Postgres native author search querybrunoais2015-03-121-0/+49
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13694
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+43
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3484 from brunoais/ticket/13691Marc Alexander2015-06-091-0/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13691] Allow modifying the fulltext native search query for total results for author
| | * | | | | | [ticket/13691] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13691
| | * | | | | | [ticket/13691] Allow changing query to search for posts by author in nativebrunoais2015-03-121-0/+43
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13691
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+62
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3483 from brunoais/ticket/13686Marc Alexander2015-06-091-0/+62
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13686] Allow modify query used for counting in fulltext_native
| | * | | | | | [ticket/13686] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13686
| | * | | | | | [ticket/13686] Allow modify query used for counting in fulltext_nativebrunoais2015-03-121-0/+62
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13686
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3481 from brunoais/ticket/13689Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13689] Allow modifying the query for postgres native fulltext search Conflicts: phpBB/develop/search_fill.php phpBB/includes/acp/acp_main.php phpBB/includes/acp/acp_search.php phpBB/includes/functions_admin.php phpBB/includes/functions_posting.php phpBB/includes/mcp/mcp_main.php phpBB/includes/mcp/mcp_post.php phpBB/install/install_convert.php phpBB/install/install_install.php phpBB/phpbb/search/fulltext_mysql.php phpBB/phpbb/search/fulltext_native.php phpBB/phpbb/search/fulltext_postgres.php phpBB/phpbb/search/fulltext_sphinx.php phpBB/search.php tests/search/mysql_test.php tests/search/native_test.php tests/search/postgres_test.php
| | * | | | | | [ticket/13689] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13689
| | * | | | | | [ticket/13689] Allow modifying the query for postgres native fulltext searchbrunoais2015-03-121-0/+49
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13689
| | * | | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-03-1214-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-0914-18/+99
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/mcp/mcp_main.php
| * | | | | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-0914-18/+99
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext search
| | * | | | | | [ticket/13685] phpBB, not PhpBBbrunoais2015-06-094-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| | * | | | | | [ticket/13685] This should take care of the restbrunoais2015-06-082-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| | * | | | | | [ticket/13685] BUMP version to 3.1.5-devbrunoais2015-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| | * | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext searchbrunoais2015-06-071-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
| | * | | | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-0714-18/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-082-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | / / / | |_|_|_|/ / / |/| | | | | | Conflicts: phpBB/posting.php
| * | | | | | Merge pull request #3663 from Elsensee/ticket/13833Marc Alexander2015-06-082-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13833] Prevent flooding if type="submit" doesn't exist
| | * \ \ \ \ \ Merge branch 'ticket/13833-30x' into ticket/13833Oliver Schramm2015-06-082-2/+2
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/posting.php PHPBB3-13833
generated by cgit v1.2.1 (git 2.21.0) at 2025-08-04 03:44:32 +0000