aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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-096-8/+8
|
* Merge pull request #3551 from rxu/ticket/13779Joas Schilling2015-06-093-4/+214
|\ | | | | | | [ticket/13779] Set new auth options to the role only if matching the role type
| * [ticket/13779] Add permission set testsrxu2015-06-062-0/+196
| | | | | | | | PHPBB3-13779
| * [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 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 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 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 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 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] Fix tests for fulltext searchbrunoais2015-03-123-3/+6
| | | | | | | | | | | | PHPBB3-13685
| * | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-03-1214-18/+50
| | | | | | | | | | | | PHPBB3-13685
* | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-0917-21/+105
|\ \ \ | | | | | | | | | | | | [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] Fix tests for fulltext searchbrunoais2015-06-073-3/+6
| | | | | | | | | | | | | | | | PHPBB3-13685
| * | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-0714-18/+50
| | | | | | | | | | | | | | | | PHPBB3-13685
* | | | Merge branch '3.0.x' into 3.1.xMarc Alexander2015-06-080-0/+0
|\ \ \ \
| * \ \ \ Merge pull request #3697 from Elsensee/ticket/13833-30xMarc Alexander2015-06-082-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13833] Prevent flooding if type=submit doesn't exist
* | \ \ \ \ 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
| | * | | | | [ticket/13833] Prevent flooding if type=submit doesn't existOliver Schramm2015-06-082-2/+2
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13833
* | | | | | Merge pull request #3691 from CHItA/ticket/13888Andreas Fischer2015-06-081-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13888] Fix sql_freeresult() error on author searches * CHItA/ticket/13888: [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 pull request #3693 from nickvergessen/ticket/13823Tristan Darricau2015-06-071-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | [ticket/13823] Remove the unnecessary brackets
| * | | | | [ticket/13823] Remove the unnecessary bracketsJoas Schilling2015-06-071-2/+2
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the line with non-whitespace changes, so the packaging script should correctly detect them as changed and put the file into the update. PHPBB3-13823
* | | | | Merge pull request #3692 from CHItA/ticket/sec-184Joas Schilling2015-06-071-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/sec-184] Fix tests
| * | | | | [ticket/sec-184] Fix testsCHItA2015-06-071-1/+1
|/ / / / / | | | | | | | | | | | | | | | SECURITY-184
* | | | | Merge pull request #22 from phpbb/ticket/sec-184Marc Alexander2015-06-074-6/+29
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/sec-184] Do not output passwords to HTML
| * | | | | [ticket/sec-184] Do not output LDAP password to HTMLJoas Schilling2015-06-042-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-184
| * | | | | [ticket/sec-184] Do not output Jabber password to HTMLJoas Schilling2015-06-041-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-184
| * | | | | [ticket/sec-184] Do not output config passwords to the HTML pageJoas Schilling2015-06-042-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | SECURITY-184
* | | | | | Merge pull request #23 from phpbb/ticket/13913Tristan Darricau2015-06-061-5/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13913] Correctly check the forum_password and read permissions
| * | | | | | [ticket/13913] Correctly check the forum_password and read permissionsJoas Schilling2015-06-041-5/+14
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to check them on the forum the post is in, rather than the forum row we are displaying. PHPBB3-13913
* | | | | | Merge pull request #3671 from marc1706/ticket/9563Tristan Darricau2015-06-061-1/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/9563] Do not show empty categories on index
| * | | | | | [ticket/9563] Do not show empty categories on indexMarc Alexander2015-05-311-1/+13
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-9563
* | | | | | Merge pull request #3680 from marc1706/ticket/13917Tristan Darricau2015-06-061-2/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13917] Use hash_equals() if possible in password driver helper
| * | | | | | [ticket/13917] Do not pass non-string variables to hash_equals()Marc Alexander2015-06-041-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13917