aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-04-032-1/+8
|\ | | | | | | | | Conflicts: phpBB/styles/subsilver2/template/overall_header.html
| * Merge pull request #3467 from dragosvr92/patch-5Marc Alexander2015-04-033-2/+10
| |\ | | | | | | | | | [ticket/13602] Adding a new event overall_header_navbar_before
| | * [ticket/13602] Adding event overall_header_navbar_beforeDragos-Valentin Radulescu2015-03-063-2/+10
| | | | | | | | | | | | PHPBB3-13602
* | | Merge branch '3.1.x'Marc Alexander2015-04-021-3/+10
|\ \ \ | |/ /
| * | Merge pull request #3508 from cyberalien/ticket/13726Marc Alexander2015-04-021-3/+10
| |\ \ | | | | | | | | | | | | [ticket/13726] Fix function that calculates responsive breadcrumbs width
| | * | [ticket/13726] Fix function that calculates responsive breadcrumbs widthcyberalien2015-03-281-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not calculate width of hidden elements. Set minimum width to make sure breadcrumbs are always shown. PHPBB3-13726
* | | | Merge branch '3.1.x'Marc Alexander2015-04-021-1/+7
|\ \ \ \ | |/ / /
| * | | Merge pull request #3509 from cyberalien/ticket/13727Marc Alexander2015-04-021-1/+7
| |\ \ \ | | | | | | | | | | | | | | | [ticket/13727] Fix JS that resizes breadcrumbs
| | * | | [ticket/13727] Fix JS that resizes breadcrumbscyberalien2015-03-281-1/+7
| | |/ / | | | | | | | | | | | | PHPBB3-13727
* | | | Merge branch '3.1.x'Andreas Fischer2015-04-021-4/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | * 3.1.x: [ticket/13736] Missing four colon in Contact us page
| * | | Merge pull request #3513 from bantu/ticket/13736Andreas Fischer2015-04-021-4/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13736] Missing four colon in Contact us page * bantu/ticket/13736: [ticket/13736] Missing four colon in Contact us page
| | * | | [ticket/13736] Missing four colon in Contact us pageRaphaël M2015-04-021-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | Replacing of four ```:``` with four {L_COLON} in Contact us page. PHPBB3-13736
* | | | Merge pull request #3507 from VSEphpbb/ticket/13725Andreas Fischer2015-04-0221-34/+34
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13725] Coding guidelines: static public * VSEphpbb/ticket/13725: [ticket/13725] Coding guidelines: static public
| * | | | [ticket/13725] Coding guidelines: static publicMatt Friedman2015-03-2721-34/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-13725
* | | | | Merge branch '3.1.x'Marc Alexander2015-04-011-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3510 from Nicofuma/ticket/13732Marc Alexander2015-04-011-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13732] Update composer to be php7 compliant
| | * | | | [ticket/13732] Update composer to be php7 compliantTristan Darricau2015-03-301-0/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated to Composer version 1.0-dev (f10c71475167a4661225b14560ca0a400d730829) 2015-03-29 14:37:42 PHPBB3-13732
* | | | | Merge branch '3.1.x'Nicofuma2015-03-294-5/+175
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '3.0.x' into 3.1.xNicofuma2015-03-290-0/+0
| |\ \ \ \
| | * \ \ \ Merge pull request #3359 from marc1706/ticket/13568Nicofuma2015-03-293-5/+88
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3359
| * | \ \ \ \ Merge pull request #3376 from marc1706/ticket/13568-ascNicofuma2015-03-294-5/+175
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13568] Validate imagick path as readable absolute path closes #3376
| | * | | | | [ticket/13568] Add unit tests for validating absolute pathMarc Alexander2015-02-061-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | * | | | | Merge branch 'ticket/13568' into ticket/13568-ascMarc Alexander2015-02-063-5/+88
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/adm/index.php phpBB/includes/acp/acp_attachments.php
| | | * | | | [ticket/13568] Also check if absolute_path_writable is writableMarc Alexander2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | | | [ticket/13568] Use correct data provider on windowsMarc Alexander2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | | | [ticket/13568] Add imagick tests for windowsMarc Alexander2015-02-021-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | | | [ticket/13568] Correctly check rpath and rwpath validation optionsMarc Alexander2015-02-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | | | [ticket/13568] Add more test cases for imagick pathMarc Alexander2015-02-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | | | [ticket/13568] Use more descriptive validation names and merge with path blockMarc Alexander2015-02-022-40/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | | | [ticket/13568] Add functional test for imagick path settingMarc Alexander2015-02-021-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
| | | * | | | [ticket/13568] Validate imagick path as readable absolute pathMarc Alexander2015-02-022-1/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13568
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-03-261-3/+7
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * 3.1.x: [ticket/13555] Render poll options separately when previewing.
| * | | | | | Merge branch '3.0.x' into 3.1.xAndreas Fischer2015-03-261-3/+7
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * 3.0.x: [ticket/13555] Render poll options separately when previewing.
| | * | | | | Merge pull request #3493 from prototech/ticket/13555Andreas Fischer2015-03-261-3/+7
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13555] Render poll options separately when previewing. * prototech/ticket/13555: [ticket/13555] Render poll options separately when previewing.
| | | * | | | | [ticket/13555] Render poll options separately when previewing.JoshyPHP2015-03-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents an option from being split into two when a line break is present inside of it. PHPBB3-13555
* | | | | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 06:24:28 +0000