aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | 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
* | | | | | | Merge branch '3.1.x'Tristan Darricau2015-06-061-2/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 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
| | * | | | | | [ticket/13917] Use hash_equals() if it's availableMarc Alexander2015-06-041-0/+6
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-13917
* | | | | | | Merge branch '3.1.x'Joas Schilling2015-06-043-5/+12
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3502 from marc1706/ticket/13564Joas Schilling2015-06-043-5/+12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | [ticket/13564] Unlink user accounts upon deleting user
| | * | | | | [ticket/13564] Use user_id from link_data for unlinking account in oauthMarc Alexander2015-03-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13564
| | * | | | | [ticket/13564] Allow to specify user id for retrieving auth link dataMarc Alexander2015-03-243-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13564
* | | | | | | [ticket/13777] Remove module_class_not_defined_exceptionMateBartus2015-05-312-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
* | | | | | | [ticket/13777] Reorder get_module_infos() method's argumentsMateBartus2015-05-312-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
* | | | | | | [ticket/13777] Use module manager in phpBB core filesMateBartus2015-05-313-53/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13777
* | | | | | | [ticket/13777] Move module management into serviceMateBartus2015-05-314-0/+627
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | PHPBB3-13777
* | | | | | Merge pull request #3592 from Nicofuma/ticket/13388Nils Adermann2015-05-301-7/+124
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/13388] Integrate routing and di parameters resolution
| * | | | | | [ticket/13388] Fix coding styleTristan Darricau2015-05-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388
| * | | | | | [ticket/13388] Fix deprecationsTristan Darricau2015-05-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388
| * | | | | | [ticket/13388] Fix rebaseTristan Darricau2015-05-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388
| * | | | | | [ticket/13388] Address commentsTristan Darricau2015-05-291-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388
| * | | | | | [ticket/13388] Integrate routing and di parameters resolutionTristan Darricau2015-05-291-7/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13388