aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | Merge branch 'develop-olympus' into developIgor Wiedler2012-02-074-9/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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
| * | | | | | | | | | | | | | | 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 branch 'develop-olympus' into developDavid King2012-02-032-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / | |_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | * develop-olympus: [ticket/9914] Add backup warning to updater.
| * | | | | | | | | | | | | | 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 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-0313-71/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10535: [ticket/10535] Delete no longer needed email confirm language entries. [ticket/10535] Delete email confirm from installer [ticket/10535] Removed email confirm field from acp_users module [ticket/10535] Forgot a subsilver2 change. *doh* [ticket/10535] Removed email confirm from UCP, removed unused language entries [ticket/10535] Remove email confirm check on registration form
| * | | | | | | | | | | | | [ticket/10535] Delete no longer needed email confirm language entries.Oleg Pudeyev2012-02-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| * | | | | | | | | | | | | [ticket/10535] Delete email confirm from installerp2011-12-283-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| * | | | | | | | | | | | | [ticket/10535] Removed email confirm field from acp_users moduleDavid King2011-12-232-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| * | | | | | | | | | | | | [ticket/10535] Forgot a subsilver2 change. *doh*David King2011-12-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| * | | | | | | | | | | | | [ticket/10535] Removed email confirm from UCP, removed unused language entriesDavid King2011-12-153-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
| * | | | | | | | | | | | | [ticket/10535] Remove email confirm check on registration formDavid King2011-12-153-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10535
* | | | | | | | | | | | | | Merge remote-tracking branch 'naderman/ticket/10477' into developAndreas Fischer2012-02-021-0/+15
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * naderman/ticket/10477: [ticket/10477] Correctly document module (base)name parameter [ticket/10477] Document parameters to p_master#load. [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixed
| * | | | | | | | | | | | | [ticket/10477] Correctly document module (base)name parameterNils Adermann2012-01-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10477
| * | | | | | | | | | | | | [ticket/10477] Document parameters to p_master#load.Oleg Pudeyev2012-01-131-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10477
| * | | | | | | | | | | | | [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixedNils Adermann2012-01-061-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10477
* | | | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-231-18/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10580] Remove checking of server timezone and DST when registering
| * | | | | | | | | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2012-01-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
| * | | | | | | | | | | | | 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 pull request #531 from p/ticket/10579Igor Wiedler2012-01-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/10579] Delete extra v2 from license block.
| * | | | | | | | | | | | | [ticket/10579] Delete extra v2 from license block.Oleg Pudeyev2012-01-121-1/+1
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10579
* | | | | | | | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-122-6/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| / / / / / / / / / / / | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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
| * | | | | | | | | | | 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 branch 'develop-olympus' into developOleg Pudeyev2012-01-063-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10563] Show deactivated styles below active styles in acp
| * | | | | | | | | | | | 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 branch 'develop-olympus' into developAndreas Fischer2012-01-021-4/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10407] Fix check for empty image paths in convertor [ticket/10407] Fix check for empty image paths in convertor
| * | | | | | | | | | | | 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 branch 'ticket/unknownbliss/9916' into developAndreas Fischer2012-01-0250-52/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/unknownbliss/9916: [ticket/9916] Updating license in non-distributed files [ticket/9916] Updating header license and removing Version $Id$
| * | | | | | | | | | | | | [ticket/9916] Updating license in non-distributed filesUnknown2012-01-0240-40/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9916
| * | | | | | | | | | | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-0210-12/+10
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9916
* | | | | | | | | | | | | Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-02280-516/+281
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * unknownbliss/ticket/9916: [ticket/9916] Updating header license and removing Version $Id$
| * | | | | | | | | | | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-31280-516/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9916
* | | | | | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-0272-91/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9916] Changing header in non-distributed files [ticket/9916] Changing coding guidelines license [ticket/9916] Updating License in the header Conflicts: tests/mock/cache.php
| * | | | | | | | | | | | | 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 remote-tracking branch 'imkingdavid/ticket/10557' into developAndreas Fischer2012-01-021-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/10557: [ticket/10557] Added IN_PHPBB check to functions_acp.php
| * | | | | | | | | | | | | | | [ticket/10557] Added IN_PHPBB check to functions_acp.phpDavid King2011-12-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10557