aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | [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] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-03-124-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13685
* | | | | | 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
* | | | | | | [ticket/13888] Fix sql_freeresult() error on author searchesCHItA2015-06-071-1/+1
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | PHPBB3-13888
* | | | | | 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 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 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
* | | | | | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3016-17/+3
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | [ticket/13790] Update phpcs
| * | | | | [ticket/13790] Update phpcsTristan Darricau2015-05-1916-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13790
* | | | | | Merge pull request #3633 from nickvergessen/ticket/13872Marc Alexander2015-05-282-3/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13872] Allow template events to have a changed version
| * | | | | | [ticket/13872] Allow template events to have a changed versionJoas Schilling2015-05-282-3/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13872
* | | | | | | Merge pull request #3457 from brunoais/ticket/13661Joas Schilling2015-05-281-15/+70
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13661] Add event to allow editing the queries used to get the logs * brunoais/ticket/13661: [ticket/13661] BUMP version to 3.1.5-dev [ticket/13661] Brackets in their own line [ticket/13661] Re-Fixed $log_type -> $log_time [ticket/13661] Wrong event @since version [ticket/13661] Removed superfluous whitespace [ticket/13661] bugfix: The conditional is the log_time, not log_type [ticket/13661] Fixed the "FROM" in the built query. [ticket/13661] Add event to allow editing the queries used to get the logs [ticket/13661] Transform queries to get logs and log count into built queries
| * | | | | | [ticket/13661] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| * | | | | | [ticket/13661] Brackets in their own linebrunoais2015-03-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't even notice that I used my own coding guidelines there... Thanks to MGaetan89 for pointing it out. PHPBB3-13661
| * | | | | | [ticket/13661] Re-Fixed $log_type -> $log_timebrunoais2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks to goof for pointing it out... PHPBB3-13661
| * | | | | | [ticket/13661] Wrong event @since versionbrunoais2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| * | | | | | [ticket/13661] Removed superfluous whitespacebrunoais2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| * | | | | | [ticket/13661] bugfix: The conditional is the log_time, not log_typebrunoais2015-03-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I mistakenly made the log_type the conditional instead of log_time. Thankfully, the automated tests helped finding this mistake. PHPBB3-13661
| * | | | | | [ticket/13661] Fixed the "FROM" in the built query.brunoais2015-03-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was doing it wrong by giving a string to the FROM clause in the built query. PHPBB3-13661
| * | | | | | [ticket/13661] Add event to allow editing the queries used to get the logsbrunoais2015-03-011-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
| * | | | | | [ticket/13661] Transform queries to get logs and log count into built queriesbrunoais2015-02-281-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13661
* | | | | | | Merge pull request #3624 from VSEphpbb/ticket/13861Marc Alexander2015-05-221-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13861] Fix undefined variables in style update migration
| * | | | | | | [ticket/13861] Fix undefined variables in style update migrationMatt Friedman2015-05-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13861
* | | | | | | | Merge pull request #3601 from nickvergessen/ticket/13827Nicofuma2015-05-171-3/+23
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAX
| * | | | | | | | [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()Joas Schilling2015-05-141-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13827
| * | | | | | | | [ticket/13827] Correctly return JSON instead of HTML when valled from AJAXJoas Schilling2015-05-091-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13827
* | | | | | | | | [ticket/13838] Fix coding styleNicofuma2015-05-146-9/+19
| |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13838
* | | | | | | | Merge pull request #3598 from VSEphpbb/ticket/13822Marc Alexander2015-05-081-1/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13822] Correctly display softdelete and post detail perms
| * | | | | | | | [ticket/13822] Correctly display softdelete and post detail permsMatt Friedman2015-05-071-1/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13822