aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'cyberalien/ticket/10569' into develop-olympusOleg Pudeyev2012-02-102-4/+4
|\ | | | | | | | | | | * cyberalien/ticket/10569: [ticket/10569] Invalid string comparison in prosilver [ticket/10569] Invalid string comparison in subsilver2
| * [ticket/10569] Invalid string comparison in prosilverVjacheslav Trushkin2012-02-071-2/+2
| | | | | | | | | | | | Fixing invalid string comparison in ucp_main_front.html in prosilver PHPBB3-10569
| * [ticket/10569] Invalid string comparison in subsilver2Vjacheslav Trushkin2012-02-031-2/+2
| | | | | | | | | | | | Fixing invalid string comparison in ucp_main_front.html in subsilver2 PHPBB3-10569
* | Merge remote-tracking branch 'bantu/ticket/10512' into develop-olympusOleg Pudeyev2012-02-101-18/+2
|\ \ | | | | | | | | | | | | * bantu/ticket/10512: [ticket/10512] Call startup.php from tests/bootstrap.php
| * | [ticket/10512] Call startup.php from tests/bootstrap.phpAndreas Fischer2012-02-041-18/+2
| |/ | | | | | | PHPBB3-10512
* | Merge remote-tracking branch 'cyberalien/ticket/10616' into develop-olympusIgor Wiedler2012-02-074-9/+22
|\ \ | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10616: [ticket/10616] Add template inheritance to exported template [ticket/10616] Ignore template inheritance that points to self [ticket/10616] Add template inheritance to default styles
| * | [ticket/10616] Add template inheritance to exported templateVjacheslav Trushkin2012-02-031-9/+8
| | | | | | | | | | | | | | | | | | Add template inheritance when exporting template.cfg PHPBB3-10616
| * | [ticket/10616] Ignore template inheritance that points to selfVjacheslav Trushkin2012-02-031-0/+5
| | | | | | | | | | | | | | | | | | Ignore template inheritance if it points to self PHPBB3-10616
| * | [ticket/10616] Add template inheritance to default stylesVjacheslav Trushkin2012-02-032-0/+9
| |/ | | | | | | | | | | Adding template inheritance field to prosilver and subsilver2 PHPBB3-10616
* | Merge remote-tracking branch 'unknownbliss/ticket/9914' into develop-olympusDavid King2012-02-032-0/+6
|\ \ | |/ |/| | | | | * unknownbliss/ticket/9914: [ticket/9914] Add backup warning to updater.
| * [ticket/9914] Add backup warning to updater.Michael Cullum2012-02-032-0/+6
|/ | | | PHPBB3-9914
* Merge remote-tracking branch 'Dickyf/ticket/10580' into develop-olympusAndreas Fischer2012-01-231-18/+2
|\ | | | | | | | | * Dickyf/ticket/10580: [ticket/10580] Remove checking of server timezone and DST when registering
| * [ticket/10580] Remove checking of server timezone and DST when registeringRichard Foote2012-01-211-18/+2
| | | | | | | | | | | | | | | | Remove checking of server timezone and DST. It causes a problem by selecting the wrong timezone when registering when the board_timezone is 1 hour less than the server timezone. PHPBB3-10580
* | Merge remote-tracking branch 'rxu/ticket/10589' into develop-olympusAndreas Fischer2012-01-151-1/+1
|\ \ | |/ |/| | | | | * rxu/ticket/10589: [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
| * [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definitionrxu2012-01-151-1/+1
|/ | | | PHPBB3-10589
* Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympusOleg Pudeyev2012-01-122-6/+13
|\ | | | | | | | | | | * bantu/ticket/9079: [ticket/9079] Always log backtrace to error log when logging errors. [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
| * [ticket/9079] Always log backtrace to error log when logging errors.Oleg Pudeyev2011-12-241-4/+9
| | | | | | | | PHPBB3-9079
| * [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errorsAndreas Fischer2011-12-242-5/+7
| | | | | | | | PHPBB3-9079
* | Merge remote-tracking branch 'cyberalien/ticket/10563' into develop-olympusOleg Pudeyev2012-01-063-0/+10
|\ \ | | | | | | | | | | | | * cyberalien/ticket/10563: [ticket/10563] Show deactivated styles below active styles in acp
| * | [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-023-0/+10
|/ / | | | | | | | | | | Separates active and deactivated styles in styles list in acp PHPBB3-10563
* | Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympusAndreas Fischer2012-01-021-4/+8
|\ \ | | | | | | | | | | | | | | | * Dickyf/ticket/10407a: [ticket/10407] Fix check for empty image paths in convertor [ticket/10407] Fix check for empty image paths in convertor
| * | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2012-01-021-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This applies to avatar_path,avatar_gallery_path,smilies_path and upload_path. Currently, the convertor gets each path from the config table and adds a trailing slash. If there is no entry in the config table for the path, the path can never be empty because of the added trailing slash. This patch will check the path without the trailing slash to see if the path is actually empty. PHPBB3-10407
| * | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2011-12-291-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This applies to avatar_path,avatar_gallery_path,smilies_path and upload_path. Currently, the convertor gets each path from the config table and adds a trailing slash. If there is no entry in the config table for the path, the path can never be empty because of the added trailing slash. This patch will temporarily remove the trailing slash, then check if the path is empty. PHPBB3-10407
* | | Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into ↵Andreas Fischer2012-01-0272-91/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * unknownbliss/ticket/9916-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header
| * | | [ticket/9916] Changing header in non-distributed filesUnknown2012-01-0226-43/+25
| | | | | | | | | | | | | | | | PHPBB3-9916
| * | | [ticket/9916] Changing coding guidelines licenseUnknown2012-01-021-3/+2
| | | | | | | | | | | | | | | | PHPBB3-9916
| * | | [ticket/9916] Updating License in the headerUnknown2012-01-0245-45/+45
| | | | | | | | | | | | | | | | PHPBB3-9916
* | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2012-01-012-2/+8
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Bumping version number for 3.0.10 final. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql
| * | | [prep-release-3.0.10] Bumping version number for 3.0.10 final.Andreas Fischer2012-01-014-5/+11
| | | |
* | | | Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympusIgor Wiedler2011-12-281-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10538: [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.
| * | | | [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.Andreas Fischer2011-12-191-3/+3
| | |/ / | |/| | | | | | | | | | PHPBB3-10538
* | | | Merge remote-tracking branch 'p/ticket/9681' into develop-olympusAndreas Fischer2011-12-251-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * p/ticket/9681: [ticket/9681] Add password length to security settings
| * | | | [ticket/9681] Add password length to security settingsIgor Wiedler2011-12-231-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9681
* | | | | Merge remote-tracking branch 'p/ticket/10428' into develop-olympusAndreas Fischer2011-12-252-48/+66
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10428: [ticket/10428] Documentation for optionget/optionset functions. [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. [ticket/10428] Dispose of $this->keyvalues cache for optionget. [ticket/10428] Compare $data to false strictly.
| * | | | | [ticket/10428] Documentation for optionget/optionset functions.Oleg Pudeyev2011-12-252-4/+36
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10428
| * | | | | [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.Oleg Pudeyev2011-12-252-32/+24
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10428
| * | | | | [ticket/10428] Dispose of $this->keyvalues cache for optionget.Oleg Pudeyev2011-12-251-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does not work properly when custom $data is provided, and making it work will make the code so complicated that any benefits from having this cache in the first place will be nullified. Just get rid of it. PHPBB3-10428
| * | | | | [ticket/10428] Compare $data to false strictly.Oleg Pudeyev2011-12-252-8/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users may pass 0 or '' for $data, this should cause the user-specified $data code path to be taken. PHPBB3-10428
* | | | | Merge remote-tracking branch 'Dickyf/ticket/10542' into develop-olympusAndreas Fischer2011-12-251-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | * Dickyf/ticket/10542: [ticket/10542] Remove class="postlink" in subsilver2 faq_body.html
| * | | | [ticket/10542] Remove class="postlink" in subsilver2 faq_body.htmlRichard Foote2011-12-241-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | class="postlink" is not defined in stylesheet.css so remove it from styles/subsilver2/template/faq_body.html PHPBB3-10542
* | | | Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympusOleg Pudeyev2011-12-243-1/+107
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10507: [ticket/10507] DBAL unit test [ticket/10507] Sort styles in acp
| * | | | [ticket/10507] DBAL unit testVjacheslav Trushkin2011-12-152-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unit test for ORDER BY LOWER(style_name) PHPBB3-10507
| * | | | [ticket/10507] Sort styles in acpVjacheslav Trushkin2011-12-151-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort styles by name in admin control panel PHPBB3-10507
* | | | | Merge remote-tracking branch 'p/ticket/10546' into develop-olympusAndreas Fischer2011-12-231-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | * p/ticket/10546: [ticket/10546] Add missing argument to adm_back_link in acp_captcha.
| * | | | [ticket/10546] Add missing argument to adm_back_link in acp_captcha.Oleg Pudeyev2011-12-231-1/+1
|/ / / / | | | | | | | | | | | | PHPBB3-10546
* | | | Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympusOleg Pudeyev2011-12-222-15/+15
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | * cyberalien/ticket/10399: [ticket/10399] Correctly encoding template component urls (3.0) [ticket/10399] Correctly encoding template component urls (3.0)
| * | | [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-041-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Changes in style.php PHPBB3-10399
| * | | [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-011-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Correctly encoding template component urls PHPBB3-10399
* | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-117/+121
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * prep-release-3.0.10: [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
| * | | [prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.Andreas Fischer2011-12-161-117/+121
| | | |
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 01:14:19 +0000