aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Oliver Schramm2015-03-251-1/+2
|\
| * Merge branch '3.0.x' into 3.1.xOliver Schramm2015-03-250-0/+0
| |\
| | * Merge pull request #3505 from Nicofuma/ticket/13723Oliver Schramm2015-03-251-1/+2
| | |\ | | | | | | | | | | | | [ticket/13723] Add Elsensee to authors list
| * | \ Merge pull request #3506 from Nicofuma/ticket/13723-31xOliver Schramm2015-03-251-1/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13723-Ascraeus] Add Elsensee to authors list
| | * \ \ [ticket/13723] Merge branch 'ticket/13723' into ticket/13723-31xNicofuma2015-03-251-1/+2
| | |\ \ \ | |/ / / / | | | | _ | | | | | | | | | | | | | | | | Conflicts: phpBB/docs/AUTHORS PHPBB3-13723
| | * | [ticket/13723] Add Elsensee to authors listNicofuma2015-03-251-1/+2
| | |/ | | | | | | | | | PHPBB3-13723
* | | Merge branch '3.1.x'Nicofuma2015-03-242-5/+12
|\ \ \ | |/ /
| * | Merge pull request #3398 from marc1706/ticket/13612Nicofuma2015-03-242-5/+12
| |\ \ | | | | | | | | | | | | [ticket/13612] Run meta refresh until extension is fully enabled
| | * | [ticket/13612] Always display success message if extension was enabledMarc Alexander2015-02-142-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An error will already be triggered if enable_step() is not successful. Redirecting for no obvious reason will just confuse users. PHPBB3-13612
| | * | [ticket/13612] Run meta refresh until extension is fully enabledMarc Alexander2015-02-141-1/+20
| | | | | | | | | | | | | | | | PHPBB3-13612
* | | | Merge branch '3.1.x'Nicofuma2015-03-241-13/+11
|\ \ \ \ | |/ / /
| * | | Merge pull request #3501 from prototech/ticket/13698Nicofuma2015-03-241-13/+11
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.
| | * | | [ticket/13698] Pass parameters for link in LOGIN_ERROR_PASSWORD error message.Cesar G2015-03-231-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOGIN_ERROR_PASSWORD may be returned as the message if the password is invalid while hitting the LOGIN_ERROR_ATTEMPTS error. PHPBB3-13698
* | | | | Merge branch '3.1.x'Nicofuma2015-03-241-0/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #3410 from Senky/ticket/13467Nicofuma2015-03-241-0/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13467] Add a CONTRIBUTING file to the project on Github
| | * | | | [ticket/13467] Add coding guidelines linkJakub Senko2015-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13467
| | * | | | [ticket/13467] Add a CONTRIBUTING fileJakub Senko2015-02-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13467
* | | | | | Merge branch '3.1.x'Marc Alexander2015-03-241-0/+12
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3499 from Elsensee/ticket/13721Marc Alexander2015-03-241-0/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/13271] Fix URL Rewriting on IIS7
| | * | | | [ticket/13271] Fix URL Rewriting on IIS7Oliver Schramm2015-03-231-0/+12
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13271
* | | | | Merge branch '3.1.x'Cesar G2015-03-231-1/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * 3.1.x: [ticket/13719] Remove superfluous $search_options in acp_search.
| * | | | Merge remote-tracking branch 'brunoais/ticket/13719' into 3.1.xCesar G2015-03-231-1/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/13719: [ticket/13719] Remove superfluous $search_options in acp_search.
| | * | | | [ticket/13719] Remove superfluous $search_options in acp_search.brunoais2015-03-231-1/+0
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13719
* | | | | Merge remote-tracking branch 's9e/ticket/13718'Cesar G2015-03-231-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * s9e/ticket/13718: [ticket/13718] Added missing global declaration
| * | | | | [ticket/13718] Added missing global declarationJoshyPHP2015-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13718
* | | | | | Merge branch '3.1.x'Cesar G2015-03-188-10/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * 3.1.x: [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
| * | | | | Merge remote-tracking branch 'Senky/ticket/9457' into 3.1.xCesar G2015-03-188-10/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/9457: [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template files
| | * | | | | [ticket/9457] Add WAI-ARIA landmarks to the Prosilver template filesJakub Senko2015-02-168-10/+10
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-9457
* | | | | | Merge branch '3.1.x'Marc Alexander2015-03-161-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3490 from prototech/ticket/13550Marc Alexander2015-03-161-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13550] Improve checks for Plupload temp directory writability
| | * | | | | [ticket/13550] Check that the Plupload temp directory is writable before movingCesar G2015-03-151-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents a PHP warning from being issued that results in an invalid JSON response being returned to the user. PHPBB3-13550
* | | | | | Merge branch '3.1.x'Dhruv2015-03-156-5/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'ticket/13702' into 3.1.xDhruv2015-03-156-5/+6
| |\ \ \ \ \
| | * | | | | [ticket/13702] Add initial-scale to viewport in page headercyberalien2015-03-146-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13702
* | | | | | | Merge branch '3.1.x'Dhruv2015-03-141-11/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | | Conflicts: phpBB/phpbb/search/fulltext_native.php
| * | | | | Merge pull request #3476 from brunoais/ticket/13674Dhruv Goel2015-03-141-11/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | [ticket/13674] Change MySQL native total search results calculation
| | * | | | [ticket/13674] Missing space after "if"brunoais2015-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13674
| | * | | | [ticket/13674] Change MySQL native total search results calculationbrunoais2015-03-061-11/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes how the native FULLTEXT search calculates the total match number for MySQL. This should improve performance as there is one less query being made and it is being searched using the technique mentioned in the manual PHPBB3-13674
* | | | | | Merge branch '3.1.x'Marc Alexander2015-03-111-0/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3428 from prototech/ticket/13463Marc Alexander2015-03-111-0/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13463] Correctly position notification mark read icon in RTL.
| | * | | | | [ticket/13463] Correctly position notification mark read icon in RTL.Scout4all2015-02-191-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13463
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-102-0/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3477 from n-aleha/ticket/13679Marc Alexander2015-03-102-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13679] Add template event overall_header_searchbox_before
| | * | | | | | [ticket/13679] Add template event overall_header_searchbox_beforen-aleha2015-03-082-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13679
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-101-3/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3445 from RMcGirr83/ticket/13650Marc Alexander2015-03-101-3/+15
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | [ticket/13650] Move core event
| | * | | | | | [ticket/13650] Move core eventRMcGirr832015-02-251-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13650
* | | | | | | | Merge branch '3.1.x'Marc Alexander2015-03-071-1/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge pull request #3452 from RobertHeim/ticket/13658Marc Alexander2015-03-071-1/+27
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13658] add event before and after topics are deleted
| | * | | | | | | [ticket/13658] renamed events and added table_ary parameterRobert Heim2015-02-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added suffix '_query' to event names - added table_ary to before event PHPBB3-13658
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 09:50:20 +0000