aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Joas Schilling2015-06-141-0/+31
|\ | | | | | | | | | | Conflicts: build/build.xml phpBB/phpbb/user.php
| * Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-142-1/+32
| |\ | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
| | * [prep-release-3.1.5] Add migration for 3.1.5Joas Schilling2015-06-141-0/+31
| | |
| | * [ticket/13942] Check if path to language file contains language pathMarc Alexander2015-06-131-1/+1
| | | | | | | | | | | | PHPBB3-13942
* | | Merge branch '3.1.x'Andreas Fischer2015-06-131-2/+4
|\ \ \ | |/ / | | | | | | | | | * 3.1.x: [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
| * | Merge pull request #3704 from Nicofuma/ticket/13941Andreas Fischer2015-06-131-2/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3 * Nicofuma/ticket/13941: [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3
| | * | [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3Tristan Darricau2015-06-131-2/+4
| | | | | | | | | | | | | | | | PHPBB3-13941
| * | | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-111-0/+31
| |\ \ \ | | |/ / | |/| / | | |/
| * | Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-094-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 branch '3.1.x'Joas Schilling2015-06-111-0/+31
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | [prep-release-3.1.5] Add migration for 3.1.5-RC1Joas Schilling2015-06-091-0/+31
| |/ /
* | | Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-094-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-083-3/+3
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: phpBB/includes/acp/acp_database.php
| | * | [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-124-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
* | | | | | Merge branch '3.1.x'Marc Alexander2015-06-094-4/+85
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | Conflicts: phpBB/includes/mcp/mcp_main.php
| * | | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-094-4/+85
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13685] Allow modifying the query for mysql native fulltext search
| | * | | | [ticket/13685] phpBB, not PhpBBbrunoais2015-06-094-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | 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-074-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
* | | | | | Merge branch '3.1.x'Andreas Fischer2015-06-081-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13888] Fix sql_freeresult() error on author searches
| * | | | | [ticket/13888] Fix sql_freeresult() error on author searchesCHItA2015-06-071-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | PHPBB3-13888
* | | | | Merge branch '3.1.x'Marc Alexander2015-06-071-2/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/includes/acp/acp_board.php phpBB/includes/acp/acp_jabber.php
| * | | | Merge pull request #22 from phpbb/ticket/sec-184Marc Alexander2015-06-071-2/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/sec-184] Do not output passwords to HTML
| | * | | | [ticket/sec-184] Do not output LDAP password to HTMLJoas Schilling2015-06-041-2/+1
| | |/ / / | | | | | | | | | | | | | | | SECURITY-184
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 19:17:12 +0000