aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/14046] Jabber message incorrectScott Dutton2015-12-162-10/+9
| | | | | | | | When making a Jabber message, the page says the message has been sent when loading the page for the first time, This message should only be shown after the message has actually been sent PHPBB3-14046
* [prep-release-3.1.5] Add migration for 3.1.5Joas Schilling2015-06-141-0/+31
|
* [prep-release-3.1.5] Update version for final 3.1.5 releaseJoas Schilling2015-06-144-4/+6
|
* Merge branch 'ticket/13938' into prep-release-3.1.5Joas Schilling2015-06-144-18/+32
|\
| * [ticket/13938] Fix inconsistencies between <link> tagscyberalien2015-06-141-9/+9
| | | | | | | | PHPBB3-13938
| * [ticket/13938] Remove type and / from <link> elementscyberalien2015-06-142-2/+2
| | | | | | | | PHPBB3-13938
| * [ticket/13938] Change web font code in simple_headercyberalien2015-06-141-1/+16
| | | | | | | | | | | | Apply ticket 13876 to simple_header.html PHPBB3-13938
| * [ticket/13938] Remove link to print.css in simple_header.htmlcyberalien2015-06-141-7/+6
|/ | | | | | | Remaining fixes for ticket 13873: remove link to print.css and remove type and media from other links. PHPBB3-13938
* Merge pull request #3706 from marc1706/ticket/13942Joas Schilling2015-06-141-1/+1
|\ | | | | | | [ticket/13942] Check if path to language file contains language path
| * [ticket/13942] Check if path to language file contains language pathMarc Alexander2015-06-131-1/+1
|/ | | | PHPBB3-13942
* Merge branch 'ticket/13939' into prep-release-3.1.5Joas Schilling2015-06-131-1/+1
|\
| * [ticket/13939] Check if loadingIndicator exists before accessing itcyberalien2015-06-131-1/+1
|/ | | | PHPBB3-13939
* Merge pull request #3699 from nickvergessen/ticket/13823Joas Schilling2015-06-101-5/+5
|\ | | | | | | [ticket/13823] Move the part of the query, so the update will get it …
| * [ticket/13823] Move the part of the query, so the update will get it correctlyJoas Schilling2015-06-091-5/+5
| | | | | | | | PHPBB3-13823
* | Merge branch '3.0.x' into prep-release-3.1.5Joas Schilling2015-06-102-7/+7
|\ \ | |/ |/|
| * Merge pull request #3700 from Nicofuma/ticket/13823Joas Schilling2015-06-102-7/+7
| |\ | | | | | | | | | [ticket/13823] Change diff options while packaging to not ignore all whitespaces
| | * [ticket/13823] Change diff options while packaging to not ignore all whitespacesTristan Darricau2015-06-102-7/+7
| |/ | | | | | | | | | | | | | | | | | | | | Removed: -w, --ignore-all-space Ignore white space when comparing lines. Added: -Z, --ignore-trailing-space Ignore white space at line end. -b, --ignore-space-change Ignore changes in the amount of white space. 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-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