aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10614] Tweak list output, show state, purge cache, handle missing extsIgor Wiedler2012-02-091-1/+19
* Merge branch 'develop-olympus' into developAndreas Fischer2012-01-231-18/+2
|\
| * [ticket/10580] Remove checking of server timezone and DST when registeringRichard Foote2012-01-211-18/+2
* | Merge pull request #531 from p/ticket/10579Igor Wiedler2012-01-121-1/+1
|\ \
| * | [ticket/10579] Delete extra v2 from license block.Oleg Pudeyev2012-01-121-1/+1
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-122-6/+13
|\ \ \ | |/ / |/| / | |/
| * Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympusOleg Pudeyev2012-01-122-6/+13
| |\
| | * [ticket/9079] Always log backtrace to error log when logging errors.Oleg Pudeyev2011-12-241-4/+9
| | * [ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errorsAndreas Fischer2011-12-242-5/+7
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-01-061-0/+3
|\ \ \ | |/ /
| * | [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-021-0/+3
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-021-4/+8
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympusAndreas Fischer2012-01-021-4/+8
| |\ \
| | * | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2012-01-021-16/+8
| | * | [ticket/10407] Fix check for empty image paths in convertorRichard Foote2011-12-291-4/+16
* | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-021-1/+1
* | | | Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-02218-393/+219
|\ \ \ \
| * | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-31218-393/+219
* | | | | [ticket/10557] Added IN_PHPBB check to functions_acp.phpDavid King2011-12-281-0/+8
* | | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-12-281-3/+3
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'bantu/ticket/10538' into develop-olympusIgor Wiedler2011-12-281-3/+3
| |\ \ \ \
| | * | | | [ticket/10538] Call htmlspecialchars_decode() on Jabber and SMTP passwords.Andreas Fischer2011-12-191-3/+3
| | | |/ / | | |/| |
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-251-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'p/ticket/9681' into develop-olympusAndreas Fischer2011-12-251-0/+2
| |\ \ \ \
| | * | | | [ticket/9681] Add password length to security settingsIgor Wiedler2011-12-231-0/+2
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-252-48/+66
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'p/ticket/10428' into develop-olympusAndreas Fischer2011-12-252-48/+66
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | [ticket/10428] Documentation for optionget/optionset functions.Oleg Pudeyev2011-12-252-4/+36
| | * | | | [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.Oleg Pudeyev2011-12-252-32/+24
| | * | | | [ticket/10428] Dispose of $this->keyvalues cache for optionget.Oleg Pudeyev2011-12-251-8/+2
| | * | | | [ticket/10428] Compare $data to false strictly.Oleg Pudeyev2011-12-252-8/+8
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-12-241-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympusOleg Pudeyev2011-12-241-1/+6
| |\ \ \ \
| | * | | | [ticket/10507] Sort styles in acpVjacheslav Trushkin2011-12-151-1/+6
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-231-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | [ticket/10546] Add missing argument to adm_back_link in acp_captcha.Oleg Pudeyev2011-12-231-1/+1
| | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'cyberalien/ticket/10399' into develop-olympusOleg Pudeyev2011-12-221-10/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | [ticket/10399] Correctly encoding template component urls (3.0)Vjacheslav Trushkin2011-12-011-10/+10
* | | | | Merge remote-tracking branch 'imkingdavid/ticket/10541' into developOleg Pudeyev2011-12-221-1/+1
|\ \ \ \ \
| * | | | | [ticket/10541] Fixed empty drop-down menu bugDavid King2011-12-211-1/+1
* | | | | | Merge remote-tracking branch 'cyberalien/ticket/develop/10399' into developOleg Pudeyev2011-12-221-7/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | [ticket/10399] Correctly encoding template component urls (3.1)Vjacheslav Trushkin2011-12-011-7/+7
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-12-161-2/+16
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-12-161-2/+16
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'nickvergessen/ticket/10531' into prep-release-3...Andreas Fischer2011-12-161-2/+16
| | |\ \ \ \ \
| | | * | | | | [ticket/10531] Disallow deleting of the last styleJoas Schilling2011-12-151-2/+16
* | | | | | | | [ticket/10463] removed extra comma in malformed query in acp_styles.phpDavid King2011-12-151-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-12-091-1/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-091-1/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-091-1/+10