aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | [ticket/10812] Disabled register_globals check in PHP 5.4galaxyAbstractor2012-04-201-16/+19
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Disabled the check for register_globals if PHP version is 5.4+ PHPBB3-10812
* | | | | Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-199-51/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shibulijack/ticket/10688: [ticket/10688] Update install.html for 3.1 and current practices. [ticket/10688] Update readme for 3.1 and current practices. [ticket/10688] Changed version 3.0 to 3.1 [ticket/10688] Updated version to 3.1 [ticket/10688] Changed 3.0 to 3.1 in docs Conflicts: phpBB/docs/INSTALL.html phpBB/docs/README.html
| * | | | | [ticket/10688] Update install.html for 3.1 and current practices.Oleg Pudeyev2012-04-121-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10688
| * | | | | [ticket/10688] Update readme for 3.1 and current practices.Oleg Pudeyev2012-04-111-24/+31
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10688
| * | | | | [ticket/10688] Changed version 3.0 to 3.1Shibu Lijack2012-04-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced phpBB 3.0 to 3.1 in the stylesheets PHPBB-10688
| * | | | | [ticket/10688] Updated version to 3.1Shibu Lijack2012-04-113-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace phpBB 3.0.x to phpBB 3.1.x PHPBB-10688
| * | | | | [ticket/10688] Changed 3.0 to 3.1 in docsShibu Lijack2012-04-114-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced all the occurrences of phpBB 3.0 with phpBB 3.1 in all the doc files PHPBB-10688
* | | | | | Merge PR #592 branch 'develop-olympus' into developOleg Pudeyev2012-04-193-8/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9089] Add tabindex to pm/topic/post icon-options aswell [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
| * | | | | Merge PR #592 branch 'nickvergessen/ticket/9089' into develop-olympusOleg Pudeyev2012-04-193-8/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/9089: [ticket/9089] Add tabindex to pm/topic/post icon-options aswell [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subject
| | * | | | | [ticket/9089] Add tabindex to pm/topic/post icon-options aswellJoas Schilling2012-02-272-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9089
| | * | | | | [ticket/9089] Add tabindex to PM recipient box, to allow tabbing to the subjectJoas Schilling2012-02-212-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I also added tabindex 1 to the buttons for adding the recipients. Also note, that duplicated tabindex are fine: http://www.w3.org/TR/html4/interact/forms.html#adef-tabindex PHPBB3-9089
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2012-04-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | * develop-olympus:
| * | | | | | Merge remote-tracking branch 'github-dhruv/ticket/10797' into develop-olympusNils Adermann2012-04-203-3/+3
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
* | | | | | | Merge remote-tracking branch 'github-dhruv/ticket/10797' into developNils Adermann2012-04-203-3/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * github-dhruv/ticket/10797: [ticket/10797] language key rank moved to common [ticket/10797] user rank is displayed in mcp_warn.php
| * | | | | | [ticket/10797] language key rank moved to commonDhruv Goel2012-04-203-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Language key RANK moved from memberlist to common. Removed from mcp language. PHPBB3-10797
| * | | | | | [ticket/10797] user rank is displayed in mcp_warn.phpDhruv Goel2012-04-162-2/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When warning a user in MCP, the user's rank title and image are displayed. language key user rank also added. PHPBB3-10797
* | | | | | Merge remote-tracking branch 'github-p/ticket/10813' into developNils Adermann2012-04-192-1/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-p/ticket/10813: [ticket/10813] Installer now checks json extension
| * | | | | | [ticket/10813] Installer now checks json extensionriadhchtara2012-04-192-1/+23
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Installer now checks json extension and cannot continue without it. Changes are made in phpBB/install/install_install.php where the checking for json is added and to phpBB/language/en/install.php where 2 new keys for the messages that would be displayed are also added. PHPBB3-10813
* | | | | | Merge PR #761 branch 'naderman/ticket/10756' into developOleg Pudeyev2012-04-1818-58/+183
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10756: [ticket/10756] Fixing variable declarations in style and template classes [ticket/10756] Renaming phpbb_style_template to phpbb_template [ticket/10756] Removing path provider from template class [ticket/10756] Creating locator interface [ticket/10756] Renaming template classes [ticket/10756] Moving template classes
| * | | | | | [ticket/10756] Fixing variable declarations in style and template classesVjacheslav Trushkin2012-04-193-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing variable declaration, removing function from template locator that does not belong there PHPBB3-10756
| * | | | | | [ticket/10756] Renaming phpbb_style_template to phpbb_templateVjacheslav Trushkin2012-04-1910-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming phpbb_style_template to phpbb_template PHPBB3-10756
| * | | | | | [ticket/10756] Removing path provider from template classVjacheslav Trushkin2012-04-197-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing path provider from template class because it is not used by template class PHPBB3-10756
| * | | | | | [ticket/10756] Creating locator interfaceVjacheslav Trushkin2012-04-193-5/+138
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating locator interface to be used in template class PHPBB3-10756
| * | | | | | [ticket/10756] Renaming template classesVjacheslav Trushkin2012-04-1910-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming template classes from phpbb_style_template_ to phpbb_template_ PHPBB3-10756
| * | | | | | [ticket/10756] Moving template classesVjacheslav Trushkin2012-04-196-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving template class files from includes/style/ to includes/template/ and removing template_ file prefix PHPBB3-10756
* | | | | | | Merge PR #760 branch 'naderman/ticket/10759' into developOleg Pudeyev2012-04-181-29/+135
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10759: [ticket/10759] Make sure style ids are integers [ticket/10759] Don't select imageset_id, it's not needed [ticket/10759] Clarify comments a bit [ticket/10759] Retrieve style_id after INSERT since we cannot set it [ticket/10759] Fix whitespace in database_update.php [ticket/10759] Fixing style in database updater
| * | | | | | [ticket/10759] Make sure style ids are integersNils Adermann2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10759
| * | | | | | [ticket/10759] Don't select imageset_id, it's not neededNils Adermann2012-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10759
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 12:42:05 +0000