aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [feature/prosilver-cleanup/duplicate-colors] Removing duplicate colorsVjacheslav Trushkin2012-02-166-365/+80
* Merge remote-tracking branch 'naderman/ticket/10477' into developAndreas Fischer2012-02-021-0/+15
|\
| * [ticket/10477] Correctly document module (base)name parameterNils Adermann2012-01-131-1/+2
| * [ticket/10477] Document parameters to p_master#load.Oleg Pudeyev2012-01-131-1/+8
| * [ticket/10477] Normalize loaded module names to be class names or xcp_ prefixedNils Adermann2012-01-061-0/+7
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-231-18/+2
|\ \
| * \ Merge remote-tracking branch 'Dickyf/ticket/10580' into develop-olympusAndreas Fischer2012-01-231-18/+2
| |\ \
| | * | [ticket/10580] Remove checking of server timezone and DST when registeringRichard Foote2012-01-211-18/+2
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-151-1/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'rxu/ticket/10589' into develop-olympusAndreas Fischer2012-01-151-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definitionrxu2012-01-151-1/+1
| |/ /
* | | 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-063-0/+10
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'cyberalien/ticket/10563' into develop-olympusOleg Pudeyev2012-01-063-0/+10
| |\ \
| | * | [ticket/10563] Show deactivated styles below active styles in acpVjacheslav Trushkin2012-01-023-0/+10
| |/ /
* | | 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
* | | | Merge branch 'ticket/unknownbliss/9916' into developAndreas Fischer2012-01-0250-52/+50
|\ \ \ \
| * | | | [ticket/9916] Updating license in non-distributed filesUnknown2012-01-0240-40/+40
| * | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2012-01-0210-12/+10
|/ / / /
* | | | Merge remote-tracking branch 'unknownbliss/ticket/9916' into developAndreas Fischer2012-01-02280-516/+281
|\ \ \ \
| * | | | [ticket/9916] Updating header license and removing Version $Id$Unknown2011-12-31280-516/+281
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-0272-91/+72
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'unknownbliss/ticket/9916-olympus' into develop-...Andreas Fischer2012-01-0272-91/+72
| |\ \ \ \
| | * | | | [ticket/9916] Changing header in non-distributed filesUnknown2012-01-0226-43/+25
| | * | | | [ticket/9916] Changing coding guidelines licenseUnknown2012-01-021-3/+2
| | * | | | [ticket/9916] Updating License in the headerUnknown2012-01-0245-45/+45
* | | | | | Merge remote-tracking branch 'imkingdavid/ticket/10557' into developAndreas Fischer2012-01-021-0/+8
|\ \ \ \ \ \
| * | | | | | [ticket/10557] Added IN_PHPBB check to functions_acp.phpDavid King2011-12-281-0/+8
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-01-012-2/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2012-01-012-2/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [prep-release-3.0.10] Bumping version number for 3.0.10 final.Andreas Fischer2012-01-014-5/+11
* | | | | | 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 remote-tracking branch 'p/ticket/10507' into developAndreas Fischer2011-12-252-7/+0
|\ \ \ \ \ \ \
| * | | | | | | [ticket/10507] develop does not have imagesets, fix lower test.Oleg Pudeyev2011-12-242-7/+0
* | | | | | | | 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