aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-2/+2
|\ | | | | | | | | * develop-olympus: [ticket/10860] Fixing js error in updater
| * Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympusAndreas Fischer2012-05-061-2/+2
| |\ | | | | | | | | | | | | * cyberalien/ticket/10860: [ticket/10860] Fixing js error in updater
| | * [ticket/10860] Fixing js error in updaterVjacheslav Trushkin2012-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixing javascript error in side-by-side diff styling in updater: resizing inner block instead of outer block and increasing height by inner/outer block difference. PHPBB3-10860
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-13/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10819] Remove support for older browsers [ticket/10819] Forgot this causes vertical scrollbars on IE [ticket/10819] Improve side-by-side diff styling
| * | Merge remote-tracking branch 'Noxwizard/ticket/10819' into develop-olympusAndreas Fischer2012-05-061-13/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10819: [ticket/10819] Remove support for older browsers [ticket/10819] Forgot this causes vertical scrollbars on IE [ticket/10819] Improve side-by-side diff styling
| | * | [ticket/10819] Remove support for older browsersPatrick Webster2012-04-171-4/+0
| | | | | | | | | | | | | | | | PHPBB3-10819
| | * | [ticket/10819] Forgot this causes vertical scrollbars on IEPatrick Webster2012-04-151-1/+0
| | | | | | | | | | | | | | | | PHPBB3-10819
| | * | [ticket/10819] Improve side-by-side diff stylingPatrick Webster2012-04-151-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used transparent background for unchanged lines Shortened the table headers and make the background grey Added a border between the columns Increased the font size on pre blocks Added Consolas as the first pre font, for Windows users Added wordwrapping for pre blocks PHPBB3-10819
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-051-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-olympus: [ticket/10849] Added missing helptext for listitem
| * | | Merge remote-tracking branch 'galaxyAbstractor/ticket/10849' into ↵Andreas Fischer2012-05-051-0/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/10849: [ticket/10849] Added missing helptext for listitem
| | * | [ticket/10849] Added missing helptext for listitemgalaxyAbstractor2012-04-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Added the missing helptext for list item in subsilver2. PHPBB3-10849
* | | | Merge remote-tracking branch 'brunoais/ticket/10871' into developAndreas Fischer2012-05-041-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10871: [ticket/10871] Delete the unwanted implode
| * | | | [ticket/10871] Delete the unwanted implodeBruno Ais2012-05-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted the implode that had no reason to be there PHPBB3-10871
* | | | | Merge pull request #791 from erikfrerejean/task/10869Nils Adermann2012-05-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [task/10869] Remove PHP 5.2 check from .travis.yml
| * | | | | [task/10869] Remove PHP 5.2 check from .travis.ymlErik Frèrejean2012-05-041-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The travis configuration file contains a statement that checks whether the test is ran against PHP 5.2 but as that version isn't tested at all the check can be removed. PHPBB3-10869
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10818' into developAndreas Fischer2012-05-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10818: [ticket/10818] Global Announcements Update Dialog should call exit_handler()
| * | | | | [ticket/10818] Global Announcements Update Dialog should call exit_handler()Joas Schilling2012-05-021-1/+1
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-10818
* | | | | Merge remote-tracking branch 'mvinny/ticket/10778' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/10778: [ticket/10778] Remove extra space from close link in prosilver smilies window
| * | | | | [ticket/10778] Remove extra space from close link in prosilver smilies windowVinny2012-05-011-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-10778
* | | | | Merge remote-tracking branch 'Senky/ticket/10847' into developAndreas Fischer2012-05-016-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10847: [ticket/10847] fixing all misspelled "dependant" to "dependent"
| * | | | | [ticket/10847] fixing all misspelled "dependant" to "dependent"Senky2012-04-306-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10847
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | | * develop-olympus: [ticket/10846] fixing SQL query bug in acp_main.php
| * | | | Merge remote-tracking branch 'Senky/ticket/10846' into develop-olympusAndreas Fischer2012-05-011-1/+1
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * Senky/ticket/10846: [ticket/10846] fixing SQL query bug in acp_main.php
| | * | | [ticket/10846] fixing SQL query bug in acp_main.phpSenky2012-04-301-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-10846
* | | | Merge PR #753 branch 'Senky/ticket/10161' into developOleg Pudeyev2012-04-2630-144/+144
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10161: [ticket/10161] added fullstop to the end of sentence [ticket/10161] coding-guidelines.html updated [ticket/10161] all "e-mail" strings in language files changed to "email"
| * | | | [ticket/10161] added fullstop to the end of sentenceSenky2012-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10161
| * | | | [ticket/10161] coding-guidelines.html updatedSenky2012-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10161
| * | | | [ticket/10161] all "e-mail" strings in language files changed to "email"Senky2012-04-1529-143/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to Oleg's comment: email is preferred by RFCs and probably the way of the future PHPBB3-10161
* | | | | Merge PR #771 branch 'develop-olympus' into developOleg Pudeyev2012-04-262-2/+18
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10836] Check if avatar directory is writable after install [ticket/10836] Enable avatars by default at install
| * | | | Merge PR #771 branch 'galaxyAbstractor/ticket/10836' into develop-olympusOleg Pudeyev2012-04-262-2/+18
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * galaxyAbstractor/ticket/10836: [ticket/10836] Check if avatar directory is writable after install [ticket/10836] Enable avatars by default at install
| | * | | | [ticket/10836] Check if avatar directory is writable after installgalaxyAbstractor2012-04-251-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the avatar directory is writeable after the installation is complete. If it isn't, disable avatars and avatar uploading by default. PHPBB3-10836
| | * | | | [ticket/10836] Enable avatars by default at installgalaxyAbstractor2012-04-211-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Enables avatars and local avatar upload by default. PHPBB3-10836
* | | | | Merge PR #731 branch 'VSEphpbb/ticket/10779' into developOleg Pudeyev2012-04-251-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | * VSEphpbb/ticket/10779: [ticket/10779] Move jQuery CDN option to Load Settings
| * | | | [ticket/10779] Move jQuery CDN option to Load SettingsMatt Friedman2012-04-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-10779 PHPBB3-10779
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-211-0/+10
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10492] Fix line endings [ticket/10492] Backporting functional tests [ticket/10492] Separate config generation from the installer Conflicts: phpBB/includes/functions_install.php phpunit.xml.functional tests/bootstrap.php tests/test_framework/phpbb_functional_test_case.php tests/test_framework/phpbb_test_case_helpers.php
| * | | | Merge remote-tracking branch 'github-noxwizard/ticket/10492' into ↵Nils Adermann2012-04-2111-64/+354
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * github-noxwizard/ticket/10492: [ticket/10492] Fix line endings [ticket/10492] Backporting functional tests [ticket/10492] Separate config generation from the installer
| | * | | | [ticket/10492] Fix line endingsPatrick Webster2012-04-211-26/+26
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10492
| | * | | | [ticket/10492] Backporting functional testsPatrick Webster2012-04-218-0/+251
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10492
| | * | | | [ticket/10492] Separate config generation from the installerPatrick Webster2012-04-204-64/+103
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-10492
* | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/10815] enables feed feature by default for a fresh install
| * | | | Merge remote-tracking branch 'github-dhruv/ticket/10815' into develop-olympusNils Adermann2012-04-201-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * github-dhruv/ticket/10815: [ticket/10815] enables feed feature by default for a fresh install
| | * | | | [ticket/10815] enables feed feature by default for a fresh installDhruv Goel2012-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10815
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-201-4/+30
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10767] Clarify what happens at the end of the hook. [ticket/10767] Use warning/error language as appropriate. [ticket/10767] Default to non-fatal behavior. [ticket/10767] Revert unconditional unfatality in commit-msg hook.
| * | | | | Merge remote-tracking branch 'p/ticket/10767' into develop-olympusAndreas Fischer2012-04-201-4/+30
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10767: [ticket/10767] Clarify what happens at the end of the hook. [ticket/10767] Use warning/error language as appropriate. [ticket/10767] Default to non-fatal behavior. [ticket/10767] Revert unconditional unfatality in commit-msg hook.
| | * | | | | [ticket/10767] Clarify what happens at the end of the hook.Oleg Pudeyev2012-04-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are problems and fatal is true, print that the commit is aborted. If there are problems and fatal is false, print instructions for fixing the commit. PHPBB3-10767
| | * | | | | [ticket/10767] Use warning/error language as appropriate.Oleg Pudeyev2012-04-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When commit-msg hook is fatal, label the message as an error. When it is not fatal, label the message as a warning. "Syntax error" is still always an error, not sure if this should be changed. PHPBB3-10767
| | * | | | | [ticket/10767] Default to non-fatal behavior.Oleg Pudeyev2012-04-171-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10767
| | * | | | | [ticket/10767] Revert unconditional unfatality in commit-msg hook.Oleg Pudeyev2012-04-161-3/+18
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/10093] Make commit-msg always not fatal by nuking all fatal logic." This reverts commit 88cad5523e7cdac6826dd8581e27e22a65afda26. PHPBB3-10093 PHPBB3-10767
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-04-201-16/+19
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10812] Disabled register_globals check in PHP 5.4
| * | | | | Merge remote-tracking branch 'galaxyAbstractor/ticket/10812' into ↵Andreas Fischer2012-04-201-16/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/10812: [ticket/10812] Disabled register_globals check in PHP 5.4
generated by cgit v1.2.1 (git 2.21.0) at 2026-01-04 18:17:01 +0000