aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'bantu/ticket/10076' into developOleg Pudeyev2012-02-101-20/+93
|\
| * [ticket/10076] STARTTLS support for SMTP via smtp_class.Andreas Fischer2012-01-281-0/+57
| * [ticket/10076] Move EHLO/HELO code into its own method.Andreas Fischer2012-01-281-23/+39
* | Merge remote-tracking branch 'bantu/ticket/10636' into developOleg Pudeyev2012-02-101-2/+2
|\ \
| * | [ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().Andreas Fischer2012-02-091-2/+2
* | | Merge remote-tracking branch 'cyberalien/ticket/10637' into developOleg Pudeyev2012-02-106-25/+11
|\ \ \
| * | | [ticket/10637] Leftovers from implementation of extensions in convertorVjacheslav Trushkin2012-02-091-6/+4
| * | | [ticket/10637] Leftovers from implementation of extensions in develop toolsVjacheslav Trushkin2012-02-092-4/+1
| * | | [ticket/10637] Leftovers from implementation of extensions in mcp_postVjacheslav Trushkin2012-02-091-4/+2
| * | | [ticket/10637] Leftovers from implementation of extensions in mcp_mainVjacheslav Trushkin2012-02-091-7/+2
| * | | [ticket/10637] Leftovers from implementation of extensionsVjacheslav Trushkin2012-02-091-4/+2
* | | | Merge remote-tracking branch 'bantu/ticket/10495' into developOleg Pudeyev2012-02-101-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc dropAndreas Fischer2012-02-041-1/+1
| |/ /
* | | [ticket/10634] Specify module type when viewing profileVjacheslav Trushkin2012-02-091-5/+5
* | | [ticket/10634] Changing p_master::is_full_classVjacheslav Trushkin2012-02-091-1/+1
* | | Merge branch 'develop-olympus' into developIgor Wiedler2012-02-074-9/+22
|\ \ \
| * \ \ Merge remote-tracking branch 'cyberalien/ticket/10616' into develop-olympusIgor Wiedler2012-02-074-9/+22
| |\ \ \
| | * | | [ticket/10616] Add template inheritance to exported templateVjacheslav Trushkin2012-02-031-9/+8
| | * | | [ticket/10616] Ignore template inheritance that points to selfVjacheslav Trushkin2012-02-031-0/+5
| | * | | [ticket/10616] Add template inheritance to default stylesVjacheslav Trushkin2012-02-032-0/+9
* | | | | Merge branch 'develop-olympus' into developDavid King2012-02-032-0/+6
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | [ticket/9914] Add backup warning to updater.Michael Cullum2012-02-032-0/+6
| |/ /
* | | Merge remote-tracking branch 'imkingdavid/ticket/10535' into developOleg Pudeyev2012-02-0312-69/+8
|\ \ \
| * | | [ticket/10535] Delete no longer needed email confirm language entries.Oleg Pudeyev2012-02-031-2/+0
| * | | [ticket/10535] Delete email confirm from installerp2011-12-282-16/+8
| * | | [ticket/10535] Removed email confirm field from acp_users moduleDavid King2011-12-232-11/+0
| * | | [ticket/10535] Forgot a subsilver2 change. *doh*David King2011-12-151-6/+0
| * | | [ticket/10535] Removed email confirm from UCP, removed unused language entriesDavid King2011-12-153-17/+0
| * | | [ticket/10535] Remove email confirm check on registration formDavid King2011-12-153-17/+0
* | | | 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
|\ \ \ \ \ | |/ / / /
| * | | | [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
|\ \ \ \ | |/ / /
| * | | [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